> On Sep 25, 2020, at 10:17 AM, Bruce Fields <bfields@xxxxxxxxxxxx> wrote: > > On Fri, Sep 25, 2020 at 09:59:54AM -0400, Chuck Lever wrote: >> >> >>> On Sep 24, 2020, at 7:45 PM, J. Bruce Fields <bfields@xxxxxxxxxxxx> wrote: >>> >>> On Mon, Sep 21, 2020 at 02:13:07PM -0400, Chuck Lever wrote: >>>> This is follow-on work to the tracepoints added in the NFS server's >>>> duplicate reply cache. Here, tracepoints are introduced that report >>>> replies from cache as well as encoding and decoding errors. >>>> >>>> The NFSv2, v3, and v4 dispatcher requirements have diverged over >>>> time, leaving us with a little bit of technical debt. In addition, >>>> I wanted to add a tracepoint for NFSv2 and NFSv3 similar to the >>>> nfsd4_compound/compoundstatus tracepoints. Lastly, removing some >>>> conditional branches from this hot path helps optimize CPU >>>> utilization. So, I've duplicated the nfsd_dispatcher function. >>> >>> Comparing current nfsd_dispatch to the nfsv2/v3 nfsd_dispatch: the only >>> thing I spotted removed from the v2/v3-specific dispatch is the >>> rq_lease_breaker = NULL. (I think that's not correct, actually. We >>> could remove the need for that to be set in the v2/v3 case, but with the >>> current code it does need to be set.) >> >> Noted with thanks. > > Maybe just do this? I'll try it out. Thanks! > --b. > > commit c7265a111269 > Author: J. Bruce Fields <bfields@xxxxxxxxxx> > Date: Fri Sep 25 10:12:39 2020 -0400 > > nfsd: rq_lease_breaker cleanup > > Since only the v4 code cares about it, maybe it's better to leave > rq_lease_breaker out of the common dispatch code? > > Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx> > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index 62afcae18e17..a498278ba96b 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -4597,6 +4597,9 @@ static bool nfsd_breaker_owns_lease(struct file_lock *fl) > > if (!i_am_nfsd()) > return NULL; > + /* Note rq_prog == NFS_ACL_PROGRAM is also possible: */ > + if (rqst->rq_prog != NFS_PROGRAM || rqst->rq_vers < 4) > + return NULL; > rqst = kthread_data(current); > clp = *(rqst->rq_lease_breaker); > return dl->dl_stid.sc_client == clp; > diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c > index b603dfcdd361..8d6f6f4c8b28 100644 > --- a/fs/nfsd/nfssvc.c > +++ b/fs/nfsd/nfssvc.c > @@ -1016,7 +1016,6 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp) > *statp = rpc_garbage_args; > return 1; > } > - rqstp->rq_lease_breaker = NULL; > /* > * Give the xdr decoder a chance to change this if it wants > * (necessary in the NFSv4.0 compound case) -- Chuck Lever
