Add NFSv4.2 POSIX ACL support to the client
Subsystems (2)
cover Add NFSv4.2 POSIX ACL support to the client
From: Rick Macklem <[email protected]>
The Internet draft "POSIX Draft ACL support for Network File System Version 4, Minor Version2"
https://datatracker.ietf.org/doc/draft-ietf-nfsv4-posix-acls/
describes an extension to NFSv4.2 so that POSIX draft ACLs can get acquired and set directly, without using the loosey NFSv4->POSIX draft mapping algorith. It extends the protocol with four new attributes.
This patch series implements the client side of this extension for the nfs client. It is analogous to the NFSACL protocol used as a sideband protocol for NFSv3 and allows the ACLs to be acquired/set be getfacl(1)/setfacl(1).
The current implementation may not handle the "per file" scope, where individual file objects store/use either an NFSv4 ACL or a POSIX draft ACL. The only known file system that implements this is IBM's GPFS, and only if the "all" option is set for ACLs on it. Until a server implements this case, it will be difficult to implement correct client semantics for this case.
The last patch is rather large, but I would get either build failures or build warnings when I broke it up into smaller chunks.
This patch series requires patch 0001 from the server series to be applied first.
Rick Macklem (7):
Add entries to the predefined client operations enum Add new entries for handling POSIX draft ACLs Make posix_acl_from_nfsacl() global
Make three functions global and move them to acl.c Make nfs4_server_supports_acls() global
Set SB_POSIXACL if the server supports the extension Add support for the NFSv4.2 POSIX draft ACL attributes
fs/nfs/Makefile | 2 +- fs/nfs/nfs.h | 3 + fs/nfs/nfs34acl.c | 40 +++ fs/nfs/nfs3acl.c | 44 +-- fs/nfs/nfs42proc.c | 304 +++++++++++++++++++ fs/nfs/nfs42xdr.c | 642 ++++++++++++++++++++++++++++++++++++++++ fs/nfs/nfs4_fs.h | 9 + fs/nfs/nfs4proc.c | 18 +- fs/nfs/nfs4xdr.c | 2 + fs/nfs/super.c | 5 + fs/nfs_common/nfsacl.c | 3 +- include/linux/nfs4.h | 2 + include/linux/nfs_xdr.h | 51 ++++ include/linux/nfsacl.h | 2 + 14 files changed, 1085 insertions(+), 42 deletions(-) create mode 100644 fs/nfs/nfs34acl.c
Signature · 1 line
2.49.0
PATCH 1/7 Add entries to the predefined client operations enum
From: Rick Macklem <[email protected]>
Add entries to the predefined Linux client operations to get/set POSIX draft ACLs.
--- include/linux/nfs4.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/nfs4.h +2 -0
@@ -695,6 +695,8 @@ enum {NFSPROC4_CLNT_REMOVEXATTR ,NFSPROC4_CLNT_READ_PLUS ,NFSPROC4_CLNT_OFFLOAD_STATUS , +NFSPROC4_CLNT_GETPOSIXACL , + NFSPROC4_CLNT_SETPOSIXACL, };/* nfs41 types */
Signature · 1 line
2.49.0
PATCH 2/7 Add new entries for handling POSIX draft ACLs
In reply to [email protected]From: Rick Macklem <[email protected]>
Add structures and definitions for the handling
of POSIX draft ACLs for the NFS client.
--- include/linux/nfs_xdr.h | 49 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+)
include/linux/nfs_xdr.h +49 -0
@@ -1622,6 +1622,46 @@ struct nfs42_removexattrres {struct nfs4_change_info cinfo; }; +struct nfs42_getposixaclargs { +struct nfs4_sequence_args seq_args; +struct nfs_fh * fh; +int mask; +struct page ** pages; +}; + +struct nfs42_getposixaclres { +struct nfs4_sequence_res seq_res; +const struct nfs_server * server; +int mask; +unsigned int acl_access_count; +unsigned int acl_default_count; +struct posix_acl * acl_access; +struct posix_acl * acl_default; +}; + +struct nfs42_setposixaclargs { +struct nfs4_sequence_args seq_args; +struct nfs_fh * fh; +const struct nfs_server * server; +struct inode * inode; +int mask; +struct posix_acl * acl_access; +struct posix_acl * acl_default; +size_t len; +struct page ** pages; +}; + +struct nfs42_setposixaclres { +struct nfs4_sequence_res seq_res; +const struct nfs_server * server; +}; + +#define NFS4_ACL_INLINE_BUFSIZE ((2*(1+3*4+35*(NFS_ACL_MAX_ENTRIES_INLINE-4))) \ + << 2) +#define NFS4_ACL_MAXPAGES ((2*(4+12*NFS_ACL_MAX_ENTRIES+ \ + IDMAP_NAMESZ*(NFS_ACL_MAX_ENTRIES-4))+ \ + PAGE_SIZE - 1) >> PAGE_SHIFT) +#endif /* CONFIG_NFS_V4_2 */ struct nfs_page ;
@@ -1765,6 +1805,15 @@ struct nfs_renamedata {bool cancelled; }; +struct nfs_xdr_putpage_desc { +struct page **pages; +void *p; +void *endp; +size_t npages; +size_t page_pos; +size_t max_npages; +}; +struct nfs_access_entry ;struct nfs_client ;struct rpc_timeout ;
Signature · 1 line
2.49.0
PATCH 3/7 Make posix_acl_from_nfsacl() global
In reply to [email protected]From: Rick Macklem <[email protected]>
The function posix_acl_from_nfsacl() needs to be called from the NFSv4.2 client code handling the POSIX draft ACL extensions.
--- fs/nfs_common/nfsacl.c | 3 ++- include/linux/nfsacl.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-)
fs/nfs_common/nfsacl.c +2 -1
@@ -289,7 +289,7 @@ cmp_acl_entry(const void *x, const void *y)/* * Convert from a Solaris ACL to a POSIX 1003.1e draft 17 ACL. */ -static int +int posix_acl_from_nfsacl (struct posix_acl *acl) { struct posix_acl_entry *pa, *pe,
@@ -325,6 +325,7 @@ posix_acl_from_nfsacl(struct posix_acl *acl) }return 0 ; } +EXPORT_SYMBOL_GPL (posix_acl_from_nfsacl);/** * nfsacl_decode - Decode an NFSv3 ACL
include/linux/nfsacl.h +2 -0
@@ -44,5 +44,7 @@ nfs_stream_decode_acl(struct xdr_stream *xdr, unsigned int *aclcnt,extern bool nfs_stream_encode_acl (struct xdr_stream *xdr,struct inode *inode,struct posix_acl *acl,int encode_entries,int typeflag); +extern int +posix_acl_from_nfsacl (struct posix_acl *acl);#endif /* __LINUX_NFSACL_H */
Signature · 1 line
2.49.0
PATCH 4/7 Make three functions global and move them to acl.c
In reply to [email protected]From: Rick Macklem <[email protected]>
The three functions:nfs3_prepare_get_acl()nfs3_complete_get_acl()nfs3_abort_get_acl()
have been moved to a new file called nfs34acl.c and renamed nfs34_XXX(), so that they can be called from the NFSv4.2 client code implementing the POSIX draft ACL attributes.
--- fs/nfs/Makefile | 2 +- fs/nfs/nfs.h | 3 +++ fs/nfs/nfs34acl.c | 40 ++++++++++++++++++++++++++++++++++++++++ fs/nfs/nfs3acl.c | 44 +++++++------------------------------------- 4 files changed, 51 insertions(+), 38 deletions(-) create mode 100644 fs/nfs/nfs34acl.c
fs/nfs/Makefile +1 -1
@@ -9,7 +9,7 @@ CFLAGS_nfstrace.o += -I$(src) nfs-y := client.o dir.o file.o getroot.o inode.o super.o \ io.o direct.o pagelist.o read.o symlink.o unlink.o \ write.o namespace.o mount_clnt.o nfstrace.o \ - export.o sysfs.o fs_context.o + export.o sysfs.o fs_context.o nfs34acl.o nfs-$(CONFIG_ROOT_NFS) += nfsroot.o nfs-$(CONFIG_SYSCTL) += sysctl.o nfs-$(CONFIG_NFS_FSCACHE) += fscache.o
fs/nfs/nfs.h +3 -0
@@ -26,5 +26,8 @@ int get_nfs_version(struct nfs_subversion *);void put_nfs_version (struct nfs_subversion *);void register_nfs_version (struct nfs_subversion *);void unregister_nfs_version (struct nfs_subversion *); +void nfs34_prepare_get_acl (struct posix_acl **); +void nfs34_complete_get_acl (struct posix_acl **,struct posix_acl *); +void nfs34_abort_get_acl (struct posix_acl **);#endif /* __LINUX_INTERNAL_NFS_H */
fs/nfs/nfs34acl.c new file +40 -0
@@ -0,0 +1,40 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/fs.h> +#include <linux/nfs_fs.h> +#include <linux/posix_acl.h> + +#include "nfs.h" + +/* +* nfs34_prepare_get_acl, nfs34_complete_get_acl, nfs34_abort_get_acl: Helpers +* for caching get_acl results in a race-free way. See fs/posix_acl.c:get_acl() +* for explanations. +*/ +void nfs34_prepare_get_acl (struct posix_acl **p) +{ +struct posix_acl *sentinel =uncached_acl_sentinel (current); + +/* If the ACL isn't being read yet, set our sentinel. */ +cmpxchg (p,ACL_NOT_CACHED , sentinel); +} +EXPORT_SYMBOL_GPL (nfs34_prepare_get_acl); + +void nfs34_complete_get_acl (struct posix_acl **p,struct posix_acl *acl) +{ +struct posix_acl *sentinel =uncached_acl_sentinel (current); + +/* Only cache the ACL if our sentinel is still in place. */ +posix_acl_dup (acl); +if (cmpxchg (p, sentinel, acl) != sentinel) +posix_acl_release (acl); +} +EXPORT_SYMBOL_GPL (nfs34_complete_get_acl); + +void nfs34_abort_get_acl (struct posix_acl **p) +{ +struct posix_acl *sentinel =uncached_acl_sentinel (current); + +/* Remove our sentinel upon failure. */ +cmpxchg (p, sentinel,ACL_NOT_CACHED ); +} +EXPORT_SYMBOL_GPL (nfs34_abort_get_acl);
fs/nfs/nfs3acl.c +7 -37
77 lines not on this page · raw message
Signature · 1 line
2.49.0
PATCH 5/7 Make nfs4_server_supports_acls() global
In reply to [email protected]From: Rick Macklem <[email protected]>
Add support for the POSIX draft ACL attributes to nfs4_server_supports_acls() and make it global, so that support for POSIX draft ACLs can be checked in nfs4proc.c.
--- fs/nfs/nfs4_fs.h | 2 ++ fs/nfs/nfs4proc.c | 6 +++++- include/linux/nfs_xdr.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-)
fs/nfs/nfs4_fs.h +2 -0
@@ -337,6 +337,8 @@ extern void nfs4_update_changeattr(struct inode *dir,struct nfs4_change_info *cinfo, unsigned long timestamp, unsigned long cache_validity); +extern bool nfs4_server_supports_acls (const struct nfs_server *server, +enum nfs4_acl_type type);extern int nfs4_buf_to_pages_noslab (const void *buf,size_t buflen,struct page **pages);
fs/nfs/nfs4proc.c +5 -1
@@ -6069,7 +6069,7 @@ static int nfs4_proc_renew(struct nfs_client *clp, const struct cred *cred)return 0 ; } -static bool nfs4_server_supports_acls (const struct nfs_server *server, +bool nfs4_server_supports_acls (const struct nfs_server *server,enum nfs4_acl_type type) {switch (type) {
@@ -6079,6 +6079,10 @@ static bool nfs4_server_supports_acls(const struct nfs_server *server,return server->attr_bitmask[1 ] &FATTR4_WORD1_DACL ;case NFS4ACL_SACL :return server->attr_bitmask[1 ] &FATTR4_WORD1_SACL ; +case NFS4ACL_POSIXDEFAULT : +return server->attr_bitmask[2 ] &FATTR4_WORD2_POSIX_DEFAULT_ACL ; +case NFS4ACL_POSIXACCESS : +return server->attr_bitmask[2 ] &FATTR4_WORD2_POSIX_ACCESS_ACL ; } }
include/linux/nfs_xdr.h +2 -0
@@ -832,6 +832,8 @@ enum nfs4_acl_type {NFS4ACL_ACL ,NFS4ACL_DACL ,NFS4ACL_SACL , +NFS4ACL_POSIXDEFAULT , + NFS4ACL_POSIXACCESS, }; struct nfs_setaclargs {
Signature · 1 line
2.49.0
kernel test robot
build botRe: [PATCH v1 5/7] Make nfs4_server_supports_acls() global
kernel test robot noticed the following build errors:
Hi,
kernel test robot noticed the following build errors:
[auto build test ERROR on trondmy-nfs/linux-next]
[also build test ERROR on linus/master v6.16-rc1 next-20251219] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/rick-macklem-gmail-com/Add-entries-to-the-predefined-client-operations-enum/20260103-073239 base: git://git.linux-nfs.org/projects/trondmy/linux-nfs.git linux-next patch link: https://lore.kernel.org/r/20260102232934.1560-6-rick.macklem%40gmail.com patch subject: [PATCH v1 5/7] Make nfs4_server_supports_acls() global config: x86_64-kexec (https://download.01.org/0day-ci/archive/20260103/[email protected]/config) compiler: clang version 20.1.8 (https://github.com/llvm/llvm-project 87f0227cb60147a26a1eeb4fb06e3b505e9c7261) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260103/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> fs/nfs/nfs4proc.c:6083:36: error: use of undeclared identifier 'FATTR4_WORD2_POSIX_DEFAULT_ACL'
6083 | return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_DEFAULT_ACL;
| ^
>> fs/nfs/nfs4proc.c:6085:36: error: use of undeclared identifier 'FATTR4_WORD2_POSIX_ACCESS_ACL'
6085 | return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_ACCESS_ACL;
| ^
fs/nfs/nfs4proc.c:9630:12: warning: variable 'ptr' set but not used [-Wunused-but-set-variable]
9630 | unsigned *ptr;
| ^1 warning and 2 errors generated.
vim +/FATTR4_WORD2_POSIX_DEFAULT_ACL +6083 fs/nfs/nfs4proc.c
6071
6072 bool nfs4_server_supports_acls(const struct nfs_server *server,
6073 enum nfs4_acl_type type)
6074 {
6075 switch (type) {
6076 default:
6077 return server->attr_bitmask[0] & FATTR4_WORD0_ACL;
6078 case NFS4ACL_DACL:
6079 return server->attr_bitmask[1] & FATTR4_WORD1_DACL;
6080 case NFS4ACL_SACL:
6081 return server->attr_bitmask[1] & FATTR4_WORD1_SACL;
6082 case NFS4ACL_POSIXDEFAULT:
> 6083 return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_DEFAULT_ACL; 6084 case NFS4ACL_POSIXACCESS: > 6085 return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_ACCESS_ACL;
6086 }
6087 }
6088
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Re: [PATCH v1 5/7] Make nfs4_server_supports_acls() global
The reason this happens is that this patch series requires the 0001 patch from the server series.
Should I repost with that patch including in this set as well?
rick
Quoted 62 lines · kernel test robot
Hi,
kernel test robot noticed the following build errors:
[auto build test ERROR on trondmy-nfs/linux-next]
[also build test ERROR on linus/master v6.16-rc1 next-20251219] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]url: https://github.com/intel-lab-lkp/linux/commits/rick-macklem-gmail-com/Add-entries-to-the-predefined-client-operations-enum/20260103-073239 base: git://git.linux-nfs.org/projects/trondmy/linux-nfs.git linux-next patch link: https://lore.kernel.org/r/20260102232934.1560-6-rick.macklem%40gmail.com patch subject: [PATCH v1 5/7] Make nfs4_server_supports_acls() global config: x86_64-kexec (https://download.01.org/0day-ci/archive/20260103/[email protected]/config) compiler: clang version 20.1.8 (https://github.com/llvm/llvm-project 87f0227cb60147a26a1eeb4fb06e3b505e9c7261) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260103/[email protected]/reproduce)If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/All errors (new ones prefixed by >>):
Quoted 1 line
Quoted 1 line
fs/nfs/nfs4proc.c:6083:36: error: use of undeclared identifier 'FATTR4_WORD2_POSIX_DEFAULT_ACL'6083 | return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_DEFAULT_ACL; | ^Quoted 1 line
Quoted 1 line
fs/nfs/nfs4proc.c:6085:36: error: use of undeclared identifier 'FATTR4_WORD2_POSIX_ACCESS_ACL'6085 | return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_ACCESS_ACL; | ^ fs/nfs/nfs4proc.c:9630:12: warning: variable 'ptr' set but not used [-Wunused-but-set-variable] 9630 | unsigned *ptr; | ^1 warning and 2 errors generated.
vim +/FATTR4_WORD2_POSIX_DEFAULT_ACL +6083
fs/nfs/nfs4proc.c6071
6072 bool nfs4_server_supports_acls(const structnfs_server*server,
6073 enumnfs4_acl_typetype)
6074 {
6075 switch (type) {
6076 default:
6077 return server->attr_bitmask[0] &FATTR4_WORD0_ACL;
6078 caseNFS4ACL_DACL:
6079 return server->attr_bitmask[1] &FATTR4_WORD1_DACL;
6080 caseNFS4ACL_SACL:
6081 return server->attr_bitmask[1] &FATTR4_WORD1_SACL;
6082 caseNFS4ACL_POSIXDEFAULT:Quoted 1 line
6083 return server->attr_bitmask[2] &
FATTR4_WORD2_POSIX_DEFAULT_ACL;6084 case
NFS4ACL_POSIXACCESS:Quoted 1 line
6085 return server->attr_bitmask[2] &
FATTR4_WORD2_POSIX_ACCESS_ACL;6086 }
6087 }
6088--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
kernel test robot
build botRe: [PATCH v1 5/7] Make nfs4_server_supports_acls() global
In reply to [email protected]kernel test robot noticed the following build errors:
Hi,
kernel test robot noticed the following build errors:
[auto build test ERROR on trondmy-nfs/linux-next]
[also build test ERROR on linus/master v6.19-rc3 next-20251219] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/rick-macklem-gmail-com/Add-entries-to-the-predefined-client-operations-enum/20260103-073239 base: git://git.linux-nfs.org/projects/trondmy/linux-nfs.git linux-next patch link: https://lore.kernel.org/r/20260102232934.1560-6-rick.macklem%40gmail.com patch subject: [PATCH v1 5/7] Make nfs4_server_supports_acls() global config: x86_64-rhel-9.4 (https://download.01.org/0day-ci/archive/20260103/[email protected]/config) compiler: gcc-14 (Debian 14.2.0-19) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260103/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All error/warnings (new ones prefixed by >>):
fs/nfs/nfs4proc.c: In function 'nfs4_server_supports_acls':
>> fs/nfs/nfs4proc.c:6083:50: error: 'FATTR4_WORD2_POSIX_DEFAULT_ACL' undeclared (first use in this function)
6083 | return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_DEFAULT_ACL;
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
fs/nfs/nfs4proc.c:6083:50: note: each undeclared identifier is reported only once for each function it appears in
>> fs/nfs/nfs4proc.c:6085:50: error: 'FATTR4_WORD2_POSIX_ACCESS_ACL' undeclared (first use in this function); did you mean 'FATTR4_WORD1_TIME_ACCESS_SET'?
6085 | return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_ACCESS_ACL;
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| FATTR4_WORD1_TIME_ACCESS_SET
fs/nfs/nfs4proc.c: In function 'nfs4_proc_create_session':
fs/nfs/nfs4proc.c:9630:19: warning: variable 'ptr' set but not used [-Wunused-but-set-variable]
9630 | unsigned *ptr;
| ^~~
fs/nfs/nfs4proc.c: In function 'nfs4_server_supports_acls':
>> fs/nfs/nfs4proc.c:6087:1: warning: control reaches end of non-void function [-Wreturn-type]
6087 | }
| ^vim +/FATTR4_WORD2_POSIX_DEFAULT_ACL +6083 fs/nfs/nfs4proc.c
6071
6072 bool nfs4_server_supports_acls(const struct nfs_server *server,
6073 enum nfs4_acl_type type)
6074 {
6075 switch (type) {
6076 default:
6077 return server->attr_bitmask[0] & FATTR4_WORD0_ACL;
6078 case NFS4ACL_DACL:
6079 return server->attr_bitmask[1] & FATTR4_WORD1_DACL;
6080 case NFS4ACL_SACL:
6081 return server->attr_bitmask[1] & FATTR4_WORD1_SACL;
6082 case NFS4ACL_POSIXDEFAULT:
> 6083 return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_DEFAULT_ACL; 6084 case NFS4ACL_POSIXACCESS: > 6085 return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_ACCESS_ACL; 6086 } > 6087 }
6088
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botRe: [PATCH v1 5/7] Make nfs4_server_supports_acls() global
In reply to [email protected]kernel test robot noticed the following build warnings:
Hi,
kernel test robot noticed the following build warnings:
[auto build test WARNING on trondmy-nfs/linux-next]
[also build test WARNING on linus/master v6.19-rc4 next-20260109] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/rick-macklem-gmail-com/Add-entries-to-the-predefined-client-operations-enum/20260103-073239 base: git://git.linux-nfs.org/projects/trondmy/linux-nfs.git linux-next patch link: https://lore.kernel.org/r/20260102232934.1560-6-rick.macklem%40gmail.com patch subject: [PATCH v1 5/7] Make nfs4_server_supports_acls() global config: um-allyesconfig (https://download.01.org/0day-ci/archive/20260110/[email protected]/config) compiler: gcc-14 (Debian 14.2.0-19) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260110/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
fs/nfs/nfs4proc.c: In function 'nfs4_server_supports_acls':
fs/nfs/nfs4proc.c:6083:50: error: 'FATTR4_WORD2_POSIX_DEFAULT_ACL' undeclared (first use in this function)
6083 | return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_DEFAULT_ACL;
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
fs/nfs/nfs4proc.c:6083:50: note: each undeclared identifier is reported only once for each function it appears in
fs/nfs/nfs4proc.c:6085:50: error: 'FATTR4_WORD2_POSIX_ACCESS_ACL' undeclared (first use in this function); did you mean 'FATTR4_WORD1_TIME_ACCESS_SET'?
6085 | return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_ACCESS_ACL;
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| FATTR4_WORD1_TIME_ACCESS_SET
>> fs/nfs/nfs4proc.c:6087:1: warning: control reaches end of non-void function [-Wreturn-type]
6087 | }
| ^vim +6087 fs/nfs/nfs4proc.c
^1da177e4c3f41 Linus Torvalds 2005-04-16 6071
2f4c5fc884fcb1 Rick Macklem 2026-01-02 6072 bool nfs4_server_supports_acls(const struct nfs_server *server,
7b8b44eb7710e3 Trond Myklebust 2022-05-14 6073 enum nfs4_acl_type type)
aa1870af92d8f6 J. Bruce Fields 2005-06-22 6074 {
7b8b44eb7710e3 Trond Myklebust 2022-05-14 6075 switch (type) {
7b8b44eb7710e3 Trond Myklebust 2022-05-14 6076 default:
7b8b44eb7710e3 Trond Myklebust 2022-05-14 6077 return server->attr_bitmask[0] & FATTR4_WORD0_ACL;
7b8b44eb7710e3 Trond Myklebust 2022-05-14 6078 case NFS4ACL_DACL:
7b8b44eb7710e3 Trond Myklebust 2022-05-14 6079 return server->attr_bitmask[1] & FATTR4_WORD1_DACL;
7b8b44eb7710e3 Trond Myklebust 2022-05-14 6080 case NFS4ACL_SACL:
7b8b44eb7710e3 Trond Myklebust 2022-05-14 6081 return server->attr_bitmask[1] & FATTR4_WORD1_SACL;
2f4c5fc884fcb1 Rick Macklem 2026-01-02 6082 case NFS4ACL_POSIXDEFAULT:
2f4c5fc884fcb1 Rick Macklem 2026-01-02 6083 return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_DEFAULT_ACL;
2f4c5fc884fcb1 Rick Macklem 2026-01-02 6084 case NFS4ACL_POSIXACCESS:
2f4c5fc884fcb1 Rick Macklem 2026-01-02 6085 return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_ACCESS_ACL;
7b8b44eb7710e3 Trond Myklebust 2022-05-14 6086 }aa1870af92d8f6 J. Bruce Fields 2005-06-22 @6087 } aa1870af92d8f6 J. Bruce Fields 2005-06-22 6088
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botRe: [PATCH v1 5/7] Make nfs4_server_supports_acls() global
In reply to [email protected]kernel test robot noticed the following build errors:
Hi,
kernel test robot noticed the following build errors:
[auto build test ERROR on trondmy-nfs/linux-next]
[also build test ERROR on linus/master v6.19-rc4 next-20260109] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/rick-macklem-gmail-com/Add-entries-to-the-predefined-client-operations-enum/20260103-073239 base: git://git.linux-nfs.org/projects/trondmy/linux-nfs.git linux-next patch link: https://lore.kernel.org/r/20260102232934.1560-6-rick.macklem%40gmail.com patch subject: [PATCH v1 5/7] Make nfs4_server_supports_acls() global config: sh-allmodconfig (https://download.01.org/0day-ci/archive/20260110/[email protected]/config) compiler: sh4-linux-gcc (GCC) 15.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260110/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
fs/nfs/nfs4proc.c: In function 'nfs4_server_supports_acls':
>> fs/nfs/nfs4proc.c:6083:50: error: 'FATTR4_WORD2_POSIX_DEFAULT_ACL' undeclared (first use in this function)
6083 | return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_DEFAULT_ACL;
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
fs/nfs/nfs4proc.c:6083:50: note: each undeclared identifier is reported only once for each function it appears in
>> fs/nfs/nfs4proc.c:6085:50: error: 'FATTR4_WORD2_POSIX_ACCESS_ACL' undeclared (first use in this function); did you mean 'FATTR4_WORD1_TIME_ACCESS_SET'?
6085 | return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_ACCESS_ACL;
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| FATTR4_WORD1_TIME_ACCESS_SETvim +/FATTR4_WORD2_POSIX_DEFAULT_ACL +6083 fs/nfs/nfs4proc.c
6071
6072 bool nfs4_server_supports_acls(const struct nfs_server *server,
6073 enum nfs4_acl_type type)
6074 {
6075 switch (type) {
6076 default:
6077 return server->attr_bitmask[0] & FATTR4_WORD0_ACL;
6078 case NFS4ACL_DACL:
6079 return server->attr_bitmask[1] & FATTR4_WORD1_DACL;
6080 case NFS4ACL_SACL:
6081 return server->attr_bitmask[1] & FATTR4_WORD1_SACL;
6082 case NFS4ACL_POSIXDEFAULT:
> 6083 return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_DEFAULT_ACL; 6084 case NFS4ACL_POSIXACCESS: > 6085 return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_ACCESS_ACL;
6086 }
6087 }
6088
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Re: [PATCH v1 5/7] Make nfs4_server_supports_acls() global
This should be fixed in the v2 patches I posted. (It needs the same patch as patch 0001 in the server series, so I added it to the v2 series.)
rick
Quoted 61 lines · kernel test robot
Hi,
kernel test robot noticed the following build errors:
[auto build test ERROR on trondmy-nfs/linux-next]
[also build test ERROR on linus/master v6.19-rc4 next-20260109] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]url: https://github.com/intel-lab-lkp/linux/commits/rick-macklem-gmail-com/Add-entries-to-the-predefined-client-operations-enum/20260103-073239 base: git://git.linux-nfs.org/projects/trondmy/linux-nfs.git linux-next patch link: https://lore.kernel.org/r/20260102232934.1560-6-rick.macklem%40gmail.com patch subject: [PATCH v1 5/7] Make nfs4_server_supports_acls() global config: sh-allmodconfig (https://download.01.org/0day-ci/archive/20260110/[email protected]/config) compiler: sh4-linux-gcc (GCC) 15.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260110/[email protected]/reproduce)If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/All errors (new ones prefixed by >>):
fs/nfs/nfs4proc.c: In function 'nfs4_server_supports_acls':Quoted 1 line
Quoted 1 line
fs/nfs/nfs4proc.c:6083:50: error: 'FATTR4_WORD2_POSIX_DEFAULT_ACL' undeclared (first use in this function)6083 | return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_DEFAULT_ACL; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
fs/nfs/nfs4proc.c:6083:50: note: each undeclared identifier is reported only once for each function it appears inQuoted 1 line
Quoted 1 line
fs/nfs/nfs4proc.c:6085:50: error: 'FATTR4_WORD2_POSIX_ACCESS_ACL' undeclared (first use in this function); did you mean 'FATTR4_WORD1_TIME_ACCESS_SET'?6085 | return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_ACCESS_ACL; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | FATTR4_WORD1_TIME_ACCESS_SETvim +/FATTR4_WORD2_POSIX_DEFAULT_ACL +6083
fs/nfs/nfs4proc.c6071
6072 bool nfs4_server_supports_acls(const structnfs_server*server,
6073 enumnfs4_acl_typetype)
6074 {
6075 switch (type) {
6076 default:
6077 return server->attr_bitmask[0] &FATTR4_WORD0_ACL;
6078 caseNFS4ACL_DACL:
6079 return server->attr_bitmask[1] &FATTR4_WORD1_DACL;
6080 caseNFS4ACL_SACL:
6081 return server->attr_bitmask[1] &FATTR4_WORD1_SACL;
6082 caseNFS4ACL_POSIXDEFAULT:Quoted 1 line
6083 return server->attr_bitmask[2] &
FATTR4_WORD2_POSIX_DEFAULT_ACL;6084 case
NFS4ACL_POSIXACCESS:Quoted 1 line
6085 return server->attr_bitmask[2] &
FATTR4_WORD2_POSIX_ACCESS_ACL;6086 }
6087 }
6088--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
kernel test robot
build botRe: [PATCH v1 5/7] Make nfs4_server_supports_acls() global
In reply to [email protected]kernel test robot noticed the following build errors:
Hi,
kernel test robot noticed the following build errors:
[auto build test ERROR on trondmy-nfs/linux-next]
[also build test ERROR on linus/master v6.19-rc4 next-20260109] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/rick-macklem-gmail-com/Add-entries-to-the-predefined-client-operations-enum/20260103-073239 base: git://git.linux-nfs.org/projects/trondmy/linux-nfs.git linux-next patch link: https://lore.kernel.org/r/20260102232934.1560-6-rick.macklem%40gmail.com patch subject: [PATCH v1 5/7] Make nfs4_server_supports_acls() global config: hexagon-allmodconfig (https://download.01.org/0day-ci/archive/20260110/[email protected]/config) compiler: clang version 17.0.6 (https://github.com/llvm/llvm-project 6009708b4367171ccdbf4b5905cb6a803753fe18) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260110/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> fs/nfs/nfs4proc.c:6083:36: error: use of undeclared identifier 'FATTR4_WORD2_POSIX_DEFAULT_ACL'
6083 | return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_DEFAULT_ACL;
| ^
>> fs/nfs/nfs4proc.c:6085:36: error: use of undeclared identifier 'FATTR4_WORD2_POSIX_ACCESS_ACL'
6085 | return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_ACCESS_ACL;
| ^2 errors generated.
vim +/FATTR4_WORD2_POSIX_DEFAULT_ACL +6083 fs/nfs/nfs4proc.c
6071
6072 bool nfs4_server_supports_acls(const struct nfs_server *server,
6073 enum nfs4_acl_type type)
6074 {
6075 switch (type) {
6076 default:
6077 return server->attr_bitmask[0] & FATTR4_WORD0_ACL;
6078 case NFS4ACL_DACL:
6079 return server->attr_bitmask[1] & FATTR4_WORD1_DACL;
6080 case NFS4ACL_SACL:
6081 return server->attr_bitmask[1] & FATTR4_WORD1_SACL;
6082 case NFS4ACL_POSIXDEFAULT:
> 6083 return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_DEFAULT_ACL; 6084 case NFS4ACL_POSIXACCESS: > 6085 return server->attr_bitmask[2] & FATTR4_WORD2_POSIX_ACCESS_ACL;
6086 }
6087 }
6088
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
PATCH 6/7 Set SB_POSIXACL if the server supports the extension
In reply to [email protected]From: Rick Macklem <[email protected]>
Check to see if both the POSIX draft default ACL and POSIX draft access ACL are supported by the server. If so, set SB_POSIXACL.
--- fs/nfs/super.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/nfs/super.c +5 -0
@@ -1352,6 +1352,11 @@ int nfs_get_tree_common(struct fs_context *fc) goto error_splat_super; } +/* Set SB_POSIXACL if the server supports the NFSv4.2 extension. */ +if ((server->attr_bitmask[2 ] &FATTR4_WORD2_POSIX_DEFAULT_ACL ) && + (server->attr_bitmask[2 ] &FATTR4_WORD2_POSIX_ACCESS_ACL )) + s->s_flags |=SB_POSIXACL ; + s->s_flags |=SB_ACTIVE ; error =0 ;
Signature · 1 line
2.49.0
kernel test robot
build botRe: [PATCH v1 6/7] Set SB_POSIXACL if the server supports the extension
kernel test robot noticed the following build errors:
Hi,
kernel test robot noticed the following build errors:
[auto build test ERROR on trondmy-nfs/linux-next]
[also build test ERROR on v6.16-rc1 next-20251219]
[cannot apply to linus/master]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/rick-macklem-gmail-com/Add-entries-to-the-predefined-client-operations-enum/20260103-073239 base: git://git.linux-nfs.org/projects/trondmy/linux-nfs.git linux-next patch link: https://lore.kernel.org/r/20260102232934.1560-7-rick.macklem%40gmail.com patch subject: [PATCH v1 6/7] Set SB_POSIXACL if the server supports the extension config: x86_64-kexec (https://download.01.org/0day-ci/archive/20260103/[email protected]/config) compiler: clang version 20.1.8 (https://github.com/llvm/llvm-project 87f0227cb60147a26a1eeb4fb06e3b505e9c7261) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260103/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> fs/nfs/super.c:1356:33: error: use of undeclared identifier 'FATTR4_WORD2_POSIX_DEFAULT_ACL'
1356 | if ((server->attr_bitmask[2] & FATTR4_WORD2_POSIX_DEFAULT_ACL) &&
| ^
>> fs/nfs/super.c:1357:33: error: use of undeclared identifier 'FATTR4_WORD2_POSIX_ACCESS_ACL'
1357 | (server->attr_bitmask[2] & FATTR4_WORD2_POSIX_ACCESS_ACL))
| ^2 errors generated.
vim +/FATTR4_WORD2_POSIX_DEFAULT_ACL +1356 fs/nfs/super.c
1299
1300 int nfs_get_tree_common(struct fs_context *fc)
1301 {
1302 struct nfs_fs_context *ctx = nfs_fc2context(fc);
1303 struct super_block *s;
1304 int (*compare_super)(struct super_block *, struct fs_context *) = nfs_compare_super;
1305 struct nfs_server *server = ctx->server;
1306 int error;
1307
1308 ctx->server = NULL;
1309 if (IS_ERR(server))
1310 return PTR_ERR(server);
1311
1312 if (server->flags & NFS_MOUNT_UNSHARED)
1313 compare_super = NULL;
1314
1315 /* -o noac implies -o sync */
1316 if (server->flags & NFS_MOUNT_NOAC)
1317 fc->sb_flags |= SB_SYNCHRONOUS;
1318
1319 /* Get a superblock - note that we may end up sharing one that already exists */
1320 fc->s_fs_info = server;
1321 s = sget_fc(fc, compare_super, nfs_set_super);
1322 fc->s_fs_info = NULL;
1323 if (IS_ERR(s)) {
1324 error = PTR_ERR(s);
1325 nfs_errorf(fc, "NFS: Couldn't get superblock");
1326 goto out_err_nosb;
1327 }
1328
1329 if (s->s_fs_info != server) {
1330 nfs_free_server(server);
1331 server = NULL;
1332 } else {
1333 error = super_setup_bdi_name(s, "%u:%u", MAJOR(server->s_dev),
1334 MINOR(server->s_dev));
1335 if (error)
1336 goto error_splat_super;
1337 s->s_bdi->io_pages = server->rpages;
1338 server->super = s;
1339 }
1340
1341 if (!s->s_root) {
1342 /* initial superblock/root creation */
1343 nfs_fill_super(s, ctx);
1344 error = nfs_get_cache_cookie(s, ctx);
1345 if (error < 0)
1346 goto error_splat_super;
1347 }
1348
1349 error = nfs_get_root(s, fc);
1350 if (error < 0) {
1351 nfs_errorf(fc, "NFS: Couldn't get root dentry");
1352 goto error_splat_super;
1353 }
1354
1355 /* Set SB_POSIXACL if the server supports the NFSv4.2 extension. */
> 1356 if ((server->attr_bitmask[2] & FATTR4_WORD2_POSIX_DEFAULT_ACL) && > 1357 (server->attr_bitmask[2] & FATTR4_WORD2_POSIX_ACCESS_ACL))
1358 s->s_flags |= SB_POSIXACL;
1359
1360 s->s_flags |= SB_ACTIVE;
1361 error = 0;
1362
1363 out:
1364 return error;
1365
1366 out_err_nosb:
1367 nfs_free_server(server);
1368 goto out;
1369 error_splat_super:
1370 deactivate_locked_super(s);
1371 goto out;
1372 }
1373
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Re: [PATCH v1 6/7] Set SB_POSIXACL if the server supports the extension
Next dumb question. This error is the same story. It needs 0001 from the server patch series.
If I repost this series with that patch in it, this report wants a different tag for Closed by:.
Do I put multiple "Closed by:" lines on the commit or just the first one?
rick
Quoted 117 lines · kernel test robot
Hi,
kernel test robot noticed the following build errors:
[auto build test ERROR on trondmy-nfs/linux-next]
[also build test ERROR on v6.16-rc1 next-20251219]
[cannot apply to linus/master]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]url: https://github.com/intel-lab-lkp/linux/commits/rick-macklem-gmail-com/Add-entries-to-the-predefined-client-operations-enum/20260103-073239 base: git://git.linux-nfs.org/projects/trondmy/linux-nfs.git linux-next patch link: https://lore.kernel.org/r/20260102232934.1560-7-rick.macklem%40gmail.com patch subject: [PATCH v1 6/7] Set SB_POSIXACL if the server supports the extension config: x86_64-kexec (https://download.01.org/0day-ci/archive/20260103/[email protected]/config) compiler: clang version 20.1.8 (https://github.com/llvm/llvm-project 87f0227cb60147a26a1eeb4fb06e3b505e9c7261) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260103/[email protected]/reproduce)If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/All errors (new ones prefixed by >>):
Quoted 1 line
Quoted 1 line
fs/nfs/super.c:1356:33: error: use of undeclared identifier 'FATTR4_WORD2_POSIX_DEFAULT_ACL'1356 | if ((server->attr_bitmask[2] & FATTR4_WORD2_POSIX_DEFAULT_ACL) && | ^Quoted 1 line
Quoted 1 line
fs/nfs/super.c:1357:33: error: use of undeclared identifier 'FATTR4_WORD2_POSIX_ACCESS_ACL'1357 | (server->attr_bitmask[2] & FATTR4_WORD2_POSIX_ACCESS_ACL)) | ^2 errors generated.
vim +/FATTR4_WORD2_POSIX_DEFAULT_ACL +1356
fs/nfs/super.c1299
1300 intnfs_get_tree_common(struct fs_context *fc)1301 {1302 struct nfs_fs_context *ctx = nfs_fc2context(fc); 1303 struct super_block *s; 1304 int (*compare_super)(struct super_block *, struct fs_context *) = nfs_compare_super; 1305 struct nfs_server *server = ctx->server; 1306 int error; 1307 1308 ctx->server = NULL; 1309 if (IS_ERR(server)) 1310 return PTR_ERR(server); 1311 1312 if (server->flags & NFS_MOUNT_UNSHARED) 1313 compare_super = NULL; 1314 1315 /* -o noac implies -o sync */ 1316 if (server->flags & NFS_MOUNT_NOAC) 1317 fc->sb_flags |= SB_SYNCHRONOUS; 1318 1319 /* Get a superblock - note that we may end up sharing one that already exists */ 1320 fc->s_fs_info = server; 1321 s = sget_fc(fc, compare_super, nfs_set_super); 1322 fc->s_fs_info = NULL; 1323 if (IS_ERR(s)) { 1324 error = PTR_ERR(s); 1325 nfs_errorf(fc, "NFS: Couldn't get superblock"); 1326 goto out_err_nosb; 1327 } 1328 1329 if (s->s_fs_info != server) { 1330 nfs_free_server(server); 1331 server = NULL; 1332 } else { 1333 error = super_setup_bdi_name(s, "%u:%u", MAJOR(server->s_dev), 1334 MINOR(server->s_dev)); 1335 if (error) 1336 goto error_splat_super; 1337 s->s_bdi->io_pages = server->rpages; 1338 server->super = s; 1339 } 1340 1341 if (!s->s_root) { 1342 /* initial superblock/root creation */ 1343 nfs_fill_super(s, ctx); 1344 error = nfs_get_cache_cookie(s, ctx); 1345 if (error < 0)1346 goto
error_splat_super;
1347 }
1348
1349 error =nfs_get_root(s, fc);
1350 if (error < 0) {
1351nfs_errorf(fc, "NFS: Couldn't get root dentry");
1352 gotoerror_splat_super;
1353 }
1354
1355 /* SetSB_POSIXACLif the server supports the NFSv4.2 extension. */Quoted 2 lines
1356 if ((server->attr_bitmask[2] &
FATTR4_WORD2_POSIX_DEFAULT_ACL) &&
1357 (server->attr_bitmask[2] &FATTR4_WORD2_POSIX_ACCESS_ACL))1358
s->s_flags|=SB_POSIXACL;
1359
1360s->s_flags|=SB_ACTIVE;
1361 error = 0;
1362
1363 out:
1364 return error;
1365
1366out_err_nosb:
1367nfs_free_server(server);
1368 goto out;
1369error_splat_super:
1370deactivate_locked_super(s);
1371 goto out;
1372 }
1373--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
PATCH 7/7 Add support for the NFSv4.2 POSIX draft ACL attributes
In reply to [email protected]From: Rick Macklem <[email protected]>
The internet draft
"POSIX Draft ACL support for Network File System Version 4, Minor Version 2" describes
four new attributes that are extensions to the NFSv4.2 protocol. These new attributes provide support for POSIX draft ACLs without any need for mapping to/from NFSv4 ACLs.
This extension allows the getfacl(1)/setfacl(1) commands to work over an NFSv4.2 mount where the client and server support the extension.
This patch adds new procedures for getting/setting POSIX draft ACLs, along with the XDR encoding/decoding needed for the attributes.
--- fs/nfs/nfs42proc.c | 304 +++++++++++++++++++++ fs/nfs/nfs42xdr.c | 642 +++++++++++++++++++++++++++++++++++++++++++++ fs/nfs/nfs4_fs.h | 7 + fs/nfs/nfs4proc.c | 12 +- fs/nfs/nfs4xdr.c | 2 + 5 files changed, 965 insertions(+), 2 deletions(-)
fs/nfs/nfs42proc.c +304 -0
@@ -11,10 +11,12 @@#include <linux/nfs_xdr.h> #include <linux/nfs_fs.h> #include "nfs4_fs.h" +#include "nfs.h" #include "nfs42.h" #include "iostat.h" #include "pnfs.h" #include "nfs4session.h" +#include "nfs4idmap.h" #include "internal.h" #include "delegation.h" #include "nfs4trace.h"
@@ -1638,6 +1640,308 @@ ssize_t nfs42_proc_listxattrs(struct inode *inode, void *buf,return err; } +static int _nfs4_proc_getposixacl (struct nfs42_getposixaclargs *arg, +struct nfs42_getposixaclres *res, +struct rpc_message *msg, +struct nfs_server *server, +struct inode *inode) +{ +struct nfs4_exception exception = { + .interruptible = true, + }; +int err; +do { + err =nfs4_call_sync (server->client, server, msg, + &arg->seq_args, &res->seq_res,0 ); + err =nfs4_handle_exception (server, err, + &exception); + }while (exception.retry); +return err; +} + +struct posix_acl *nfs4_get_posixacl (struct inode *inode,int type,bool rcu) +{ +struct nfs_server *server =NFS_SERVER (inode); +struct page *pages[NFS4_ACL_MAXPAGES ] = { }; +struct nfs42_getposixaclargs args = { + .fh =NFS_FH (inode), +/* The xdr layer may allocate pages here. */ + .pages = pages, + }; +struct nfs42_getposixaclres res = { + .server = server, + }; +struct rpc_message msg = { + .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_GETPOSIXACL ], + .rpc_argp = &args, + .rpc_resp = &res, + }; +int status, count; + +if (rcu) +return ERR_PTR (-ECHILD ); + +/* +* Check that NFS4ACL_POSIXDEFAULT and NFS4ACL_POSIXACCESS +* attributes are supported by the server. +* We get acl_trueform and return EOPNOTSUPP if the acl_trueform +* is not POSIX_DRAFT_ACL. This allows the case where the +* acl_trueform's scope is file object to work when the acl_trueform +* is not POSIX_DRAFT_ACL. +*/ +if (!nfs4_server_supports_acls (server,NFS4ACL_POSIXDEFAULT ) || + !nfs4_server_supports_acls (server,NFS4ACL_POSIXACCESS )) +return ERR_PTR (-EOPNOTSUPP ); + + status =nfs_revalidate_inode (inode,NFS_INO_INVALID_CHANGE ); +if (status <0 ) +return ERR_PTR (status); + +/* +* Only get the access acl when explicitly requested: We don't +* need it for access decisions, and only some applications use +* it. Applications which request the access acl first are not +* penalized from this optimization. +*/ +if (type ==ACL_TYPE_ACCESS ) + args.mask |=NFS_ACLCNT |NFS_ACL ; +if (S_ISDIR (inode->i_mode)) + args.mask |=NFS_DFACLCNT |NFS_DFACL ; +if (args.mask ==0 ) +return NULL ; + +if (args.mask &NFS_ACL ) +nfs34_prepare_get_acl (&inode->i_acl); +if (args.mask &NFS_DFACL ) +nfs34_prepare_get_acl (&inode->i_default_acl); + + status =_nfs4_proc_getposixacl (&args, &res, &msg, server, inode); + +/* pages may have been allocated at the xdr layer. */ +for (count =0 ; count <NFS4_ACL_MAXPAGES && args.pages[count]; count++) +__free_page (args.pages[count]); + +switch (status) { +case 0 : +break ; +case -EPFNOSUPPORT : +case -EPROTONOSUPPORT : + fallthrough; +case -ENOTSUPP : + status = -EOPNOTSUPP ; + goto getout; +default : + goto getout; + } +if ((args.mask & res.mask) != args.mask) { + status = -EIO ; + goto getout; + } + +if (res.acl_access !=NULL ) { +if ((posix_acl_equiv_mode (res.acl_access,NULL ) ==0 ) || + res.acl_access->a_count ==0 ) { +posix_acl_release (res.acl_access); + res.acl_access =NULL ; + } + } + +if (res.mask &NFS_ACL ) +nfs34_complete_get_acl (&inode->i_acl, res.acl_access); +else +forget_cached_acl (inode,ACL_TYPE_ACCESS ); + +if (res.mask &NFS_DFACL ) +nfs34_complete_get_acl (&inode->i_default_acl, res.acl_default); +else +forget_cached_acl (inode,ACL_TYPE_DEFAULT ); + +if (type ==ACL_TYPE_ACCESS ) { +posix_acl_release (res.acl_default); +return res.acl_access; + }else { +posix_acl_release (res.acl_access); +return res.acl_default; + } + +getout: +nfs34_abort_get_acl (&inode->i_acl); +nfs34_abort_get_acl (&inode->i_default_acl); +posix_acl_release (res.acl_access); +posix_acl_release (res.acl_default); +return ERR_PTR (status); +} + +static int _nfs4_set_posixacl (struct inode *inode,struct posix_acl *acl, +struct posix_acl *dfacl) +{ +struct nfs_server *server =NFS_SERVER (inode); +struct page *pages[NFS4_ACL_MAXPAGES ]; +struct nfs42_setposixaclargs args = { + .server =NFS_SERVER (inode), + .fh =NFS_FH (inode), + .inode = inode, + .mask =NFS_ACL , + .acl_access = acl, + }; +struct nfs42_setposixaclres res = { + .server = server, + }; +struct rpc_message msg = { + .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SETPOSIXACL ], + .rpc_argp = &args, + .rpc_resp = &res, + }; +struct nfs4_exception exception = { + .interruptible = true, + }; +struct nfs_xdr_putpage_desc desc = { + .pages = pages, + .max_npages =NFS4_ACL_MAXPAGES , + }; +size_t argslen; +int idmax, status =0 ; + +if (acl ==NULL && (!S_ISDIR (inode->i_mode) || dfacl ==NULL )) + goto out; + + status = -EOPNOTSUPP ; +/* +* Check that NFS4ACL_POSIXDEFAULT and NFS4ACL_POSIXACCESS +* attributes are supported by the server. +* We get acl_trueform and return EOPNOTSUPP if the acl_trueform +* is not POSIX_DRAFT_ACL. This allows the case where the +* acl_trueform's scope is file object to work when the acl_trueform +* is not POSIX_DRAFT_ACL. +*/ +if (!nfs4_server_supports_acls (server,NFS4ACL_POSIXDEFAULT ) || + !nfs4_server_supports_acls (server,NFS4ACL_POSIXACCESS )) + goto out; + + idmax = (XDR_QUADLEN (IDMAP_NAMESZ ) <<2 ); + argslen =0 ; + status = -ENOSPC ; +if (acl !=NULL ) { +if (acl->a_count >NFS_ACL_MAX_ENTRIES ) + goto out; + argslen += ((1 + (3 * acl->a_count)) <<2 ); +if (acl->a_count >4 ) + argslen += (acl->a_count -4 ) * idmax; + } +if (dfacl !=NULL && dfacl->a_count >NFS_ACL_MAX_ENTRIES ) + goto out; +if (S_ISDIR (inode->i_mode)) { + args.mask |=NFS_DFACL ; + args.acl_default = dfacl; +if (dfacl !=NULL ) { + argslen += ((1 + (3 * dfacl->a_count)) <<2 ); +if (dfacl->a_count >4 ) + argslen += (dfacl->a_count -4 ) * idmax; + }else { + argslen +=4 ; + } + } + +do { +/* +* We do not know how many pages will be needed for a large ACL, +* so additional pages are allocated, as required. +*/ +if (argslen >NFS4_ACL_INLINE_BUFSIZE ) { +ssize_t ret, size; + + status = -ENOMEM ; + size =0 ; +if (args.mask &NFS_DFACL ) + size =nfs42_encode_posixacl (server, &desc, + dfacl); +if (size <0 ) + goto out_freepages; +if ((args.mask &NFS_ACL ) && size >=0 ) { + ret =nfs42_encode_posixacl (server, &desc, acl); +if (ret <0 ) + goto out_freepages; + size += ret; + } + args.len = size; + args.pages = desc.pages; + } + + status =nfs4_call_sync (server->client, server, &msg, + &args.seq_args, &res.seq_res,0 ); + status =nfs4_handle_exception (server, status, &exception); +if (exception.retry) { +/* Reset to beginning of page array. */ + desc.page_pos =0 ; + desc.p =NULL ; + desc.endp =NULL ; + } + }while (exception.retry); +nfs_access_zap_cache (inode); +nfs_zap_acl_cache (inode); + +switch (status) { +case 0 : +break ; +case -EPFNOSUPPORT : +case -EPROTONOSUPPORT : +dprintk ("NFS_V4_ACL SETACL RPC not supported" +"(will not retry)\n" ); + server->caps &= ~NFS_CAP_ACLS ; + fallthrough; +case -ENOTSUPP : + status = -EOPNOTSUPP ; + } +out_freepages: +if (desc.npages >0 ) +nfs_xdr_putpage_cleanup (&desc); +out: +return status; +} + +int nfs4_set_posixacl (struct mnt_idmap *idmap,struct dentry *dentry, +struct posix_acl *acl,int type) +{ +struct posix_acl *orig = acl, *dfacl =NULL , *alloc; +struct inode *inode =d_inode (dentry); +int status; + +if (S_ISDIR (inode->i_mode)) { +switch (type) { +case ACL_TYPE_ACCESS : + alloc =get_inode_acl (inode,ACL_TYPE_DEFAULT ); +if (IS_ERR (alloc)) + goto fail; + dfacl = alloc; +break ; +case ACL_TYPE_DEFAULT : + alloc =get_inode_acl (inode,ACL_TYPE_ACCESS ); +if (IS_ERR (alloc)) + goto fail; + dfacl = acl; + acl = alloc; + } + } + +if (acl ==NULL ) { + alloc =posix_acl_from_mode (inode->i_mode,GFP_KERNEL ); +if (IS_ERR (alloc)) + goto fail; + acl = alloc; + } + status =_nfs4_set_posixacl (inode, acl, dfacl); +out: +if (acl != orig) +posix_acl_release (acl); +if (dfacl != orig) +posix_acl_release (dfacl); +return status; + +fail: + status =PTR_ERR (alloc); + goto out; +} +int nfs42_proc_removexattr (struct inode *inode,const char *name) {struct nfs4_exception exception = { };
fs/nfs/nfs42xdr.c +642 -0
654 lines not on this page · raw message
fs/nfs/nfs4_fs.h +7 -0
@@ -660,6 +660,13 @@ extern void nfs4_xattr_cache_set_list(struct inode *inode, const char *buf,extern ssize_t nfs4_xattr_cache_list (struct inode *inode,char *buf,ssize_t buflen);extern void nfs4_xattr_cache_zap (struct inode *inode); +extern struct posix_acl *nfs4_get_posixacl (struct inode *inode,int type, +bool rcu); +extern int nfs4_set_posixacl (struct mnt_idmap *idmap,struct dentry *dentry, +struct posix_acl *acl,int type); +extern ssize_t nfs42_encode_posixacl (const struct nfs_server *server, +struct nfs_xdr_putpage_desc *desc,struct posix_acl *acl); +extern void nfs_xdr_putpage_cleanup (struct nfs_xdr_putpage_desc *desc);#else static inline void nfs4_xattr_cache_zap (struct inode *inode) {
fs/nfs/nfs4proc.c +10 -2
@@ -3955,7 +3955,7 @@ static void nfs4_close_context(struct nfs_open_context *ctx, int is_sync)#define FATTR4_WORD1_NFS40_MASK (2*FATTR4_WORD1_MOUNTED_ON_FILEID - 1UL)#define FATTR4_WORD2_NFS41_MASK (2*FATTR4_WORD2_SUPPATTR_EXCLCREAT - 1UL) -#define FATTR4_WORD2_NFS42_MASK (2*FATTR4_WORD2_OPEN_ARGUMENTS - 1UL) +#define FATTR4_WORD2_NFS42_MASK (2*FATTR4_WORD2_POSIX_ACCESS_ACL - 1UL)#define FATTR4_WORD2_NFS42_TIME_DELEG_MASK \ (FATTR4_WORD2_TIME_DELEG_MODIFY|FATTR4_WORD2_TIME_DELEG_ACCESS)
@@ -4024,7 +4024,10 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fcase 2 : res.attr_bitmask[2 ] &=FATTR4_WORD2_NFS42_MASK ; bitmask[2 ] = (FATTR4_WORD2_SUPPATTR_EXCLCREAT | -FATTR4_WORD2_OPEN_ARGUMENTS ) & +FATTR4_WORD2_OPEN_ARGUMENTS | +FATTR4_WORD2_ACL_TRUEFORM | +FATTR4_WORD2_POSIX_DEFAULT_ACL | +FATTR4_WORD2_POSIX_ACCESS_ACL ) & res.attr_bitmask[2 ]; }memcpy (server->attr_bitmask, res.attr_bitmask,sizeof (server->attr_bitmask));
@@ -6141,6 +6144,7 @@ static void nfs4_set_cached_acl(struct inode *inode, struct nfs4_cached_acl *aclstatic void nfs4_zap_acl_attr (struct inode *inode) {nfs4_set_cached_acl (inode,NULL ); +forget_all_cached_acls (inode); } static ssize_t nfs4_read_cached_acl(struct inode *inode, char *buf,
@@ -11045,6 +11049,8 @@ static const struct inode_operations nfs4_dir_inode_operations = { .getattr = nfs_getattr, .setattr = nfs_setattr, .listxattr = nfs4_listxattr, + .get_inode_acl = nfs4_get_posixacl, + .set_acl = nfs4_set_posixacl, };static const struct inode_operations nfs4_file_inode_operations = {
@@ -11052,6 +11058,8 @@ static const struct inode_operations nfs4_file_inode_operations = { .getattr = nfs_getattr, .setattr = nfs_setattr, .listxattr = nfs4_listxattr, + .get_inode_acl = nfs4_get_posixacl, + .set_acl = nfs4_set_posixacl, }; static struct nfs_server *nfs4_clone_server(struct nfs_server *source,
fs/nfs/nfs4xdr.c +2 -0
@@ -7842,6 +7842,8 @@ const struct rpc_procinfo nfs4_procedures[] = {PROC42 (REMOVEXATTR , enc_removexattr, dec_removexattr),PROC42 (READ_PLUS , enc_read_plus, dec_read_plus),PROC42 (ZERO_RANGE , enc_zero_range, dec_zero_range), +PROC42 (GETPOSIXACL , enc_getposixacl, dec_getposixacl), + PROC42(SETPOSIXACL, enc_setposixacl, dec_setposixacl), };static unsigned int nfs_version4_counts[ARRAY_SIZE (nfs4_procedures)];
Signature · 1 line
2.49.0