From: Benjamin Coddington <ben.coddington@hammerspace.com>
To: Trond Myklebust <trondmy@kernel.org>, Anna Schumaker <anna@kernel.org>
Cc: linux-nfs@vger.kernel.org,
Jonathan Curley <jcurley@purestorage.com>,
Mike Snitzer <snitzer@kernel.org>,
Jeff Layton <jlayton@kernel.org>
Subject: [PATCH v2 16/23] pNFS: Add deviceid reference query and collection walkers
Date: Fri, 21 Aug 2026 12:29:20 -0400 [thread overview]
Message-ID: <8ca7c1beca17f412e9ca4454372a80f4d146a90b.1787327939.git.bcodding@hammerspace.com> (raw)
In-Reply-To: <cover.1787327939.git.bcodding@hammerspace.com>
The CB_NOTIFY_DEVICEID DELETE race recovery (RFC 8881 Section
18.40.4) needs to ask whether any live layout still references a
deviceID, and to enumerate those layouts for TEST_STATEID. Add a
layout_references_deviceid hook (sibling of reresolve_deviceid; the
flexfiles implementation memcmps each mirror stripe's decoded devid,
valid independent of the pinned device node) and two walkers over
the byserver pattern:
- pnfs_layout_deviceid_referenced_byclid(): boolean existence query,
early-stopping, entirely under i_lock.
- pnfs_layout_collect_deviceid_refs(): collects each matching layout
with the hdr pinned, the inode grabbed with its superblock active
(a pinned hdr does not hold its inode -- same discipline as the
bulk-destroy walker), and the layout stateid and cred snapshotted
under i_lock, so the caller can issue sleeping RPCs against the
collection.
The collection walker pins each matching header with a plain
pnfs_get_layout_hdr(), which cannot resurrect a dying header because
the walker holds i_lock and has checked NFS_I()->layout == lo.
pnfs_put_layout_hdr() drops the last reference under i_lock --
refcount_dec_and_lock() only decrements one to zero once it holds the
lock -- and clears NFS_I()->layout in that same critical section,
before it unlocks and frees. So a header still installed on its inode
cannot have reached a zero refcount.
That argument deliberately does not rest on NFS_LAYOUT_INVALID_STID.
A header can reach its final put while still valid: a full
LAYOUTRETURN ends in pnfs_layoutreturn_free_lsegs(), which resets the
layout stateid rather than invalidating it, and that is the ordinary
end of life for a return-on-close layout. The validity check the
walkers do apply is a policy filter, not a lifetime guarantee.
Because pnfs_put_layout_hdr() can send a layoutreturn and sleep, a
header pinned for a layout whose inode can no longer be grabbed is put
after the RCU read-side critical section, not within it.
Both ways the walk can end early report it. A GFP_ATOMIC allocation
failure aborts with -ENOMEM, and an inode that can no longer be
grabbed -- igrab() fails from I_FREEING on, while the layout may still
be valid and still name the deviceID -- aborts with -EAGAIN. Either
way the caller is told the collection is partial instead of receiving
a short list it would read as "no references".
No callers yet; no behavior change.
Assisted-by: Claude:claude-fable-5
Signed-off-by: Benjamin Coddington <bcodding@hammerspace.com>
---
fs/nfs/flexfilelayout/flexfilelayout.c | 17 +++
fs/nfs/pnfs.c | 165 +++++++++++++++++++++++++
fs/nfs/pnfs.h | 29 +++++
3 files changed, 211 insertions(+)
diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c
index ebb19a919f9d..7923088f1a69 100644
--- a/fs/nfs/flexfilelayout/flexfilelayout.c
+++ b/fs/nfs/flexfilelayout/flexfilelayout.c
@@ -2508,6 +2508,22 @@ static void ff_layout_cancel_io(struct pnfs_layout_segment *lseg)
}
}
+/* Called under @lo's inode i_lock. */
+static bool ff_layout_references_deviceid(struct pnfs_layout_hdr *lo,
+ const struct nfs4_deviceid *id)
+{
+ struct nfs4_flexfile_layout *flo = FF_LAYOUT_FROM_HDR(lo);
+ struct nfs4_ff_layout_mirror *mirror;
+ u32 dss_id;
+
+ list_for_each_entry(mirror, &flo->mirrors, mirrors)
+ for (dss_id = 0; dss_id < mirror->dss_count; dss_id++)
+ if (memcmp(&mirror->dss[dss_id].devid, id,
+ sizeof(*id)) == 0)
+ return true;
+ return false;
+}
+
/*
* Un-pin every stripe node resolved from @id: in-flight I/O drains on the
* old node through its own reference, the next I/O re-resolves.
@@ -3137,6 +3153,7 @@ static struct pnfs_layoutdriver_type flexfilelayout_type = {
.get_ds_info = ff_layout_get_ds_info,
.free_deviceid_node = ff_layout_free_deviceid_node,
.reresolve_deviceid = ff_layout_reresolve_deviceid,
+ .layout_references_deviceid = ff_layout_references_deviceid,
.read_pagelist = ff_layout_read_pagelist,
.write_pagelist = ff_layout_write_pagelist,
.alloc_deviceid_node = ff_layout_alloc_deviceid_node,
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 6769671addd7..c44f5a109021 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -2938,6 +2938,171 @@ pnfs_layout_reresolve_deviceid_byclid(struct nfs_client *clp,
}
}
+struct pnfs_deviceid_ref_args {
+ const struct pnfs_layoutdriver_type *ld;
+ const struct nfs4_deviceid *id;
+ struct list_head *result;
+ bool found;
+};
+
+static int pnfs_layout_deviceid_referenced_byserver(
+ struct nfs_server *server, void *data)
+{
+ struct pnfs_deviceid_ref_args *args = data;
+ struct pnfs_layout_hdr *lo;
+ struct inode *inode;
+
+ if (server->pnfs_curr_ld != args->ld)
+ return 0;
+
+ rcu_read_lock();
+ list_for_each_entry_rcu(lo, &server->layouts, plh_layouts) {
+ inode = lo->plh_inode;
+ if (!inode)
+ continue;
+ spin_lock(&inode->i_lock);
+ if (lo->plh_inode == inode && pnfs_layout_is_valid(lo) &&
+ args->ld->layout_references_deviceid(lo, args->id))
+ args->found = true;
+ spin_unlock(&inode->i_lock);
+ if (args->found)
+ break;
+ }
+ rcu_read_unlock();
+ return args->found;
+}
+
+/*
+ * pnfs_layout_deviceid_referenced_byclid - does any live layout of
+ * @clp's servers using @ld still reference deviceid @id?
+ */
+bool
+pnfs_layout_deviceid_referenced_byclid(struct nfs_client *clp,
+ const struct pnfs_layoutdriver_type *ld,
+ const struct nfs4_deviceid *id)
+{
+ struct pnfs_deviceid_ref_args args = {
+ .ld = ld,
+ .id = id,
+ };
+
+ if (!ld->layout_references_deviceid)
+ return false;
+
+ nfs_client_for_each_server(clp,
+ pnfs_layout_deviceid_referenced_byserver, &args);
+ return args.found;
+}
+
+static int pnfs_layout_collect_deviceid_refs_byserver(
+ struct nfs_server *server, void *data)
+{
+ struct pnfs_deviceid_ref_args *args = data;
+ struct nfs4_deviceid_ref *ref, *tmp;
+ struct pnfs_layout_hdr *lo;
+ struct inode *inode;
+ LIST_HEAD(putme);
+ bool matched;
+ int ret = 0;
+
+ if (server->pnfs_curr_ld != args->ld)
+ return 0;
+
+ rcu_read_lock();
+ list_for_each_entry_rcu(lo, &server->layouts, plh_layouts) {
+ inode = lo->plh_inode;
+ if (!inode ||
+ test_bit(NFS_LAYOUT_INODE_FREEING, &lo->plh_flags))
+ continue;
+
+ spin_lock(&inode->i_lock);
+ matched = NFS_I(inode)->layout == lo &&
+ pnfs_layout_is_valid(lo) &&
+ args->ld->layout_references_deviceid(lo, args->id);
+ if (!matched) {
+ spin_unlock(&inode->i_lock);
+ continue;
+ }
+ ref = kzalloc_obj(*ref, GFP_ATOMIC);
+ if (!ref) {
+ spin_unlock(&inode->i_lock);
+ ret = -ENOMEM;
+ break;
+ }
+ /* NFS_I()->layout == lo under i_lock means the refcount has
+ * not reached zero: pnfs_put_layout_hdr() decrements to zero
+ * and detaches in the same critical section.
+ */
+ pnfs_get_layout_hdr(lo);
+ ref->lo = lo;
+ nfs4_stateid_copy(&ref->stateid, &lo->plh_stateid);
+ ref->cred = get_cred(lo->plh_lc_cred);
+ spin_unlock(&inode->i_lock);
+
+ /* the pinned hdr does not hold the inode: grab it (and
+ * keep the superblock active) for use across RPCs
+ */
+ ref->inode = nfs_igrab_and_active(inode);
+ if (!ref->inode) {
+ /* The layout may still name the deviceID, so report a
+ * partial list rather than silently shortening it.
+ * Defer the put: it can layoutreturn and sleep.
+ */
+ list_add(&ref->node, &putme);
+ ret = -EAGAIN;
+ break;
+ }
+ list_add_tail(&ref->node, args->result);
+ }
+ rcu_read_unlock();
+
+ list_for_each_entry_safe(ref, tmp, &putme, node) {
+ list_del(&ref->node);
+ pnfs_put_layout_hdr(ref->lo);
+ put_cred(ref->cred);
+ kfree(ref);
+ }
+ return ret;
+}
+
+/*
+ * Collect @clp's layouts referencing @id onto @result as entries usable
+ * across sleeping RPCs; release with pnfs_layout_put_deviceid_refs().
+ * A negative return means @result is only a partial set.
+ */
+int
+pnfs_layout_collect_deviceid_refs(struct nfs_client *clp,
+ const struct pnfs_layoutdriver_type *ld,
+ const struct nfs4_deviceid *id,
+ struct list_head *result)
+{
+ struct pnfs_deviceid_ref_args args = {
+ .ld = ld,
+ .id = id,
+ .result = result,
+ };
+
+ if (!ld->layout_references_deviceid)
+ return 0;
+
+ return nfs_client_for_each_server(clp,
+ pnfs_layout_collect_deviceid_refs_byserver, &args);
+}
+
+void
+pnfs_layout_put_deviceid_refs(struct list_head *result)
+{
+ struct nfs4_deviceid_ref *ref, *tmp;
+
+ list_for_each_entry_safe(ref, tmp, result, node) {
+ list_del(&ref->node);
+ put_cred(ref->cred);
+ pnfs_put_layout_hdr(ref->lo);
+ nfs_iput_and_deactive(ref->inode);
+ kfree(ref);
+ }
+}
+
/* Check if we have we have a valid layout but if there isn't an intersection
* between the request and the pgio->pg_lseg, put this pgio->pg_lseg away.
*/
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index bf0b012a49a9..5a8c1ffee784 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -183,6 +183,12 @@ struct pnfs_layoutdriver_type {
const struct nfs4_deviceid *id,
bool immediate,
struct list_head *put_list);
+ /*
+ * Does @lo hold any reference to deviceid @id? Called under
+ * @lo's inode i_lock; must not sleep.
+ */
+ bool (*layout_references_deviceid)(struct pnfs_layout_hdr *lo,
+ const struct nfs4_deviceid *id);
int (*prepare_layoutreturn) (struct nfs4_layoutreturn_args *);
@@ -370,6 +376,29 @@ void pnfs_layout_reresolve_deviceid_byclid(struct nfs_client *clp,
const struct pnfs_layoutdriver_type *ld,
const struct nfs4_deviceid *id,
bool immediate);
+bool pnfs_layout_deviceid_referenced_byclid(struct nfs_client *clp,
+ const struct pnfs_layoutdriver_type *ld,
+ const struct nfs4_deviceid *id);
+
+/*
+ * One live layout referencing a deviceID, collected for the
+ * CB_NOTIFY_DEVICEID DELETE recovery: the hdr is pinned, the inode
+ * igrab'd with its superblock active, and the layout stateid and
+ * cred snapshotted for TEST_STATEID.
+ */
+struct nfs4_deviceid_ref {
+ struct list_head node;
+ struct pnfs_layout_hdr *lo;
+ struct inode *inode;
+ nfs4_stateid stateid;
+ const struct cred *cred;
+};
+
+int pnfs_layout_collect_deviceid_refs(struct nfs_client *clp,
+ const struct pnfs_layoutdriver_type *ld,
+ const struct nfs4_deviceid *id,
+ struct list_head *result);
+void pnfs_layout_put_deviceid_refs(struct list_head *result);
int pnfs_layout_handle_reboot(struct nfs_client *clp);
/* nfs4_deviceid_flags */
--
2.53.0
next prev parent reply other threads:[~2026-08-21 16:29 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-21 16:29 [PATCH v2 00/23] NFS: flexfiles device notifications and caching for wide striped layouts Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 01/23] NFSv4/flexfiles: reject a stripe_unit that does not fit 32 bits Benjamin Coddington
2026-08-27 19:25 ` Anna Schumaker
2026-08-28 11:24 ` Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 02/23] NFSv4/pnfs: bound the CB_NOTIFY_DEVICEID array count before allocating Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 03/23] pNFS: Fix CB_NOTIFY_DEVICEID CHANGE to consume ndc_immediate Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 04/23] NFSv4/flexfiles: Use the full 64-bit offset for read DS selection Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 05/23] NFSv4/flexfiles: Bound page coalescing on the absolute stripe offset Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 06/23] NFSv4/filelayout: Anchor page coalescing on pattern_offset Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 07/23] NFSv4/flexfiles: Reference the device node across DS setup Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 08/23] NFSv4/flexfiles: Carry the device node reference across each I/O Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 09/23] NFSv4/flexfiles: Hold a device node reference for layoutstats encoding Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 10/23] NFSv4/flexfiles: Make the pinned device node pointer RCU-managed Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 11/23] pNFS: Add a reresolve_deviceid layout driver hook Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 12/23] NFSv4/flexfiles: Implement in-place device re-resolve on CHANGE Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 13/23] NFSv4: Dispatch CB_NOTIFY_DEVICEID CHANGE to an in-place refresh Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 14/23] NFSv4/flexfiles: Honor ndc_immediate on CB_NOTIFY_DEVICEID CHANGE Benjamin Coddington
2026-08-28 17:41 ` Anna Schumaker
2026-08-28 20:50 ` Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 15/23] pNFS: Discard a GETDEVICEINFO reply that raced a CHANGE notification Benjamin Coddington
2026-08-21 16:29 ` Benjamin Coddington [this message]
2026-08-21 16:29 ` [PATCH v2 17/23] NFSv4/pnfs: Recover revoked layouts on a deleted deviceID Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 18/23] NFSv4/pnfs: Confirm a deviceID delete via GETDEVICEINFO Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 19/23] NFSv4/pnfs: Dispatch CB_NOTIFY_DEVICEID DELETE to race recovery Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 20/23] NFSv4/pnfs: Grow the deviceid cache hash table Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 21/23] NFSv4/pnfs: Re-home the data-server cache onto hash buckets Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 22/23] NFSv4/pnfs: Key the data-server cache by its address set Benjamin Coddington
2026-08-21 16:29 ` [PATCH v2 23/23] NFSv4/flexfiles: Add a dataserver_nconnect cap Benjamin Coddington
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=8ca7c1beca17f412e9ca4454372a80f4d146a90b.1787327939.git.bcodding@hammerspace.com \
--to=ben.coddington@hammerspace.com \
--cc=anna@kernel.org \
--cc=jcurley@purestorage.com \
--cc=jlayton@kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=snitzer@kernel.org \
--cc=trondmy@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