This is a note to let you know that I've just added the patch titled
NFSD: Remove the nfsd_cb_work and nfsd_cb_done tracepoints
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nfsd-remove-the-nfsd_cb_work-and-nfsd_cb_done-tracep.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 001e72fdae26c8dfae1d79a01f71d1245e062e31
Author: Chuck Lever <chuck.lever@xxxxxxxxxx>
Date: Fri May 14 15:57:32 2021 -0400
NFSD: Remove the nfsd_cb_work and nfsd_cb_done tracepoints
[ Upstream commit 1d2bf65983a137121c165a7e69b2885572954915 ]
Clean up: These are noise in properly working systems. If you really
need to observe the operation of the callback mechanism, use the
sunrpc:rpc\* tracepoints along with the workqueue tracepoints.
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 453f60b127ebb..59dc80ecd3764 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -972,7 +972,6 @@ static void nfsd4_cb_probe_done(struct rpc_task *task, void *calldata)
{
struct nfs4_client *clp = container_of(calldata, struct nfs4_client, cl_cb_null);
- trace_nfsd_cb_done(clp, task->tk_status);
if (task->tk_status)
nfsd4_mark_cb_down(clp, task->tk_status);
else
@@ -1174,8 +1173,6 @@ static void nfsd4_cb_done(struct rpc_task *task, void *calldata)
struct nfsd4_callback *cb = calldata;
struct nfs4_client *clp = cb->cb_clp;
- trace_nfsd_cb_done(clp, task->tk_status);
-
if (!nfsd4_cb_sequence_done(task, cb))
return;
@@ -1328,8 +1325,6 @@ nfsd4_run_cb_work(struct work_struct *work)
struct rpc_clnt *clnt;
int flags;
- trace_nfsd_cb_work(clp, cb->cb_msg.rpc_proc->p_name);
-
if (cb->cb_need_restart) {
cb->cb_need_restart = false;
} else {
diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
index 4361a0807f070..87ac1f19bfd0b 100644
--- a/fs/nfsd/trace.h
+++ b/fs/nfsd/trace.h
@@ -979,54 +979,6 @@ TRACE_EVENT(nfsd_cb_setup_err,
__entry->addr, __entry->cl_boot, __entry->cl_id, __entry->error)
);
-TRACE_EVENT(nfsd_cb_work,
- TP_PROTO(
- const struct nfs4_client *clp,
- const char *procedure
- ),
- TP_ARGS(clp, procedure),
- TP_STRUCT__entry(
- __field(u32, cl_boot)
- __field(u32, cl_id)
- __string(procedure, procedure)
- __array(unsigned char, addr, sizeof(struct sockaddr_in6))
- ),
- TP_fast_assign(
- __entry->cl_boot = clp->cl_clientid.cl_boot;
- __entry->cl_id = clp->cl_clientid.cl_id;
- __assign_str(procedure, procedure)
- memcpy(__entry->addr, &clp->cl_cb_conn.cb_addr,
- sizeof(struct sockaddr_in6));
- ),
- TP_printk("addr=%pISpc client %08x:%08x procedure=%s",
- __entry->addr, __entry->cl_boot, __entry->cl_id,
- __get_str(procedure))
-);
-
-TRACE_EVENT(nfsd_cb_done,
- TP_PROTO(
- const struct nfs4_client *clp,
- int status
- ),
- TP_ARGS(clp, status),
- 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->cl_boot = clp->cl_clientid.cl_boot;
- __entry->cl_id = clp->cl_clientid.cl_id;
- __entry->status = status;
- memcpy(__entry->addr, &clp->cl_cb_conn.cb_addr,
- sizeof(struct sockaddr_in6));
- ),
- TP_printk("addr=%pISpc client %08x:%08x status=%d",
- __entry->addr, __entry->cl_boot, __entry->cl_id,
- __entry->status)
-);
-
TRACE_EVENT(nfsd_cb_recall,
TP_PROTO(
const struct nfs4_stid *stid
