From: Chuck Lever <chuck.lever@oracle.com>
To: linux-nfs@vger.kernel.org
Cc: dwysocha@redhat.com, bfields@fieldses.org, rostedt@goodmis.org
Subject: [PATCH v2 04/25] NFSD: Add nfsd_clid_verf_mismatch tracepoint
Date: Wed, 12 May 2021 11:35:22 -0400 [thread overview]
Message-ID: <162083372215.3108.12010554310627718001.stgit@klimt.1015granger.net> (raw)
In-Reply-To: <162083366966.3108.12581818416105328952.stgit@klimt.1015granger.net>
Record when a client presents a different boot verifier than the
one we know about. Typically this is a sign the client has
rebooted, but sometimes it signals a conflicting client ID, which
the client's administrator will need to address.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
fs/nfsd/nfs4state.c | 11 ++++++++---
fs/nfsd/trace.h | 32 ++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 84c4021b3826..69405cc9d823 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3191,6 +3191,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
goto out_copy;
}
/* case 5, client reboot */
+ trace_nfsd_clid_verf_mismatch(conf, rqstp, &verf);
conf = NULL;
goto out_new;
}
@@ -3986,9 +3987,13 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
if (unconf)
unhash_client_locked(unconf);
/* We need to handle only case 1: probable callback update */
- if (conf && same_verf(&conf->cl_verifier, &clverifier)) {
- copy_clid(new, conf);
- gen_confirm(new, nn);
+ if (conf) {
+ if (same_verf(&conf->cl_verifier, &clverifier)) {
+ copy_clid(new, conf);
+ gen_confirm(new, nn);
+ } else
+ trace_nfsd_clid_verf_mismatch(conf, rqstp,
+ &clverifier);
}
new->cl_minorversion = 0;
gen_callback(new, setclid, rqstp);
diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
index 25ed99220c7b..7e2fce504a2d 100644
--- a/fs/nfsd/trace.h
+++ b/fs/nfsd/trace.h
@@ -562,6 +562,38 @@ TRACE_EVENT(nfsd_clid_cred_mismatch,
)
)
+TRACE_EVENT(nfsd_clid_verf_mismatch,
+ TP_PROTO(
+ const struct nfs4_client *clp,
+ const struct svc_rqst *rqstp,
+ const nfs4_verifier *verf
+ ),
+ TP_ARGS(clp, rqstp, verf),
+ TP_STRUCT__entry(
+ __field(u32, cl_boot)
+ __field(u32, cl_id)
+ __array(unsigned char, cl_verifier, NFS4_VERIFIER_SIZE)
+ __array(unsigned char, new_verifier, NFS4_VERIFIER_SIZE)
+ __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;
+ memcpy(__entry->cl_verifier, (void *)&clp->cl_verifier,
+ NFS4_VERIFIER_SIZE);
+ memcpy(__entry->new_verifier, (void *)verf,
+ NFS4_VERIFIER_SIZE);
+ memcpy(__entry->addr, &rqstp->rq_xprt->xpt_remote,
+ sizeof(struct sockaddr_in6));
+ ),
+ TP_printk("client %08x:%08x verf=0x%s, updated=0x%s from addr=%pISpc",
+ __entry->cl_boot, __entry->cl_id,
+ __print_hex_str(__entry->cl_verifier, NFS4_VERIFIER_SIZE),
+ __print_hex_str(__entry->new_verifier, NFS4_VERIFIER_SIZE),
+ __entry->addr
+ )
+);
+
TRACE_EVENT(nfsd_clid_inuse_err,
TP_PROTO(const struct nfs4_client *clp),
TP_ARGS(clp),
next prev parent reply other threads:[~2021-05-12 16:31 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-12 15:34 [PATCH v2 00/25] NFSD callback and lease management observability Chuck Lever
2021-05-12 15:35 ` [PATCH v2 01/25] NFSD: Fix TP_printk() format specifier in trace_nfsd_dirent() Chuck Lever
2021-05-12 16:26 ` Steven Rostedt
2021-05-12 16:52 ` Chuck Lever III
2021-05-13 14:50 ` Steven Rostedt
2021-05-13 14:53 ` Chuck Lever III
2021-05-13 15:02 ` Steven Rostedt
2021-05-13 15:10 ` Chuck Lever III
2021-05-13 18:43 ` Chuck Lever III
2021-05-13 19:00 ` Steven Rostedt
2021-05-13 19:08 ` Chuck Lever III
2021-05-13 19:17 ` Steven Rostedt
2021-05-13 20:01 ` Chuck Lever III
2021-07-12 15:18 ` Chuck Lever III
2021-07-12 17:09 ` Steven Rostedt
2021-05-12 16:53 ` Steven Rostedt
2021-05-12 15:35 ` [PATCH v2 02/25] NFSD: Fix TP_printk() format specifier in nfsd_clid_class Chuck Lever
2021-05-12 15:35 ` [PATCH v2 03/25] NFSD: Add nfsd_clid_cred_mismatch tracepoint Chuck Lever
2021-05-12 15:35 ` Chuck Lever [this message]
2021-05-12 15:35 ` [PATCH v2 05/25] NFSD: Remove trace_nfsd_clid_inuse_err Chuck Lever
2021-05-12 15:35 ` [PATCH v2 06/25] NFSD: Add nfsd_clid_confirmed tracepoint Chuck Lever
2021-05-12 15:35 ` [PATCH v2 07/25] NFSD: Add nfsd_clid_reclaim_complete tracepoint Chuck Lever
2021-05-12 15:35 ` [PATCH v2 08/25] NFSD: Add nfsd_clid_destroyed tracepoint Chuck Lever
2021-05-12 15:35 ` [PATCH v2 09/25] NFSD: Add a couple more nfsd_clid_expired call sites Chuck Lever
2021-05-13 16:42 ` David Wysochanski
2021-05-13 17:05 ` Chuck Lever III
2021-05-12 15:36 ` [PATCH v2 10/25] NFSD: Add an RPC authflavor tracepoint display helper Chuck Lever
2021-05-12 15:36 ` [PATCH v2 11/25] NFSD: Add tracepoints for SETCLIENTID edge cases Chuck Lever
2021-05-12 15:36 ` [PATCH v2 12/25] NFSD: Add tracepoints for EXCHANGEID " Chuck Lever
2021-05-12 15:36 ` [PATCH v2 13/25] NFSD: Constify @fh argument of knfsd_fh_hash() Chuck Lever
2021-05-12 15:36 ` [PATCH v2 14/25] NFSD: Capture every CB state transition Chuck Lever
2021-05-12 15:36 ` [PATCH v2 15/25] NFSD: Drop TRACE_DEFINE_ENUM for NFSD4_CB_<state> macros Chuck Lever
2021-05-12 15:36 ` [PATCH v2 16/25] NFSD: Add cb_lost tracepoint Chuck Lever
2021-05-12 15:36 ` [PATCH v2 17/25] NFSD: Adjust cb_shutdown tracepoint Chuck Lever
2021-05-12 15:36 ` [PATCH v2 18/25] NFSD: Remove spurious cb_setup_err tracepoint Chuck Lever
2021-05-12 15:37 ` [PATCH v2 19/25] NFSD: Enhance the nfsd_cb_setup tracepoint Chuck Lever
2021-05-12 15:37 ` [PATCH v2 20/25] NFSD: Add an nfsd_cb_lm_notify tracepoint Chuck Lever
2021-05-12 15:37 ` [PATCH v2 21/25] NFSD: Add an nfsd_cb_offload tracepoint Chuck Lever
2021-05-12 15:37 ` [PATCH v2 22/25] NFSD: Replace the nfsd_deleg_break tracepoint Chuck Lever
2021-05-12 15:37 ` [PATCH v2 23/25] NFSD: Add an nfsd_cb_probe tracepoint Chuck Lever
2021-05-12 15:37 ` [PATCH v2 24/25] NFSD: Remove the nfsd_cb_work and nfsd_cb_done tracepoints Chuck Lever
2021-05-12 15:37 ` [PATCH v2 25/25] NFSD: Update nfsd_cb_args tracepoint Chuck Lever
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=162083372215.3108.12010554310627718001.stgit@klimt.1015granger.net \
--to=chuck.lever@oracle.com \
--cc=bfields@fieldses.org \
--cc=dwysocha@redhat.com \
--cc=linux-nfs@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).