NFSD: Add tracepoints to report NFSv4 callback completions

[ Upstream commit 1035d65446a018ca2dd179e29a2fcd6d29057781 ]

Wireshark has always been lousy about dissecting NFSv4 callbacks,
especially NFSv4.0 backchannel requests. Add tracepoints so we
can surgically capture these events in the trace log.

Tracepoints are time-stamped and ordered so that we can now observe
the timing relationship between a CB_RECALL Reply and the client's
DELEGRETURN Call. Example:

            nfsd-1153  [002]   211.986391: nfsd_cb_recall:       addr=192.168.1.67:45767 client 62ea82e4:fee7492a stateid 00000003:00000001

            nfsd-1153  [002]   212.095634: nfsd_compound:        xid=0x0000002c opcnt=2
            nfsd-1153  [002]   212.095647: nfsd_compound_status: op=1/2 OP_PUTFH status=0
            nfsd-1153  [002]   212.095658: nfsd_file_put:        hash=0xf72 inode=0xffff9291148c7410 ref=3 flags=HASHED|REFERENCED may=READ file=0xffff929103b3ea00
            nfsd-1153  [002]   212.095661: nfsd_compound_status: op=2/2 OP_DELEGRETURN status=0
   kworker/u25:8-148   [002]   212.096713: nfsd_cb_recall_done:  client 62ea82e4:fee7492a stateid 00000003:00000001 status=0

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c
index 7018d209b784a5e0cbaa687d85a228b7b0965950..e4e23b2a3e6552d1bef590d1f1ca42a78cf864c4 100644 (file)
--- a/fs/nfsd/nfs4layouts.c
+++ b/fs/nfsd/nfs4layouts.c
@@ -657,7 +657,7 @@ nfsd4_cb_layout_done(struct nfsd4_callback *cb, struct rpc_task *task)
        ktime_t now, cutoff;
        const struct nfsd4_layout_ops *ops;
 
-
+       trace_nfsd_cb_layout_done(&ls->ls_stid.sc_stateid, task);
        switch (task->tk_status) {
        case 0:
        case -NFS4ERR_DELAY:

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index e4c0dc577fe3579b57af1510e802bac5d82553c5..ce8062c9593151fb7a1bb6ee0293f873c7100ec3 100644 (file)
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1604,6 +1604,10 @@ static void nfsd4_cb_offload_release(struct nfsd4_callback *cb)
 static int nfsd4_cb_offload_done(struct nfsd4_callback *cb,
                                 struct rpc_task *task)
 {
+       struct nfsd4_cb_offload *cbo =
+               container_of(cb, struct nfsd4_cb_offload, co_cb);
+
+       trace_nfsd_cb_offload_done(&cbo->co_res.cb_stateid, task);
        return 1;
 }
 

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 66cf8217ebe5776dbe8a3a6d5066ad5f9709f110..a0c5658599ead2f2026a5d771d6519242de2d8a7 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -357,6 +357,8 @@ nfsd4_cb_notify_lock_prepare(struct nfsd4_callback *cb)
 static int
 nfsd4_cb_notify_lock_done(struct nfsd4_callback *cb, struct rpc_task *task)
 {
+       trace_nfsd_cb_notify_lock_done(&zero_stateid, task);
+
        /*
         * Since this is just an optimization, we don't try very hard if it
         * turns out not to succeed. We'll requeue it on NFS4ERR_DELAY, and
@@ -4760,6 +4762,8 @@ static int nfsd4_cb_recall_done(struct nfsd4_callback *cb,
 {
        struct nfs4_delegation *dp = cb_to_delegation(cb);
 
+       trace_nfsd_cb_recall_done(&dp->dl_stid.sc_stateid, task);
+
        if (dp->dl_stid.sc_type == NFS4_CLOSED_DELEG_STID ||
            dp->dl_stid.sc_type == NFS4_REVOKED_DELEG_STID)
                return 1;

diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
index c5d4a258680c34944dd555077aee31bac98abddc..d832429e575e4a95cf17a22904654a498a3eabfc 100644 (file)
--- a/fs/nfsd/trace.h
+++ b/fs/nfsd/trace.h
@@ -1449,6 +1449,45 @@ TRACE_EVENT(nfsd_cb_offload,
                __entry->fh_hash, __entry->count, __entry->status)
 );
 
+DECLARE_EVENT_CLASS(nfsd_cb_done_class,
+       TP_PROTO(
+               const stateid_t *stp,
+               const struct rpc_task *task
+       ),
+       TP_ARGS(stp, task),
+       TP_STRUCT__entry(
+               __field(u32, cl_boot)
+               __field(u32, cl_id)
+               __field(u32, si_id)
+               __field(u32, si_generation)
+               __field(int, status)
+       ),
+       TP_fast_assign(
+               __entry->cl_boot = stp->si_opaque.so_clid.cl_boot;
+               __entry->cl_id = stp->si_opaque.so_clid.cl_id;
+               __entry->si_id = stp->si_opaque.so_id;
+               __entry->si_generation = stp->si_generation;
+               __entry->status = task->tk_status;
+       ),
+       TP_printk("client %08x:%08x stateid %08x:%08x status=%d",
+               __entry->cl_boot, __entry->cl_id, __entry->si_id,
+               __entry->si_generation, __entry->status
+       )
+);
+
+#define DEFINE_NFSD_CB_DONE_EVENT(name)                        \
+DEFINE_EVENT(nfsd_cb_done_class, name,                 \
+       TP_PROTO(                                       \
+               const stateid_t *stp,                   \
+               const struct rpc_task *task             \
+       ),                                              \
+       TP_ARGS(stp, task))
+
+DEFINE_NFSD_CB_DONE_EVENT(nfsd_cb_recall_done);
+DEFINE_NFSD_CB_DONE_EVENT(nfsd_cb_notify_lock_done);
+DEFINE_NFSD_CB_DONE_EVENT(nfsd_cb_layout_done);
+DEFINE_NFSD_CB_DONE_EVENT(nfsd_cb_offload_done);
+
 #endif /* _NFSD_TRACE_H */
 
 #undef TRACE_INCLUDE_PATH