public inbox for linux-nfs@vger.kernel.org
 help / color / mirror / Atom feed
From: andros@netapp.com
To: bfields@fieldses.org
Cc: linux-nfs@vger.kernel.org, Andy Adamson <andros@netapp.com>
Subject: [PATCH 04/30] nfsd41: encode create_session result into clid cache
Date: Mon,  8 Jun 2009 14:20:45 -0400	[thread overview]
Message-ID: <1244485271-7461-5-git-send-email-andros@netapp.com> (raw)
In-Reply-To: <1244485271-7461-4-git-send-email-andros@netapp.com>

From: Andy Adamson <andros@netapp.com>

CREATE_SESSION can be preceeded by a SEQUENCE operation and the
create session single slot cache must be maintained. Save the results of
a create session call (struct nfsd4_create_session) into the cache at the end
of processing while still under the state lock.

If the CREATE_SESSION operation it is preceeded by a SEQUENCE operation it
will also be encoded into the session slot table cache.

Errors that do not change the create session cache:
A create session NFS4ERR_STALE_CLIENTID error means that a client record
(and associated create session slot) could not be found and therefore can't
be changed.  NFSERR_SEQ_MISORDERED errors do not change the slot cache.

All other errors get cached.

The old method of using nfsd4_store_cache_entry() for create sessions operations
will be removed in a following patch.

Signed-off-by: Andy Adamson <andros@netapp.com>
---
 fs/nfsd/nfs4state.c |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 8bf1cfa..265379e 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1334,6 +1334,20 @@ check_slot_seqid(u32 seqid, u32 slot_seqid, int slot_inuse)
 	return nfserr_seq_misordered;
 }
 
+/*
+ * Cache the create session result into the create session single DRC
+ * slot cache by saving the xdr structure. sl_seqid has been set.
+ * Do this for solo or embedded create session operations.
+ */
+static void
+nfsd4_cache_create_session(struct nfsd4_create_session *cr_ses,
+			   struct nfsd4_clid_slot *slot, int nfserr)
+{
+	slot->sl_status = nfserr;
+	memcpy(&slot->sl_cr_ses, cr_ses, sizeof(*cr_ses));
+}
+
+
 __be32
 nfsd4_create_session(struct svc_rqst *rqstp,
 		     struct nfsd4_compound_state *cstate,
@@ -1343,6 +1357,7 @@ nfsd4_create_session(struct svc_rqst *rqstp,
 	struct nfsd4_compoundres *resp = rqstp->rq_resp;
 	struct nfs4_client *conf, *unconf;
 	struct nfsd4_slot *slot = NULL;
+	struct nfsd4_clid_slot *cs_slot = NULL;
 	int status = 0;
 
 	nfs4_lock_state();
@@ -1371,6 +1386,7 @@ nfsd4_create_session(struct svc_rqst *rqstp,
 		conf->cl_slot.sl_seqid++;
 	} else if (unconf) {
 		slot = &unconf->cl_slot;
+		cs_slot = &unconf->cl_cs_slot;
 		status = check_slot_seqid(cr_ses->seqid, slot->sl_seqid,
 					  slot->sl_inuse);
 		if (status) {
@@ -1382,7 +1398,7 @@ nfsd4_create_session(struct svc_rqst *rqstp,
 		if (!same_creds(&unconf->cl_cred, &rqstp->rq_cred) ||
 		    (ip_addr != unconf->cl_addr)) {
 			status = nfserr_clid_inuse;
-			goto out;
+			goto out_cache;
 		}
 
 		slot->sl_seqid++; /* from 0 to 1 */
@@ -1412,6 +1428,10 @@ nfsd4_create_session(struct svc_rqst *rqstp,
 	cstate->slot = slot;
 	/* Ensure a page is used for the cache */
 	slot->sl_cache_entry.ce_cachethis = 1;
+
+out_cache:
+	/* cache solo and embedded create sessions under the state lock */
+	nfsd4_cache_create_session(cr_ses, cs_slot, status);
 out:
 	nfs4_unlock_state();
 	dprintk("%s returns %d\n", __func__, ntohl(status));
-- 
1.5.4.3


  reply	other threads:[~2009-06-08 18:21 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-08 18:20 [PATCH 0/30] NFSv4.1 Server DRC rewrite Version 3 andros
2009-06-08 18:20 ` [PATCH 01/30] nfsd41: create_session check replay first andros
2009-06-08 18:20   ` [PATCH 02/30] nfsd41: change check_slot_seqid parameters andros
2009-06-08 18:20     ` [PATCH 03/30] nfsd41: declare clientid create session slot structure andros
2009-06-08 18:20       ` andros [this message]
2009-06-08 18:20         ` [PATCH 05/30] nfsd41: replay solo and embedded create session andros
2009-06-08 18:20           ` [PATCH 06/30] nfsd41 remove the unused nfsd4_slot create session slot andros
2009-06-08 18:20             ` [PATCH 07/30] nfsd41: sanity check client drc maxreqs andros
2009-06-08 18:20               ` [PATCH 08/30] nfsd41: change from page to memory based drc limits andros
2009-06-08 18:20                 ` [PATCH 09/30] nfsd41: use globals for DRC memory use management andros
2009-06-08 18:20                   ` [PATCH 10/30] nfsd41: set the session maximum response size cached andros
2009-06-08 18:20                     ` [PATCH 11/30] nfsd41: use static buffers for sessions DRC andros
2009-06-08 18:20                       ` [PATCH 12/30] nfsd41: replace ce_cachethis with nfsd4_slot field andros
2009-06-08 18:20                         ` [PATCH 13/30] nfsd41: replace ce_opcnt " andros
2009-06-08 18:20                           ` [PATCH 14/30] nfsd41: nfsd41: replace ce_status " andros
2009-06-08 18:20                             ` [PATCH 15/30] nfsd41: obliterate nfsd4_copy_pages andros
2009-06-08 18:20                               ` [PATCH 16/30] nfsd41: obliterate nfsd41_copy_replay_data andros
2009-06-08 18:20                                 ` [PATCH 17/30] nfsd41: obliterate nfsd4_release_respages andros
2009-06-08 18:20                                   ` [PATCH 18/30] nfsd41: remove iovlen field from nfsd4_compound_state andros
2009-06-08 18:21                                     ` [PATCH 19/30] nfsd41: remove struct nfsd4_cache_entry andros
2009-06-08 18:21                                       ` [PATCH 20/30] nfsd41: obliterate nfsd4_set_statp andros
2009-06-08 18:21                                         ` [PATCH 21/30] nfsd41: rename nfsd4_enc_uncached_replay andros
2009-06-08 18:21                                           ` [PATCH 22/30] nfsd41: encode replay sequence from the slot values andros
2009-06-08 18:21                                             ` [PATCH 23/30] nfsd41: fix nfsd4_replay_cache_entry comments andros
2009-06-08 18:21                                               ` [PATCH 24/30] nfsd41: fix nfsd4_store_cache_entry comments andros
2009-06-08 18:21                                                 ` [PATCH 25/30] nfsd41: support 16 slots per session andros
2009-06-08 18:21                                                   ` [PATCH 26/30] nfsd41: use the maximum operations per compound in nfsd4_compoundargs andros
2009-06-08 18:21                                                     ` [PATCH 27/30] nfsd41: fix nfsd4_store_cache_entry dprintk andros
2009-06-08 18:21                                                       ` [PATCH 28/30] nfsd41: add test for failed sequence operation andros
2009-06-08 18:21                                                         ` [PATCH 29/30] nfsd41: remove redundant failed sequence check andros
2009-06-08 18:21                                                           ` [PATCH 30/30] nfsd41: only reference the session on non-replay sequence andros

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=1244485271-7461-5-git-send-email-andros@netapp.com \
    --to=andros@netapp.com \
    --cc=bfields@fieldses.org \
    --cc=linux-nfs@vger.kernel.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