> On Nov 15, 2022, at 12:08 AM, Dai Ngo <dai.ngo@xxxxxxxxxx> wrote:
>
>
> On 11/11/22 7:25 AM, Chuck Lever III wrote:
>>
>>> On Nov 9, 2022, at 11:17 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 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>>> 2 files changed, 55 insertions(+)
>>>
>>> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
>>> index 813cdb67b370..eac7212c9218 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);
>>> @@ -6242,6 +6243,7 @@ deleg_reaper(struct work_struct *deleg_work)
>>> 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..efc69c96bcbd 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) \
>>> @@ -1510,6 +1512,57 @@ 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);
>>>
>>> +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)
>>> + __array(unsigned char, addr, sizeof(struct sockaddr_in6))
>>> + ),
>>> + 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];
>>> + memcpy(__entry->addr, &ra->ra_cb.cb_clp->cl_addr,
>>> + sizeof(struct sockaddr_in6));
>>> + ),
>>> + TP_printk("client %08x:%08x addr=%pISpc ra_keep=%d ra_bmval=0x%x",
>>> + __entry->cl_boot, __entry->cl_id,
>>> + __entry->addr, __entry->ra_keep, __entry->ra_bmval
>>> + )
>>> +);
>> This one should go earlier in the file, after "TRACE_EVENT(nfsd_cb_offload,"
>>
>> And let's use __sockaddr() and friends like the other nfsd_cb_ tracepoints.
>>
>>
>>> +
>>> +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)
>>> + __array(unsigned char, addr, sizeof(struct sockaddr_in6))
>>> + ),
>>> + 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;
>>> + memcpy(__entry->addr, &cb->cb_clp->cl_addr,
>>> + sizeof(struct sockaddr_in6));
>>> + ),
>>> + TP_printk("client %08x:%08x addr=%pISpc status=%d",
>>> + __entry->cl_boot, __entry->cl_id,
>>> + __entry->addr, __entry->status
>>> + )
>>> +);
>> I'd like you to change this to
>>
>> DEFINE_NFSD_CB_DONE_EVENT(nfsd_cb_recall_any_done);
>
> TP_PRORO of DEFINE_NFSD_CB_DONE_EVENT requires a stateid_t which
> CB_RECALL_ANY does not have. Can we can create a dummy stateid_t
> for nfsd_cb_recall_any_done?
Ah, I didn't remember that a state ID was recorded. OK, then a
separate TRACE_EVENT is appropriate for nfsd_cb_recall_any_done.
> Note that nfsd_cb_done_class does not print the server IP address
> which is more useful for tracing. Should I modify nfsd_cb_recall_any_done
> class to print the IP address from rpc_xprt?
The IP address is recorded by the Call side tracepoints. I'm OK
leaving the IP address out of the Reply side tracepoints.
> -Dai
>
>>
>>
>>> +
>>> #endif /* _NFSD_TRACE_H */
>>>
>>> #undef TRACE_INCLUDE_PATH
>>> --
>>> 2.9.5
>>>
>> --
>> Chuck Lever
--
Chuck Lever
