xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFSD: Add nfsd_clid_verf_mismatch tracepoint

Browse Source 
[ Upstream commit 744ea54c869cebe41fbad5f53f8a8ca5d93a5c97 ]

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>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chuck Lever
2021-05-14 15:55:36 -04:00
committed by Greg Kroah-Hartman
parent c8493d7308
commit 8da1871206
2 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/nfsd/nfs4state.c
View File

@@ -3213,6 +3213,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
goto out_copy; goto out_copy;
} }
/* case 5, client reboot */ /* case 5, client reboot */
trace_nfsd_clid_verf_mismatch(conf, rqstp, &verf);
conf = NULL; conf = NULL;
goto out_new; goto out_new;
} }
@@ -4018,9 +4019,13 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
if (unconf) if (unconf)
unhash_client_locked(unconf); unhash_client_locked(unconf);
/* We need to handle only case 1: probable callback update */ /* We need to handle only case 1: probable callback update */
if (conf && same_verf(&conf->cl_verifier, &clverifier)) { if (conf) {
if (same_verf(&conf->cl_verifier, &clverifier)) {
copy_clid(new, conf); copy_clid(new, conf);
gen_confirm(new, nn); gen_confirm(new, nn);
} else
trace_nfsd_clid_verf_mismatch(conf, rqstp,
&clverifier);
} }
new->cl_minorversion = 0; new->cl_minorversion = 0;
gen_callback(new, setclid, rqstp); gen_callback(new, setclid, rqstp);

32
fs/nfsd/trace.h
View File

@@ -564,6 +564,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, TRACE_EVENT(nfsd_clid_inuse_err,
TP_PROTO(const struct nfs4_client *clp), TP_PROTO(const struct nfs4_client *clp),
TP_ARGS(clp), TP_ARGS(clp),