Re: [PATCH v5 4/4] NFSD: add CB_RECALL_ANY tracepoints

[dai.ngo@xxxxxxxxxx]

On 11/17/22 6:45 AM, Chuck Lever III wrote:
> > On Nov 16, 2022, at 10:44 PM, Dai Ngo <dai.ngo@xxxxxxxxxx> wrote:
> >
> > Add tracepoints to trace start and end of CB_RECALL_ANY operation.
> >
> > Signed-off-by: Dai Ngo <dai.ngo@xxxxxxxxxx>
> > ---
> > fs/nfsd/nfs4state.c |  2 ++
> > fs/nfsd/trace.h     | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
> > 2 files changed, 51 insertions(+)
> >
> > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> > index 13f326ae928c..935d669e2526 100644
> > --- a/fs/nfsd/nfs4state.c
> > +++ b/fs/nfsd/nfs4state.c
> > @@ -2859,6 +2859,7 @@ static int
> > nfsd4_cb_recall_any_done(struct nfsd4_callback *cb,
> > 				struct rpc_task *task)
> > {
> > +	trace_nfsd_cb_recall_any_done(cb, task);
> > 	switch (task->tk_status) {
> > 	case -NFS4ERR_DELAY:
> > 		rpc_delay(task, 2 * HZ);
> > @@ -6209,6 +6210,7 @@ deleg_reaper(struct nfsd_net *nn)
> > 		clp->cl_ra->ra_keep = 0;
> > 		clp->cl_ra->ra_bmval[0] = BIT(RCA4_TYPE_MASK_RDATA_DLG) |
> > 						BIT(RCA4_TYPE_MASK_WDATA_DLG);
> > +		trace_nfsd_cb_recall_any(clp->cl_ra);
> > 		nfsd4_run_cb(&clp->cl_ra->ra_cb);
> > 	}
> > }
> > diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
> > index 06a96e955bd0..bee951c335f1 100644
> > --- a/fs/nfsd/trace.h
> > +++ b/fs/nfsd/trace.h
> > @@ -9,9 +9,11 @@
> > #define _NFSD_TRACE_H
> >
> > #include <linux/tracepoint.h>
> > +#include <linux/sunrpc/xprt.h>
> >
> > #include "export.h"
> > #include "nfsfh.h"
> > +#include "xdr4.h"
> >
> > #define NFSD_TRACE_PROC_RES_FIELDS \
> > 		__field(unsigned int, netns_ino) \
> > @@ -1471,6 +1473,53 @@ TRACE_EVENT(nfsd_cb_offload,
> > 		__entry->fh_hash, __entry->count, __entry->status)
> > );
> >
> > +TRACE_EVENT(nfsd_cb_recall_any,
> > +	TP_PROTO(
> > +		const struct nfsd4_cb_recall_any *ra
> > +	),
> > +	TP_ARGS(ra),
> > +	TP_STRUCT__entry(
> > +		__field(u32, cl_boot)
> > +		__field(u32, cl_id)
> > +		__field(u32, ra_keep)
> > +		__field(u32, ra_bmval)
> > +		__sockaddr(addr, sizeof(struct sockaddr_storage))
> > +	),
> > +	TP_fast_assign(
> > +		__entry->cl_boot = ra->ra_cb.cb_clp->cl_clientid.cl_boot;
> > +		__entry->cl_id = ra->ra_cb.cb_clp->cl_clientid.cl_id;
> > +		__entry->ra_keep = ra->ra_keep;
> > +		__entry->ra_bmval = ra->ra_bmval[0];
> > +		__assign_sockaddr(addr, &ra->ra_cb.cb_clp->cl_addr,
> > +				  sizeof(struct sockaddr_storage))
> > +	),
> > +	TP_printk("Client %08x:%08x addr=%pISpc ra_keep=%d ra_bmval=0x%x",
> > +		__entry->cl_boot, __entry->cl_id,
> > +		__get_sockaddr(addr), __entry->ra_keep, __entry->ra_bmval
> This needs a "show_recall_any_bitmap" to convert to human-readable
> symbols.

Yes, it makes sense.

Thanks,
-Dai

> > +	)
> > +);
> > +
> > +TRACE_EVENT(nfsd_cb_recall_any_done,
> > +	TP_PROTO(
> > +		const struct nfsd4_callback *cb,
> > +		const struct rpc_task *task
> > +	),
> > +	TP_ARGS(cb, task),
> > +	TP_STRUCT__entry(
> > +		__field(u32, cl_boot)
> > +		__field(u32, cl_id)
> > +		__field(int, status)
> > +	),
> > +	TP_fast_assign(
> > +		__entry->status = task->tk_status;
> > +		__entry->cl_boot = cb->cb_clp->cl_clientid.cl_boot;
> > +		__entry->cl_id = cb->cb_clp->cl_clientid.cl_id;
> > +	),
> > +	TP_printk("client %08x:%08x status=%d",
> > +		__entry->cl_boot, __entry->cl_id, __entry->status
> > +	)
> > +);
> > +
> > DECLARE_EVENT_CLASS(nfsd_cb_done_class,
> > 	TP_PROTO(
> > 		const stateid_t *stp,
> > --
> > 2.9.5
> --
> Chuck Lever