| Message ID | 1397846704-14567-37-git-send-email-trond.myklebust@primarydata.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> +static void nfs4_put_stateid(struct nfs4_stid *s) > +{ > + if (s == NULL) > + return; > + switch (s->sc_type) { > + case NFS4_OPEN_STID: > + case NFS4_LOCK_STID: > + case NFS4_CLOSED_STID: > + put_generic_stateid(openlockstateid(s)); > + break; > + case NFS4_DELEG_STID: > + case NFS4_REVOKED_DELEG_STID: > + case NFS4_CLOSED_DELEG_STID: > + nfs4_put_delegation(delegstateid(s)); > + } > +} I really don't like the way the inheritance for the stateids works, a pure put operation shouldn't need this. I think all this can be fixed by adding a ->free function pointer to struct nfs4_stid. At this point the braindamage of passing a kmem_cache pointer to various function can be removed (similar to how nfs4_alloc_stid should be replaced with a nfs4_init_stid that takes an already allocated stid), and nothing in the normal refcounting path should need these switches. > @@ -3804,26 +3823,33 @@ static __be32 nfsd4_validate_stateid(struct nfs4_client *cl, stateid_t *stateid) > return nfserr_bad_stateid; > status = check_stateid_generation(stateid, &s->sc_stateid, 1); > if (status) > - return status; > + goto out_put_stid; > switch (s->sc_type) { > case NFS4_DELEG_STID: > - return nfs_ok; > + status = nfs_ok; > + break; > case NFS4_REVOKED_DELEG_STID: > - return nfserr_deleg_revoked; > + status = nfserr_deleg_revoked; > + break; > case NFS4_OPEN_STID: > case NFS4_LOCK_STID: > ols = openlockstateid(s); > if (ols->st_stateowner->so_is_open_owner > && !(openowner(ols->st_stateowner)->oo_flags > & NFS4_OO_CONFIRMED)) > - return nfserr_bad_stateid; > - return nfs_ok; > + status = nfserr_bad_stateid; > + else > + status = nfs_ok; > + break; Not quite as urgent as for the refcounting, but I think moving more of these switches on the type into proper methods would improve the stateid code a lot. -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, 2014-04-19 at 07:50 -0700, Christoph Hellwig wrote: > > +static void nfs4_put_stateid(struct nfs4_stid *s) > > +{ > > + if (s == NULL) > > + return; > > + switch (s->sc_type) { > > + case NFS4_OPEN_STID: > > + case NFS4_LOCK_STID: > > + case NFS4_CLOSED_STID: > > + put_generic_stateid(openlockstateid(s)); > > + break; > > + case NFS4_DELEG_STID: > > + case NFS4_REVOKED_DELEG_STID: > > + case NFS4_CLOSED_DELEG_STID: > > + nfs4_put_delegation(delegstateid(s)); > > + } > > +} > > I really don't like the way the inheritance for the stateids works, > a pure put operation shouldn't need this. I think all this can be > fixed by adding a ->free function pointer to struct nfs4_stid. At this > point the braindamage of passing a kmem_cache pointer to various > function can be removed (similar to how nfs4_alloc_stid should be > replaced with a nfs4_init_stid that takes an already allocated stid), > and nothing in the normal refcounting path should need these switches. Ack. I've added a free() pointer to nfs4_stid. > > @@ -3804,26 +3823,33 @@ static __be32 nfsd4_validate_stateid(struct nfs4_client *cl, stateid_t *stateid) > > return nfserr_bad_stateid; > > status = check_stateid_generation(stateid, &s->sc_stateid, 1); > > if (status) > > - return status; > > + goto out_put_stid; > > switch (s->sc_type) { > > case NFS4_DELEG_STID: > > - return nfs_ok; > > + status = nfs_ok; > > + break; > > case NFS4_REVOKED_DELEG_STID: > > - return nfserr_deleg_revoked; > > + status = nfserr_deleg_revoked; > > + break; > > case NFS4_OPEN_STID: > > case NFS4_LOCK_STID: > > ols = openlockstateid(s); > > if (ols->st_stateowner->so_is_open_owner > > && !(openowner(ols->st_stateowner)->oo_flags > > & NFS4_OO_CONFIRMED)) > > - return nfserr_bad_stateid; > > - return nfs_ok; > > + status = nfserr_bad_stateid; > > + else > > + status = nfs_ok; > > + break; > > Not quite as urgent as for the refcounting, but I think moving more > of these switches on the type into proper methods would improve the > stateid code a lot. Agreed, but I'm leaving that as an exercise for the reader (at least as far as this patch series is concerned).
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 063ff9aba5d4..b9d6da652fb1 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1482,6 +1482,23 @@ static void gen_confirm(struct nfs4_client *clp) memcpy(clp->cl_confirm.data, verf, sizeof(clp->cl_confirm.data)); } +static void nfs4_put_stateid(struct nfs4_stid *s) +{ + if (s == NULL) + return; + switch (s->sc_type) { + case NFS4_OPEN_STID: + case NFS4_LOCK_STID: + case NFS4_CLOSED_STID: + put_generic_stateid(openlockstateid(s)); + break; + case NFS4_DELEG_STID: + case NFS4_REVOKED_DELEG_STID: + case NFS4_CLOSED_DELEG_STID: + nfs4_put_delegation(delegstateid(s)); + } +} + static struct nfs4_stid *find_stateid_locked(struct nfs4_client *cl, stateid_t *t) { struct nfs4_stid *ret; @@ -1498,6 +1515,8 @@ static struct nfs4_stid *find_stateid(struct nfs4_client *cl, stateid_t *t) spin_lock(&cl->cl_lock); ret = find_stateid_locked(cl, t); + if (ret != NULL) + atomic_inc(&ret->sc_count); spin_unlock(&cl->cl_lock); return ret; } @@ -3804,26 +3823,33 @@ static __be32 nfsd4_validate_stateid(struct nfs4_client *cl, stateid_t *stateid) return nfserr_bad_stateid; status = check_stateid_generation(stateid, &s->sc_stateid, 1); if (status) - return status; + goto out_put_stid; switch (s->sc_type) { case NFS4_DELEG_STID: - return nfs_ok; + status = nfs_ok; + break; case NFS4_REVOKED_DELEG_STID: - return nfserr_deleg_revoked; + status = nfserr_deleg_revoked; + break; case NFS4_OPEN_STID: case NFS4_LOCK_STID: ols = openlockstateid(s); if (ols->st_stateowner->so_is_open_owner && !(openowner(ols->st_stateowner)->oo_flags & NFS4_OO_CONFIRMED)) - return nfserr_bad_stateid; - return nfs_ok; + status = nfserr_bad_stateid; + else + status = nfs_ok; + break; default: printk("unknown stateid type %x\n", s->sc_type); case NFS4_CLOSED_STID: case NFS4_CLOSED_DELEG_STID: - return nfserr_bad_stateid; + status = nfserr_bad_stateid; } +out_put_stid: + nfs4_put_stateid(s); + return status; } static __be32 nfsd4_lookup_stateid(stateid_t *stateid, unsigned char typemask, @@ -3976,12 +4002,12 @@ nfsd4_free_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, switch (s->sc_type) { case NFS4_DELEG_STID: ret = nfserr_locks_held; - goto out; + break; case NFS4_OPEN_STID: case NFS4_LOCK_STID: ret = check_stateid_generation(stateid, &s->sc_stateid, 1); if (ret) - goto out; + break; if (s->sc_type == NFS4_LOCK_STID) ret = nfsd4_free_lock_stateid(openlockstateid(s)); else @@ -3995,6 +4021,7 @@ nfsd4_free_stateid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, default: ret = nfserr_bad_stateid; } + nfs4_put_stateid(s); out: nfs4_unlock_state(); return ret;
Ensure the stateids won't be freed while we're inspecting them. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> --- fs/nfsd/nfs4state.c | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-)