afs: trace: Log afs_make_call(), including server address

Add a tracepoint to log calls to afs_make_call(), including the destination
server address.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org

diff --git a/fs/afs/fsclient.c b/fs/afs/fsclient.c
index 80f7d9e796e3763b999a5e8fc7d0819c0e6cd039..79cd30775b7ac88f3d144d1ff8d868f7d48a708f 100644 (file)
--- a/fs/afs/fsclient.c
+++ b/fs/afs/fsclient.c
@@ -290,6 +290,7 @@ void afs_fs_fetch_status(struct afs_operation *op)
        bp[2] = htonl(vp->fid.vnode);
        bp[3] = htonl(vp->fid.unique);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -442,6 +443,7 @@ static void afs_fs_fetch_data64(struct afs_operation *op)
        bp[6] = 0;
        bp[7] = htonl(lower_32_bits(req->len));
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -476,6 +478,7 @@ void afs_fs_fetch_data(struct afs_operation *op)
        bp[4] = htonl(lower_32_bits(req->pos));
        bp[5] = htonl(lower_32_bits(req->len));
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -559,6 +562,7 @@ void afs_fs_create_file(struct afs_operation *op)
        *bp++ = htonl(op->create.mode & S_IALLUGO); /* unix mode */
        *bp++ = 0; /* segment size */
 
+       call->fid = dvp->fid;
        trace_afs_make_fs_call1(call, &dvp->fid, name);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -612,6 +616,7 @@ void afs_fs_make_dir(struct afs_operation *op)
        *bp++ = htonl(op->create.mode & S_IALLUGO); /* unix mode */
        *bp++ = 0; /* segment size */
 
+       call->fid = dvp->fid;
        trace_afs_make_fs_call1(call, &dvp->fid, name);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -685,6 +690,7 @@ void afs_fs_remove_file(struct afs_operation *op)
                bp = (void *) bp + padsz;
        }
 
+       call->fid = dvp->fid;
        trace_afs_make_fs_call1(call, &dvp->fid, name);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -732,6 +738,7 @@ void afs_fs_remove_dir(struct afs_operation *op)
                bp = (void *) bp + padsz;
        }
 
+       call->fid = dvp->fid;
        trace_afs_make_fs_call1(call, &dvp->fid, name);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -812,6 +819,7 @@ void afs_fs_link(struct afs_operation *op)
        *bp++ = htonl(vp->fid.vnode);
        *bp++ = htonl(vp->fid.unique);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call1(call, &vp->fid, name);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -907,6 +915,7 @@ void afs_fs_symlink(struct afs_operation *op)
        *bp++ = htonl(S_IRWXUGO); /* unix mode */
        *bp++ = 0; /* segment size */
 
+       call->fid = dvp->fid;
        trace_afs_make_fs_call1(call, &dvp->fid, name);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1003,6 +1012,7 @@ void afs_fs_rename(struct afs_operation *op)
                bp = (void *) bp + n_padsz;
        }
 
+       call->fid = orig_dvp->fid;
        trace_afs_make_fs_call2(call, &orig_dvp->fid, orig_name, new_name);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1090,6 +1100,7 @@ static void afs_fs_store_data64(struct afs_operation *op)
        *bp++ = htonl(upper_32_bits(op->store.i_size));
        *bp++ = htonl(lower_32_bits(op->store.i_size));
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1140,6 +1151,7 @@ void afs_fs_store_data(struct afs_operation *op)
        *bp++ = htonl(lower_32_bits(op->store.size));
        *bp++ = htonl(lower_32_bits(op->store.i_size));
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1206,6 +1218,7 @@ static void afs_fs_setattr_size64(struct afs_operation *op)
        *bp++ = htonl(upper_32_bits(attr->ia_size));    /* new file length */
        *bp++ = htonl(lower_32_bits(attr->ia_size));
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1247,6 +1260,7 @@ static void afs_fs_setattr_size(struct afs_operation *op)
        *bp++ = 0;                              /* size of write */
        *bp++ = htonl(attr->ia_size);           /* new file length */
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1283,6 +1297,7 @@ void afs_fs_setattr(struct afs_operation *op)
 
        xdr_encode_AFS_StoreStatus(&bp, op->setattr.attr);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1446,6 +1461,7 @@ void afs_fs_get_volume_status(struct afs_operation *op)
        bp[0] = htonl(FSGETVOLUMESTATUS);
        bp[1] = htonl(vp->fid.vid);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1528,6 +1544,7 @@ void afs_fs_set_lock(struct afs_operation *op)
        *bp++ = htonl(vp->fid.unique);
        *bp++ = htonl(op->lock.type);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_calli(call, &vp->fid, op->lock.type);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1554,6 +1571,7 @@ void afs_fs_extend_lock(struct afs_operation *op)
        *bp++ = htonl(vp->fid.vnode);
        *bp++ = htonl(vp->fid.unique);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1580,6 +1598,7 @@ void afs_fs_release_lock(struct afs_operation *op)
        *bp++ = htonl(vp->fid.vnode);
        *bp++ = htonl(vp->fid.unique);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1948,6 +1967,7 @@ void afs_fs_inline_bulk_status(struct afs_operation *op)
                *bp++ = htonl(op->more_files[i].fid.unique);
        }
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -2053,6 +2073,7 @@ void afs_fs_fetch_acl(struct afs_operation *op)
        bp[2] = htonl(vp->fid.vnode);
        bp[3] = htonl(vp->fid.unique);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_KERNEL);
 }
@@ -2098,6 +2119,7 @@ void afs_fs_store_acl(struct afs_operation *op)
        if (acl->size != size)
                memset((void *)&bp[5] + acl->size, 0, size - acl->size);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_KERNEL);
 }

diff --git a/fs/afs/internal.h b/fs/afs/internal.h
index a6a4fc417dba23675ae149b9f0c7ee4510ae1d03..e33ace259cc618439d1a3cfc6f0e0098910412dd 100644 (file)
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@ -153,6 +153,7 @@ struct afs_call {
                struct afs_vldb_entry   *ret_vldb;
                char                    *ret_str;
        };
+       struct afs_fid          fid;            /* Primary vnode ID (or all zeroes) */
        unsigned char           probe_index;    /* Address in ->probe_alist */
        struct afs_operation    *op;
        unsigned int            server_index;

diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c
index 81013bc8bbfd171e2a5420bd84834c63458f2150..c453428f3c8ba9706fbc39943a02cf370117d2c2 100644 (file)
--- a/fs/afs/rxrpc.c
+++ b/fs/afs/rxrpc.c
@@ -313,6 +313,8 @@ void afs_make_call(struct afs_call *call, gfp_t gfp)
               call, call->type->name, key_serial(call->key),
               atomic_read(&call->net->nr_outstanding_calls));
 
+       trace_afs_make_call(call);
+
        /* Work out the length we're going to transmit.  This is awkward for
         * calls such as FS.StoreData where there's an extra injection of data
         * after the initial fixed part.

diff --git a/fs/afs/yfsclient.c b/fs/afs/yfsclient.c
index 2d6943f05ea53593be75866d67cb26e683031137..f521e66d3bf688e40943acd5f8882f438806d747 100644 (file)
--- a/fs/afs/yfsclient.c
+++ b/fs/afs/yfsclient.c
@@ -493,6 +493,7 @@ void yfs_fs_fetch_data(struct afs_operation *op)
        bp = xdr_encode_u64(bp, req->len);
        yfs_check_req(call, bp);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -575,6 +576,7 @@ void yfs_fs_create_file(struct afs_operation *op)
        bp = xdr_encode_u32(bp, yfs_LockNone); /* ViceLockType */
        yfs_check_req(call, bp);
 
+       call->fid = dvp->fid;
        trace_afs_make_fs_call1(call, &dvp->fid, name);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -623,6 +625,7 @@ void yfs_fs_make_dir(struct afs_operation *op)
        bp = xdr_encode_YFSStoreStatus(bp, &op->create.mode, &op->mtime);
        yfs_check_req(call, bp);
 
+       call->fid = dvp->fid;
        trace_afs_make_fs_call1(call, &dvp->fid, name);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -707,6 +710,7 @@ void yfs_fs_remove_file2(struct afs_operation *op)
        bp = xdr_encode_name(bp, name);
        yfs_check_req(call, bp);
 
+       call->fid = dvp->fid;
        trace_afs_make_fs_call1(call, &dvp->fid, name);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -776,6 +780,7 @@ void yfs_fs_remove_file(struct afs_operation *op)
        bp = xdr_encode_name(bp, name);
        yfs_check_req(call, bp);
 
+       call->fid = dvp->fid;
        trace_afs_make_fs_call1(call, &dvp->fid, name);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -817,6 +822,7 @@ void yfs_fs_remove_dir(struct afs_operation *op)
        bp = xdr_encode_name(bp, name);
        yfs_check_req(call, bp);
 
+       call->fid = dvp->fid;
        trace_afs_make_fs_call1(call, &dvp->fid, name);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -890,6 +896,7 @@ void yfs_fs_link(struct afs_operation *op)
        bp = xdr_encode_YFSFid(bp, &vp->fid);
        yfs_check_req(call, bp);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call1(call, &vp->fid, name);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -971,6 +978,7 @@ void yfs_fs_symlink(struct afs_operation *op)
        bp = xdr_encode_YFSStoreStatus(bp, &mode, &op->mtime);
        yfs_check_req(call, bp);
 
+       call->fid = dvp->fid;
        trace_afs_make_fs_call1(call, &dvp->fid, name);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1050,6 +1058,7 @@ void yfs_fs_rename(struct afs_operation *op)
        bp = xdr_encode_name(bp, new_name);
        yfs_check_req(call, bp);
 
+       call->fid = orig_dvp->fid;
        trace_afs_make_fs_call2(call, &orig_dvp->fid, orig_name, new_name);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1105,6 +1114,7 @@ void yfs_fs_store_data(struct afs_operation *op)
        bp = xdr_encode_u64(bp, op->store.i_size);
        yfs_check_req(call, bp);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1161,6 +1171,7 @@ static void yfs_fs_setattr_size(struct afs_operation *op)
        bp = xdr_encode_u64(bp, attr->ia_size); /* new file length */
        yfs_check_req(call, bp);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1199,6 +1210,7 @@ void yfs_fs_setattr(struct afs_operation *op)
        bp = xdr_encode_YFS_StoreStatus(bp, attr);
        yfs_check_req(call, bp);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1369,6 +1381,7 @@ void yfs_fs_get_volume_status(struct afs_operation *op)
        bp = xdr_encode_u64(bp, vp->fid.vid);
        yfs_check_req(call, bp);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1433,6 +1446,7 @@ void yfs_fs_set_lock(struct afs_operation *op)
        bp = xdr_encode_u32(bp, op->lock.type);
        yfs_check_req(call, bp);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_calli(call, &vp->fid, op->lock.type);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1463,6 +1477,7 @@ void yfs_fs_extend_lock(struct afs_operation *op)
        bp = xdr_encode_YFSFid(bp, &vp->fid);
        yfs_check_req(call, bp);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1493,6 +1508,7 @@ void yfs_fs_release_lock(struct afs_operation *op)
        bp = xdr_encode_YFSFid(bp, &vp->fid);
        yfs_check_req(call, bp);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1559,6 +1575,7 @@ void yfs_fs_fetch_status(struct afs_operation *op)
        bp = xdr_encode_YFSFid(bp, &vp->fid);
        yfs_check_req(call, bp);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1739,6 +1756,7 @@ void yfs_fs_inline_bulk_status(struct afs_operation *op)
                bp = xdr_encode_YFSFid(bp, &op->more_files[i].fid);
        yfs_check_req(call, bp);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_NOFS);
 }
@@ -1901,6 +1919,7 @@ void yfs_fs_fetch_opaque_acl(struct afs_operation *op)
        bp = xdr_encode_YFSFid(bp, &vp->fid);
        yfs_check_req(call, bp);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_KERNEL);
 }
@@ -1951,6 +1970,7 @@ void yfs_fs_store_opaque_acl2(struct afs_operation *op)
        bp += size / sizeof(__be32);
        yfs_check_req(call, bp);
 
+       call->fid = vp->fid;
        trace_afs_make_fs_call(call, &vp->fid);
        afs_make_op_call(op, call, GFP_KERNEL);
 }

diff --git a/include/trace/events/afs.h b/include/trace/events/afs.h
index b2e0847eca47c01f89f132792c46e05ff6f0ef4e..5194b7e6dc8d07170e2fcda6079ed4d9b7f1293f 100644 (file)
--- a/include/trace/events/afs.h
+++ b/include/trace/events/afs.h
@@ -1576,6 +1576,42 @@ TRACE_EVENT(afs_rotate,
                      __entry->extra)
            );
 
+TRACE_EVENT(afs_make_call,
+           TP_PROTO(struct afs_call *call),
+
+           TP_ARGS(call),
+
+           TP_STRUCT__entry(
+                   __field(unsigned int,               call)
+                   __field(bool,                       is_vl)
+                   __field(enum afs_fs_operation,      op)
+                   __field_struct(struct afs_fid,      fid)
+                   __field_struct(struct sockaddr_rxrpc, srx)
+                            ),
+
+           TP_fast_assign(
+                   __entry->call = call->debug_id;
+                   __entry->op = call->operation_ID;
+                   __entry->fid = call->fid;
+                   memcpy(&__entry->srx, rxrpc_kernel_remote_srx(call->peer),
+                          sizeof(__entry->srx));
+                   __entry->srx.srx_service = call->service_id;
+                   __entry->is_vl = (__entry->srx.srx_service == VL_SERVICE ||
+                                     __entry->srx.srx_service == YFS_VL_SERVICE);
+                          ),
+
+           TP_printk("c=%08x %pISpc+%u %s %llx:%llx:%x",
+                     __entry->call,
+                     &__entry->srx.transport,
+                     __entry->srx.srx_service,
+                     __entry->is_vl ?
+                     __print_symbolic(__entry->op, afs_vl_operations) :
+                     __print_symbolic(__entry->op, afs_fs_operations),
+                     __entry->fid.vid,
+                     __entry->fid.vnode,
+                     __entry->fid.unique)
+           );
+
 #endif /* _TRACE_AFS_H */
 
 /* This part must be outside protection */