On Sat, Mar 28, 2009 at 11:32:21AM +0300, Benny Halevy wrote: > Implement the sequence operation conforming to > http://tools.ietf.org/html/draft-ietf-nfsv4-minorversion1-26 > > Check for stale clientid (as derived from the sessionid). > Enforce slotid range and exactly-once semantics using > the slotid and seqid. > > If everything went well renew the client lease and > mark the slot INPROGRESS. > > [nfsd41: rename sequence catchthis to cachethis] > Signed-off-by: Andy Adamson<andros@xxxxxxxxxx> > [pulled some code to set cstate->slot from "nfsd DRC logic"] > [use sessionid_lock spin lock] > [nfsd41: use bool inuse for slot state] > Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx> > --- > fs/nfsd/nfs4state.c | 71 +++++++++++++++++++++++++++++++++++++++++++- > fs/nfsd/nfs4xdr.c | 32 +++++++++++++++++++- > include/linux/nfsd/xdr4.h | 10 ++++++- > 3 files changed, 108 insertions(+), 5 deletions(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index 0c39376..a19f292 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -1004,6 +1004,32 @@ error: > return status; > } > > +static int > +check_slot_seqid(u32 seqid, struct nfsd4_slot *slot) > +{ > + dprintk("%s enter. seqid %d slot->sl_seqid %d\n", __func__, seqid, > + slot->sl_seqid); > + > + /* The slot is in use, and no response has been sent. */ > + if (slot->sl_inuse) { > + if (seqid == slot->sl_seqid) > + return nfserr_jukebox; > + else > + return nfserr_seq_misordered; > + } > + /* Normal */ > + if (likely(seqid == slot->sl_seqid + 1)) > + return nfs_ok; > + /* Replay */ > + if (seqid == slot->sl_seqid) > + return nfserr_replay_cache; > + /* Wraparound */ > + if (seqid == 1 && (slot->sl_seqid + 1) == 0) > + return nfs_ok; > + /* Misordered replay or misordered new request */ > + return nfserr_seq_misordered; > +} > + > __be32 > nfsd4_create_session(struct svc_rqst *rqstp, > struct nfsd4_compound_state *cstate, > @@ -1021,11 +1047,52 @@ nfsd4_destroy_session(struct svc_rqst *r, > } > > __be32 > -nfsd4_sequence(struct svc_rqst *r, > +nfsd4_sequence(struct svc_rqst *rqstp, > struct nfsd4_compound_state *cstate, > struct nfsd4_sequence *seq) > { > - return -1; /* stub */ > + struct nfsd4_session *session; > + struct nfsd4_slot *slot; > + int status; > + > + spin_lock(&sessionid_lock); > + status = nfserr_badsession; > + session = find_in_sessionid_hashtbl(&seq->sessionid); > + if (!session) > + goto out; > + > + status = nfserr_badslot; > + if (seq->slotid >= session->se_fnumslots) > + goto out; > + > + slot = &session->se_slots[seq->slotid]; > + dprintk("%s: slotid %d\n", __func__, seq->slotid); > + > + status = check_slot_seqid(seq->seqid, slot); > + if (status == nfserr_replay_cache) { > + cstate->slot = slot; > + goto replay_cache; > + } > + if (status) > + goto out; > + > + /* Success! bump slot seqid */ > + slot->sl_inuse = true; > + slot->sl_seqid = seq->seqid; > + > + cstate->slot = slot; > + > +replay_cache: > + /* Renew the clientid on success and on replay. > + * Hold a session reference until done processing the compound: > + * nfsd4_put_session called only if the cstate slot is set. > + */ > + renew_client(session->se_client); > + nfsd4_get_session(slot->sl_session); > +out: > + spin_unlock(&sessionid_lock); > + dprintk("%s: return %d\n", __func__, ntohl(status)); > + return status; > } > #endif /* CONFIG_NFSD_V4_1 */ > > diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c > index 840cf6a..c6b490e 100644 > --- a/fs/nfsd/nfs4xdr.c > +++ b/fs/nfsd/nfs4xdr.c > @@ -1114,7 +1114,16 @@ static __be32 > nfsd4_decode_sequence(struct nfsd4_compoundargs *argp, > struct nfsd4_sequence *seq) > { > - return nfserr_opnotsupp; /* stub */ > + DECODE_HEAD; > + > + READ_BUF(NFS4_MAX_SESSIONID_LEN + 16); > + COPYMEM(seq->sessionid.data, NFS4_MAX_SESSIONID_LEN); > + READ32(seq->seqid); > + READ32(seq->slotid); > + READ32(seq->maxslots); > + READ32(seq->cachethis); > + > + DECODE_TAIL; > } > #endif /* CONFIG_NFSD_V4_1 */ > > @@ -2836,7 +2845,26 @@ static __be32 > nfsd4_encode_sequence(struct nfsd4_compoundres *resp, int nfserr, > struct nfsd4_sequence *seq) > { > - /* stub */ > + ENCODE_HEAD; > + > + if (nfserr) > + goto out; Just 'return nfserr'. I don't see the point of the goto if it's literally just replacing a return. > + > + RESERVE_SPACE(NFS4_MAX_SESSIONID_LEN + 20); > + WRITEMEM(seq->sessionid.data, NFS4_MAX_SESSIONID_LEN); > + WRITE32(seq->seqid); > + WRITE32(seq->slotid); > + WRITE32(seq->maxslots); > + /* > + * FIXME: for now: > + * target_maxslots = maxslots > + * status_flags = 0 > + */ > + WRITE32(seq->maxslots); > + WRITE32(0); > + > + ADJUST_ARGS(); > +out: > return nfserr; > } > #endif /* CONFIG_NFSD_V4_1 */ > diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h > index ea5a427..9e4d8db 100644 > --- a/include/linux/nfsd/xdr4.h > +++ b/include/linux/nfsd/xdr4.h > @@ -362,7 +362,15 @@ struct nfsd4_create_session { > }; > > struct nfsd4_sequence { > - int foo; /* stub */ > + struct nfs4_sessionid sessionid; /* request/response */ > + u32 seqid; /* request/response */ > + u32 slotid; /* request/response */ > + u32 maxslots; /* request/response */ > + u32 cachethis; /* request */ > +#if 0 > + u32 target_maxslots; /* response */ > + u32 status_flags; /* response */ > +#endif /* not yet */ I'd rather that be patched in when it's needed, but OK. --b. > }; > > struct nfsd4_destroy_session { > -- > 1.6.2.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
