From: Tom Haynes <thomas.haynes@primarydata.com>
To: Trond Myklebust <trond.myklebust@primarydata.com>
Cc: Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: [PATCH v4 21/50] nfs41: serialize first layoutget of a file
Date: Wed, 14 Jan 2015 08:44:27 -0800 [thread overview]
Message-ID: <1421253896-73106-22-git-send-email-loghyr@primarydata.com> (raw)
In-Reply-To: <1421253896-73106-1-git-send-email-loghyr@primarydata.com>
From: Peng Tao <tao.peng@primarydata.com>
Per RFC 5661 Errata 3208:
| A client MAY always forget its layout state and associated
| layout stateid at any time (See also section 12.5.5.1).
| In such case, the client MUST use a non-layout stateid for the next
| LAYOUTGET operation. This will signal the server that the client has
| no more layouts on the file and its respective layout state can be
| released before issuing a new layout in response to LAYOUTGET.
In order to make such a signal unique to server, client needs to serialize
all layoutgets using non-layout stateid. We implement this by serializing
layoutgets when client has no layout segments at hand.
Signed-off-by: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Tom Haynes <Thomas.Haynes@primarydata.com>
---
fs/nfs/pnfs.c | 35 +++++++++++++++++++++++++++++++----
fs/nfs/pnfs.h | 1 +
2 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index fa00b56..7e1bac1 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1288,6 +1288,7 @@ pnfs_update_layout(struct inode *ino,
struct nfs_client *clp = server->nfs_client;
struct pnfs_layout_hdr *lo;
struct pnfs_layout_segment *lseg = NULL;
+ bool first;
if (!pnfs_enabled_sb(NFS_SERVER(ino)))
goto out;
@@ -1295,6 +1296,8 @@ pnfs_update_layout(struct inode *ino,
if (pnfs_within_mdsthreshold(ctx, ino, iomode))
goto out;
+lookup_again:
+ first = false;
spin_lock(&ino->i_lock);
lo = pnfs_find_alloc_layout(ino, ctx, gfp_flags);
if (lo == NULL) {
@@ -1312,10 +1315,27 @@ pnfs_update_layout(struct inode *ino,
if (pnfs_layout_io_test_failed(lo, iomode))
goto out_unlock;
- /* Check to see if the layout for the given range already exists */
- lseg = pnfs_find_lseg(lo, &arg);
- if (lseg)
- goto out_unlock;
+ first = list_empty(&lo->plh_segs);
+ if (first) {
+ /* The first layoutget for the file. Need to serialize per
+ * RFC 5661 Errata 3208.
+ */
+ if (test_and_set_bit(NFS_LAYOUT_FIRST_LAYOUTGET,
+ &lo->plh_flags)) {
+ spin_unlock(&ino->i_lock);
+ wait_on_bit(&lo->plh_flags, NFS_LAYOUT_FIRST_LAYOUTGET,
+ TASK_UNINTERRUPTIBLE);
+ pnfs_put_layout_hdr(lo);
+ goto lookup_again;
+ }
+ } else {
+ /* Check to see if the layout for the given range
+ * already exists
+ */
+ lseg = pnfs_find_lseg(lo, &arg);
+ if (lseg)
+ goto out_unlock;
+ }
if (pnfs_layoutgets_blocked(lo, 0))
goto out_unlock;
@@ -1343,6 +1363,13 @@ pnfs_update_layout(struct inode *ino,
lseg = send_layoutget(lo, ctx, &arg, gfp_flags);
atomic_dec(&lo->plh_outstanding);
out_put_layout_hdr:
+ if (first) {
+ unsigned long *bitlock = &lo->plh_flags;
+
+ clear_bit_unlock(NFS_LAYOUT_FIRST_LAYOUTGET, bitlock);
+ smp_mb__after_atomic();
+ wake_up_bit(bitlock, NFS_LAYOUT_FIRST_LAYOUTGET);
+ }
pnfs_put_layout_hdr(lo);
out:
dprintk("%s: inode %s/%llu pNFS layout segment %s for "
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 70ffec1..a9a7b26 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -95,6 +95,7 @@ enum {
NFS_LAYOUT_ROC, /* some lseg had roc bit set */
NFS_LAYOUT_RETURN, /* Return this layout ASAP */
NFS_LAYOUT_INVALID_STID, /* layout stateid id is invalid */
+ NFS_LAYOUT_FIRST_LAYOUTGET, /* Serialize first layoutget */
};
enum layoutdriver_policy_flags {
--
1.9.3
next prev parent reply other threads:[~2015-01-14 16:45 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-14 16:44 [PATCH v4 00/50] Add Flexfile Layout Module Tom Haynes
2015-01-14 16:44 ` [PATCH v4 01/50] pnfs: Prepare for flexfiles by pulling out common code Tom Haynes
2015-01-14 16:44 ` [PATCH v4 02/50] pnfs: Do not grab the commit_info lock twice when rescheduling writes Tom Haynes
2015-01-14 16:44 ` [PATCH v4 03/50] nfs41: pull data server cache from file layout to generic pnfs Tom Haynes
2015-01-14 16:44 ` [PATCH v4 04/50] nfs41: pull decode_ds_addr " Tom Haynes
2015-01-14 16:44 ` [PATCH v4 05/50] nfs41: pull nfs4_ds_connect " Tom Haynes
2015-01-14 16:44 ` [PATCH v4 06/50] nfs41: allow LD to choose DS connection auth flavor Tom Haynes
2015-01-14 16:44 ` [PATCH v4 07/50] nfs41: move file layout macros to generic pnfs Tom Haynes
2015-01-14 16:44 ` [PATCH v4 08/50] nfsv3: introduce nfs3_set_ds_client Tom Haynes
2015-01-14 16:44 ` [PATCH v4 09/50] nfs41: allow LD to choose DS connection version/minor_version Tom Haynes
2015-01-14 16:44 ` [PATCH v4 10/50] nfs41: create NFSv3 DS connection if specified Tom Haynes
2015-01-14 16:44 ` [PATCH v4 11/50] pnfs: Add nfs_rpc_ops in calls to nfs_initiate_pgio Tom Haynes
2015-01-14 16:44 ` [PATCH v4 12/50] nfs: allow different protocol in nfs_initiate_commit Tom Haynes
2015-01-14 16:44 ` [PATCH v4 13/50] nfs4: pass slot table to nfs40_setup_sequence Tom Haynes
2015-01-14 16:44 ` [PATCH v4 14/50] nfs4: export nfs4_sequence_done Tom Haynes
2015-01-14 16:44 ` [PATCH v4 15/50] nfs: allow to specify cred in nfs_initiate_pgio Tom Haynes
2015-01-14 16:44 ` [PATCH v4 16/50] NFSv4.1/NFSv3: Add pNFS callbacks for nfs3_(read|write|commit)_done() Tom Haynes
2015-01-14 16:44 ` [PATCH v4 17/50] sunrpc: add rpc_count_iostats_idx Tom Haynes
2015-01-14 16:44 ` [PATCH v4 18/50] nfs: set hostname when creating nfsv3 ds connection Tom Haynes
2015-01-14 16:44 ` [PATCH v4 19/50] nfs/flexclient: export pnfs_layoutcommit_inode Tom Haynes
2015-01-14 16:44 ` [PATCH v4 20/50] nfs41: close a small race window when adding new layout to global list Tom Haynes
2015-01-14 16:44 ` Tom Haynes [this message]
2015-01-14 16:44 ` [PATCH v4 22/50] nfs: save server READ/WRITE/COMMIT status Tom Haynes
2015-01-14 16:44 ` [PATCH v4 23/50] nfs41: pass iomode through layoutreturn args Tom Haynes
2015-01-14 16:44 ` [PATCH v4 24/50] nfs41: make a helper function to send layoutreturn Tom Haynes
2015-01-14 16:44 ` [PATCH v4 25/50] nfs41: add a helper to mark layout for return Tom Haynes
2015-01-14 16:44 ` [PATCH v4 26/50] nfs41: don't use a layout if it is marked for returning Tom Haynes
2015-01-14 16:44 ` [PATCH v4 27/50] nfs41: send layoutreturn in last put_lseg Tom Haynes
2015-01-14 16:44 ` [PATCH v4 28/50] nfs41: clear NFS_LAYOUT_RETURN if layoutreturn is sent or failed to send Tom Haynes
2015-01-14 16:44 ` [PATCH v4 29/50] nfs/filelayout: use pnfs_error_mark_layout_for_return Tom Haynes
2015-01-14 16:44 ` [PATCH v4 30/50] nfs: introduce pg_cleanup op for pgio descriptors Tom Haynes
2015-01-14 16:44 ` [PATCH v4 31/50] pnfs: release lseg in pnfs_generic_pg_cleanup Tom Haynes
2015-01-14 16:44 ` [PATCH v4 32/50] nfs: handle overlapping reqs in lock_and_join Tom Haynes
2015-01-14 16:44 ` [PATCH v4 33/50] nfs: rename pgio header ds_idx to ds_commit_idx Tom Haynes
2015-01-14 16:44 ` [PATCH v4 34/50] pnfs: pass ds_commit_idx through the commit path Tom Haynes
2015-01-14 16:44 ` [PATCH v4 35/50] nfs: add mirroring support to pgio layer Tom Haynes
2015-01-14 16:44 ` [PATCH v4 36/50] nfs: mirroring support for direct io Tom Haynes
2015-01-14 16:44 ` [PATCH v4 37/50] pnfs: fail comparison when bucket verifier not set Tom Haynes
2015-01-14 16:44 ` [PATCH v4 38/50] nfs41: add a debug warning if we destroy an unempty layout Tom Haynes
2015-01-14 16:44 ` [PATCH v4 39/50] nfs: only reset desc->pg_mirror_idx when mirroring is supported Tom Haynes
2015-01-14 16:44 ` [PATCH v4 40/50] nfs: add nfs_pgio_current_mirror helper Tom Haynes
2015-01-14 16:44 ` [PATCH v4 41/50] pnfs: allow LD to ask to resend read through pnfs Tom Haynes
2015-01-14 16:44 ` [PATCH v4 42/50] nfs41: add range to layoutreturn args Tom Haynes
2015-01-14 16:44 ` [PATCH v4 43/50] nfs41: allow async version layoutreturn Tom Haynes
2015-01-14 16:44 ` [PATCH v4 44/50] nfs41: introduce NFS_LAYOUT_RETURN_BEFORE_CLOSE Tom Haynes
2015-01-14 16:44 ` [PATCH v4 45/50] nfs/flexfiles: send layoutreturn before freeing lseg Tom Haynes
2015-01-14 16:44 ` [PATCH v4 46/50] nfs41: add NFS_LAYOUT_RETRY_LAYOUTGET to layout header flags Tom Haynes
2015-01-14 16:44 ` [PATCH v4 47/50] nfs: add a helper to set NFS_ODIRECT_RESCHED_WRITES to direct writes Tom Haynes
2015-01-14 16:44 ` [PATCH v4 48/50] nfs41: wait for LAYOUTRETURN before retrying LAYOUTGET Tom Haynes
2015-01-14 16:44 ` [PATCH v4 49/50] pnfs/flexfiles: Add the FlexFile Layout Driver Tom Haynes
2015-01-14 16:44 ` [PATCH v4 50/50] pnfs: Update documentation on the Layout Drivers Tom Haynes
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=1421253896-73106-22-git-send-email-loghyr@primarydata.com \
--to=thomas.haynes@primarydata.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
/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