From: Mike Snitzer <snitzer@kernel.org>
To: Chuck Lever <chuck.lever@oracle.com>,
Jeff Layton <jlayton@kernel.org>,
Trond Myklebust <trond.myklebust@hammerspace.com>,
Anna Schumaker <anna.schumaker@oracle.com>
Cc: linux-nfs@vger.kernel.org
Subject: [RFC PATCH 06/11] NFSD: add NFS4 reexport support for GETACL nfs4_acl passthru
Date: Thu, 19 Feb 2026 17:13:47 -0500 [thread overview]
Message-ID: <20260219221352.40554-7-snitzer@kernel.org> (raw)
In-Reply-To: <20260219221352.40554-1-snitzer@kernel.org>
From: Mike Snitzer <snitzer@hammerspace.com>
Allow NFSD's 4.1 reexport of a 4.2 mount to perform GETACL by passing
thru nfs4_acl whose pages are allocated in nfsd4_get_nfs4_acl_passthru
and then passed down to exported filesystem's ops->getacl(). Once
nfs4_acl is retrieved nfsd4_encode_fattr4_acl() will send the
ACL payload to the client using nfsd4_encode_nfs4_acl_passthru().
Signed-off-by: Mike Snitzer <snitzer@hammerspace.com>
---
fs/nfsd/acl.h | 3 ++-
fs/nfsd/nfs4acl.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++-
fs/nfsd/nfs4xdr.c | 33 ++++++++++++++++++++++-
3 files changed, 102 insertions(+), 3 deletions(-)
diff --git a/fs/nfsd/acl.h b/fs/nfsd/acl.h
index 699a3b19bdb8..488be04551e4 100644
--- a/fs/nfsd/acl.h
+++ b/fs/nfsd/acl.h
@@ -42,13 +42,14 @@ struct svc_fh;
struct svc_rqst;
struct nfsd_attrs;
enum nfs_ftype4;
+enum nfs4_acl_type;
int nfs4_acl_bytes(int entries);
int nfs4_acl_get_whotype(char *, u32);
__be32 nfs4_acl_write_who(struct xdr_stream *xdr, int who);
int nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry,
- struct nfs4_acl **acl);
+ enum nfs4_acl_type acl_type, struct nfs4_acl **acl);
__be32 nfsd4_acl_to_attr(enum nfs_ftype4 type, struct nfs4_acl *acl,
struct nfsd_attrs *attr);
void sort_pacl_range(struct posix_acl *pacl, int start, int end);
diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index 2c2f2fd89e87..2d494909e63a 100644
--- a/fs/nfsd/nfs4acl.c
+++ b/fs/nfsd/nfs4acl.c
@@ -37,6 +37,7 @@
#include <linux/fs.h>
#include <linux/slab.h>
#include <linux/posix_acl.h>
+#include <linux/nfsacl.h>
#include "nfsfh.h"
#include "nfsd.h"
@@ -125,9 +126,62 @@ static short ace2type(struct nfs4_ace *);
static void _posix_to_nfsv4_one(struct posix_acl *, struct nfs4_acl *,
unsigned int);
+static int
+nfsd4_get_nfs4_acl_passthru(struct inode *inode,
+ const struct export_operations *ops,
+ enum nfs4_acl_type acl_type,
+ u32 acl_len, struct nfs4_acl **acl)
+{
+ int error = 0;
+ int i = 0;
+ unsigned int npages;
+
+ npages = DIV_ROUND_UP(acl_len, PAGE_SIZE);
+ *acl = kmalloc(sizeof(struct nfs4_acl) +
+ npages * sizeof(struct page *), GFP_KERNEL);
+ if (*acl == NULL)
+ return -ENOMEM;
+
+ (*acl)->type = acl_type;
+ (*acl)->len = acl_len = npages * PAGE_SIZE;
+ (*acl)->pgbase = 0;
+
+ for (; i < npages; i++) {
+ (*acl)->pages[i] = alloc_page(GFP_KERNEL);
+ if (!(*acl)->pages[i]) {
+ error = -ENOMEM;
+ goto out;
+ }
+ }
+
+ if (unlikely(!ops->getacl)) {
+ error = -EOPNOTSUPP;
+ goto out;
+ }
+
+ error = ops->getacl(inode, *acl);
+ if (likely(error > 0)) {
+ error = 0; /* don't error out below */
+ if ((*acl)->len < acl_len) {
+ /* free any unused pages */
+ npages = DIV_ROUND_UP((*acl)->len, PAGE_SIZE);
+ while (--i >= npages)
+ __free_page((*acl)->pages[i]);
+ }
+ }
+out:
+ if (error) {
+ while (--i >= 0)
+ __free_page((*acl)->pages[i]);
+ kfree(*acl);
+ *acl = NULL;
+ }
+ return error;
+}
+
int
nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry,
- struct nfs4_acl **acl)
+ enum nfs4_acl_type acl_type, struct nfs4_acl **acl)
{
struct inode *inode = d_inode(dentry);
int error = 0;
@@ -157,6 +211,19 @@ nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry,
size += 2 * dpacl->a_count;
}
+ if (!IS_POSIXACL(inode) &&
+ exportfs_may_passthru_nfs4acl(dentry->d_sb->s_export_op)) {
+ /* Ensure NFSv4 ACL has adequate space based on POSIX ACL size */
+ u32 acl_len = min_t(u32, svc_max_payload(rqstp),
+ (2 * nfs4_acl_bytes(size) -
+ 2 * sizeof(struct nfs4_acl)));
+ const struct export_operations *ops = dentry->d_sb->s_export_op;
+
+ error = nfsd4_get_nfs4_acl_passthru(inode, ops, acl_type,
+ acl_len, acl);
+ goto out;
+ }
+
*acl = kmalloc(nfs4_acl_bytes(size), GFP_KERNEL);
if (*acl == NULL) {
error = -ENOMEM;
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index f14c2fb45142..01d362a486f8 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3391,6 +3391,33 @@ static __be32 nfsd4_encode_fattr4_aclsupport(struct xdr_stream *xdr,
return nfsd4_encode_uint32_t(xdr, mask);
}
+static __be32 nfsd4_encode_nfs4_acl_passthru(struct xdr_stream *xdr,
+ struct nfs4_acl *acl)
+{
+ uint32_t pgbase = acl->pgbase;
+ uint32_t remaining = acl->len;
+ unsigned int npages = DIV_ROUND_UP(remaining, PAGE_SIZE);
+
+ for (int i = 0; i < npages; i++) {
+ void *vaddr = page_address(acl->pages[i]);
+ size_t len = (remaining < PAGE_SIZE) ? remaining : PAGE_SIZE;
+
+ if (pgbase) {
+ vaddr += pgbase;
+ pgbase = 0;
+ }
+ WARN_ON_ONCE(xdr_stream_encode_opaque_fixed(xdr, vaddr, len) < 0);
+ remaining -= len;
+ /*
+ * Free each page that was allocated using alloc_page()
+ * in nfsd4_get_nfs4_acl_passthru().
+ */
+ __free_page(acl->pages[i]);
+ }
+
+ return nfs_ok;
+}
+
static __be32 nfsd4_encode_fattr4_acl(struct xdr_stream *xdr,
const struct nfsd4_fattr_args *args)
{
@@ -3403,6 +3430,10 @@ static __be32 nfsd4_encode_fattr4_acl(struct xdr_stream *xdr,
if (xdr_stream_encode_u32(xdr, 0) != XDR_UNIT)
return nfserr_resource;
} else {
+ if (!IS_POSIXACL(d_inode(args->dentry)) &&
+ exportfs_may_passthru_nfs4acl(args->dentry->d_sb->s_export_op))
+ return nfsd4_encode_nfs4_acl_passthru(xdr, acl);
+
if (xdr_stream_encode_u32(xdr, acl->naces) != XDR_UNIT)
return nfserr_resource;
for (ace = acl->aces; ace < acl->aces + acl->naces; ace++) {
@@ -4029,7 +4060,7 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr,
args.fhp = fhp;
if (attrmask[0] & FATTR4_WORD0_ACL) {
- err = nfsd4_get_nfs4_acl(rqstp, dentry, &args.acl);
+ err = nfsd4_get_nfs4_acl(rqstp, dentry, NFS4ACL_ACL, &args.acl);
if (err == -EOPNOTSUPP)
attrmask[0] &= ~FATTR4_WORD0_ACL;
else if (err == -EINVAL) {
--
2.44.0
next prev parent reply other threads:[~2026-02-19 22:14 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-19 22:13 [RFC PATCH 00/11] NFS/NFSD: nfs4_acl passthru for NFSv4 reexport Mike Snitzer
2026-02-19 22:13 ` [RFC PATCH 01/11] exportfs: add ability to advertise NFSv4 ACL passthru support Mike Snitzer
2026-02-19 22:13 ` [RFC PATCH 02/11] NFSD: factor out nfsd_supports_nfs4_acl() to nfsd/acl.h Mike Snitzer
2026-02-19 22:13 ` [RFC PATCH 03/11] NFS/NFSD: data structure enablement for nfs4_acl passthru support Mike Snitzer
2026-02-19 22:13 ` [RFC PATCH 04/11] NFSD: prepare to support SETACL nfs4_acl passthru Mike Snitzer
2026-02-19 22:13 ` [RFC PATCH 05/11] NFSD: add NFS4 reexport support for " Mike Snitzer
2026-02-19 22:13 ` Mike Snitzer [this message]
2026-02-19 22:13 ` [RFC PATCH 07/11] NFSD: add NFS4ACL_DACL and NFS4ACL_SACL passthru support Mike Snitzer
2026-02-19 22:13 ` [RFC PATCH 08/11] NFSD: avoid extra nfs4_acl passthru work unless needed Mike Snitzer
2026-02-19 22:13 ` [RFC PATCH 09/11] NFSv4: add reexport support for SETACL nfs4_acl passthru Mike Snitzer
2026-02-19 22:13 ` [RFC PATCH 10/11] NFSv4: add reexport support for GETACL " Mike Snitzer
2026-02-19 22:13 ` [RFC PATCH 11/11] NFSv4: set EXPORT_OP_NFSV4_ACL_PASSTHRU flag Mike Snitzer
2026-02-19 22:21 ` [RFC PATCH 00/11] NFS/NFSD: nfs4_acl passthru for NFSv4 reexport Chuck Lever
2026-02-19 23:07 ` Mike Snitzer
2026-02-20 15:46 ` Chuck Lever
2026-02-19 23:57 ` Trond Myklebust
2026-02-20 15:33 ` Chuck Lever
2026-02-22 17:53 ` Chuck Lever
2026-02-22 19:39 ` Mike Snitzer
2026-02-22 20:31 ` Chuck Lever
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=20260219221352.40554-7-snitzer@kernel.org \
--to=snitzer@kernel.org \
--cc=anna.schumaker@oracle.com \
--cc=chuck.lever@oracle.com \
--cc=jlayton@kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@hammerspace.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.