mm/shmem: add support for FS_IOC_[SG]ETFLAGS for tmpfs
Subsystems (2)
PATCH 1/1 mm/shmem: add support for FS_IOC_[SG]ETFLAGS for tmpfs
This allows userspace to set flags like FS_APPEND_FL, FS_IMMUTABLE_FL, FS_NODUMP_FL, etc., like all other standard Linux file systems.
--- include/linux/shmem_fs.h | 11 +++++++ mm/shmem.c | 65 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 1 deletion(-)
include/linux/shmem_fs.h +11 -0
@@ -25,9 +25,20 @@ struct shmem_inode_info {struct simple_xattrs xattrs;/* list of xattrs */ atomic_t stop_eviction;/* hold when working on inode */ struct timespec64 i_crtime;/* file creation time */ +unsigned int fsflags;/* flags for FS_IOC_[SG]ETFLAGS */ struct inode vfs_inode; }; +#define SHMEM_FL_USER_VISIBLE FS_FL_USER_VISIBLE +#define SHMEM_FL_USER_MODIFIABLE FS_FL_USER_MODIFIABLE +#define SHMEM_FL_INHERITED FS_FL_USER_MODIFIABLE + +/* Flags that are appropriate for regular files (all but dir-specific ones). */ +#define SHMEM_REG_FLMASK (~(FS_DIRSYNC_FL | FS_TOPDIR_FL)) + +/* Flags that are appropriate for non-directories/regular files. */ +#define SHMEM_OTHER_FLMASK (FS_NODUMP_FL | FS_NOATIME_FL) +struct shmem_sb_info {unsigned long max_blocks;/* How many blocks are allowed */ struct percpu_counter used_blocks;/* How many are allocated */
mm/shmem.c +64 -1
107 lines not on this page · raw message
Signature · 1 line
2.31.0
Andrew Morton
maintainerQuoted 21 lines · On Wed, 13 Jul 2022 10:52:34 -0400 "Theodore Ts'o" <[email protected]> wrote:
This allows userspace to set flags like
FS_APPEND_FL,FS_IMMUTABLE_FL,FS_NODUMP_FL, etc., like all other standard Linux file systems....
mm/shmem.c +3
-0@@ -28,6 +28,7 @@#include <linux/ramfs.h> #include <linux/pagemap.h> #include <linux/file.h> +#include <linux/fileattr.h> #include <linux/mm.h> #include <linux/random.h> #include <linux/sched/signal.h> @@ -1058,6 +1059,15 @@ static int shmem_getattr(struct user_namespace *mnt_userns,shmem_recalc_inode (inode);spin_unlock_irq (&info->lock); } +if (info->fsflags &EXT2_APPEND_FL ) + stat->attributes |=STATX_ATTR_APPEND ;
mm/shmem.c static int shmem_getattr(struct user_namespace *mnt_userns, · line 1073
Quoted 10 lines
mm/shmem.c +7
-0+if (info->fsflags &EXT2_IMMUTABLE_FL ) + stat->attributes |=STATX_ATTR_IMMUTABLE ; +if (info->fsflags &EXT2_NODUMP_FL ) + stat->attributes |=STATX_ATTR_NODUMP ; + stat->attributes_mask |= (STATX_ATTR_APPEND | +STATX_ATTR_IMMUTABLE | +STATX_ATTR_NODUMP );generic_fillattr (&init_user_ns, inode, stat);if (shmem_is_huge (NULL , inode,0 ))
hm, how did you even test this?
mm/shmem.c: In function 'shmem_getattr':mm/shmem.c:1062:29: error: 'EXT2_APPEND_FL' undeclared (first use in this function); did you mean 'FS_APPEND_FL'?
1062 | if (info->fsflags & EXT2_APPEND_FL)
| ^~~~~~~~~~~~~~
| FS_APPEND_FLthis
mm/shmem.c renamed from mm/shmem.c~mm-shmem-add-support-for-fs_ioc_etflags-for-tmpfs-fix-2 +2 -0
@@ -40,6 +40,8 @@#include <linux/swapfile.h> #include "swap.h" +#include <../fs/ext2/ext2.h> +static struct vfsmount *shm_mnt;#ifdef CONFIG_SHMEM
seems quite wrong.
Quoted 2 lines · Andrew Morton
hm, how did you even test this?
Sorry, I dropped the -a from "git commit --amend -a".
A corrected version is coming up...
- Ted
PATCH 1/1 mm/shmem: support FS_IOC_[SG]ETFLAGS in tmpfs
This allows userspace to set flags like FS_APPEND_FL, FS_IMMUTABLE_FL, FS_NODUMP_FL, etc., like all other standard Linux file systems.
---
v2:
- replace use of EXT2_xxx_FL with FS_xxx_FL
- fix preservation of non-modifiable flags in shmem_fileattr_set()
- update the commit summary description
include/linux/shmem_fs.h | 11 +++++++ mm/shmem.c | 63 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 1 deletion(-)
include/linux/shmem_fs.h +11 -0
@@ -25,9 +25,20 @@ struct shmem_inode_info {struct simple_xattrs xattrs;/* list of xattrs */ atomic_t stop_eviction;/* hold when working on inode */ struct timespec64 i_crtime;/* file creation time */ +unsigned int fsflags;/* flags for FS_IOC_[SG]ETFLAGS */ struct inode vfs_inode; }; +#define SHMEM_FL_USER_VISIBLE FS_FL_USER_VISIBLE +#define SHMEM_FL_USER_MODIFIABLE FS_FL_USER_MODIFIABLE +#define SHMEM_FL_INHERITED FS_FL_USER_MODIFIABLE + +/* Flags that are appropriate for regular files (all but dir-specific ones). */ +#define SHMEM_REG_FLMASK (~(FS_DIRSYNC_FL | FS_TOPDIR_FL)) + +/* Flags that are appropriate for non-directories/regular files. */ +#define SHMEM_OTHER_FLMASK (FS_NODUMP_FL | FS_NOATIME_FL) +struct shmem_sb_info {unsigned long max_blocks;/* How many blocks are allowed */ struct percpu_counter used_blocks;/* How many are allocated */
mm/shmem.c +62 -1
105 lines not on this page · raw message
Signature · 1 line
2.31.0
PATCH 1/1 mm/shmem: support FS_IOC_[SG]ETFLAGS in tmpfs
This allows userspace to set flags like FS_APPEND_FL, FS_IMMUTABLE_FL, FS_NODUMP_FL, etc., like all other standard Linux file systems.
---
v3:
- declare shmem_fileattr_get() and shmem_fileattr_set() as static functions
v2:
- replace use of EXT2_xxx_FL with FS_xxx_FL
- fix preservation of non-modifiable flags in shmem_fileattr_set()
- update the commit summary description
include/linux/shmem_fs.h | 11 +++++++ mm/shmem.c | 63 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 1 deletion(-)
include/linux/shmem_fs.h +11 -0
@@ -25,9 +25,20 @@ struct shmem_inode_info {struct simple_xattrs xattrs;/* list of xattrs */ atomic_t stop_eviction;/* hold when working on inode */ struct timespec64 i_crtime;/* file creation time */ +unsigned int fsflags;/* flags for FS_IOC_[SG]ETFLAGS */ struct inode vfs_inode; }; +#define SHMEM_FL_USER_VISIBLE FS_FL_USER_VISIBLE +#define SHMEM_FL_USER_MODIFIABLE FS_FL_USER_MODIFIABLE +#define SHMEM_FL_INHERITED FS_FL_USER_MODIFIABLE + +/* Flags that are appropriate for regular files (all but dir-specific ones). */ +#define SHMEM_REG_FLMASK (~(FS_DIRSYNC_FL | FS_TOPDIR_FL)) + +/* Flags that are appropriate for non-directories/regular files. */ +#define SHMEM_OTHER_FLMASK (FS_NODUMP_FL | FS_NOATIME_FL) +struct shmem_sb_info {unsigned long max_blocks;/* How many blocks are allowed */ struct percpu_counter used_blocks;/* How many are allocated */
mm/shmem.c +62 -1
105 lines not on this page · raw message
Signature · 1 line
2.31.0
Re: [PATCH -v3] mm/shmem: support FS_IOC_[SG]ETFLAGS in tmpfs
Quoted 4 lines · Theodore Ts'o
This allows userspace to set flags like
FS_APPEND_FL,FS_IMMUTABLE_FL,FS_NODUMP_FL, etc., like all other standard Linux file systems.Signed-off-by Theodore Ts'o <[email protected]>
Hi Andrew,
I notice that in your most recent mm-unstable tree, you still have the v1 version of the patch plus your fixup:
* c523739526b3 - mm/shmem: support FS_IOC_[SG]ETFLAGS in tmpfs (6 hours ago)
* 2d6c68e33857 - mm-shmem-support-fs_ioc_etflags-in-tmpfs-fix (6 hours ago)
Could you please replace these two patches with the v3 version of the patch at:
https://lore.kernel.org/all/[email protected]/
There haven't been any other comments in the past week, so I'm hopeful this will be the final version of this proposed change.
Many thanks!
- Ted
Andrew Morton
maintainerRe: [PATCH -v3] mm/shmem: support FS_IOC_[SG]ETFLAGS in tmpfs
Quoted 6 lines · On Wed, 20 Jul 2022 07:10:04 -0400 "Theodore Ts'o" <[email protected]> wrote:
Quoted 4 lines · Theodore Ts'o
This allows userspace to set flags like
FS_APPEND_FL,FS_IMMUTABLE_FL,FS_NODUMP_FL, etc., like all other standard Linux file systems.Signed-off-by Theodore Ts'o <[email protected]>
Quoted 7 lines
Hi Andrew,
I notice that in your most recent mm-unstable tree, you still have the v1 version of the patch plus your fixup:
*
c523739526b3- mm/shmem: support FS_IOC_[SG]ETFLAGS in tmpfs (6 hours ago)
*2d6c68e33857- mm-shmem-support-fs_ioc_etflags-in-tmpfs-fix (6 hours ago)
What's there is actually v2, and the fixup which updates that to v3. I'll squash the fixup into the base patch before moving the patch into mm-nonmm-stable (and then mainline) so it all comes good.
Quoted 2 lines
There haven't been any other comments in the past week, so I'm hopeful this will be the final version of this proposed change.
Yup.
Hugh Dickins
maintainerRe: [PATCH -v3] mm/shmem: support FS_IOC_[SG]ETFLAGS in tmpfs
In reply to Theodore Ts'oQuoted 4 lines · Theodore Ts'o
This allows userspace to set flags like
FS_APPEND_FL,FS_IMMUTABLE_FL,FS_NODUMP_FL, etc., like all other standard Linux file systems.Signed-off-by Theodore Ts'o <[email protected]>
Many thanks for adding the chattr support to tmpfs: I'd rather wanted to do that for a long time, but it's much better coming from you who actually have a use for it.
But I do have some adjustments to make, coming up now...
Hugh
kernel test robot
build botI love your patch! Yet something to improve:
Hi Theodore,
I love your patch! Yet something to improve:
[auto build test ERROR on akpm-mm/mm-everything]
url: https://github.com/intel-lab-lkp/linux/commits/Theodore-Ts-o/mm-shmem-add-support-for-FS_IOC_-SG-ETFLAGS-for-tmpfs/20220713-225257 base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything config: hexagon-randconfig-r024-20220714 (https://download.01.org/0day-ci/archive/20220715/[email protected]/config) compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project 5e61b9c556267086ef9b743a0b57df302eef831b)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/2a3164ac6dafb6c7a3cd8a1002e89370eec359c1
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Theodore-Ts-o/mm-shmem-add-support-for-FS_IOC_-SG-ETFLAGS-for-tmpfs/20220713-225257 git checkout 2a3164ac6dafb6c7a3cd8a1002e89370eec359c1
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon SHELL=/bin/bash
If you fix the issue, kindly add following tag where applicable
All error/warnings (new ones prefixed by >>):
>> mm/shmem.c:1062:22: error: use of undeclared identifier 'EXT2_APPEND_FL'
if (info->fsflags & EXT2_APPEND_FL)
^
>> mm/shmem.c:1064:22: error: use of undeclared identifier 'EXT2_IMMUTABLE_FL'
if (info->fsflags & EXT2_IMMUTABLE_FL)
^
>> mm/shmem.c:1066:22: error: use of undeclared identifier 'EXT2_NODUMP_FL'
if (info->fsflags & EXT2_NODUMP_FL)
^
>> mm/shmem.c:2840:5: warning: no previous prototype for function 'shmem_fileattr_get' [-Wmissing-prototypes]
int shmem_fileattr_get(struct dentry *dentry, struct fileattr *fa)
^
mm/shmem.c:2840:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
int shmem_fileattr_get(struct dentry *dentry, struct fileattr *fa)
^
static
>> mm/shmem.c:2851:5: warning: no previous prototype for function 'shmem_fileattr_set' [-Wmissing-prototypes]
int shmem_fileattr_set(struct user_namespace *mnt_userns,
^ mm/shmem.c:2851:1: note: declare 'static' if the function is not intended to be used outside of this translation unit int shmem_fileattr_set(struct user_namespace *mnt_userns,
^
static
2 warnings and 3 errors generated.
vim +/EXT2_APPEND_FL +1062 mm/shmem.c
1049
1050 static int shmem_getattr(struct user_namespace *mnt_userns,
1051 const struct path *path, struct kstat *stat,
1052 u32 request_mask, unsigned int query_flags)
1053 {
1054 struct inode *inode = path->dentry->d_inode;
1055 struct shmem_inode_info *info = SHMEM_I(inode);
1056
1057 if (info->alloced - info->swapped != inode->i_mapping->nrpages) {
1058 spin_lock_irq(&info->lock);
1059 shmem_recalc_inode(inode);
1060 spin_unlock_irq(&info->lock);
1061 }
> 1062 if (info->fsflags & EXT2_APPEND_FL) 1063 stat->attributes |= STATX_ATTR_APPEND; > 1064 if (info->fsflags & EXT2_IMMUTABLE_FL) 1065 stat->attributes |= STATX_ATTR_IMMUTABLE; > 1066 if (info->fsflags & EXT2_NODUMP_FL)
1067 stat->attributes |= STATX_ATTR_NODUMP;
1068 stat->attributes_mask |= (STATX_ATTR_APPEND |
1069 STATX_ATTR_IMMUTABLE |
1070 STATX_ATTR_NODUMP);
1071 generic_fillattr(&init_user_ns, inode, stat);
1072
1073 if (shmem_is_huge(NULL, inode, 0))
1074 stat->blksize = HPAGE_PMD_SIZE;
1075
1076 if (request_mask & STATX_BTIME) {
1077 stat->result_mask |= STATX_BTIME;
1078 stat->btime.tv_sec = info->i_crtime.tv_sec;
1079 stat->btime.tv_nsec = info->i_crtime.tv_nsec;
1080 }
1081
1082 return 0;
1083 }
1084
Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
Quoted 10 lines · kernel test robot
Quoted 2 lines
Quoted 2 lines
mm/shmem.c:1062:22: error: use of undeclared identifier 'EXT2_APPEND_FL'if (info->fsflags & EXT2_APPEND_FL) ^Quoted 1 line
Quoted 1 line
mm/shmem.c:1064:22: error: use of undeclared identifier 'EXT2_IMMUTABLE_FL'if (info->fsflags & EXT2_IMMUTABLE_FL) ^Quoted 1 line
Quoted 1 line
mm/shmem.c:1066:22: error: use of undeclared identifier 'EXT2_NODUMP_FL'if (info->fsflags & EXT2_NODUMP_FL) ^
I suppose this just needs to use FS_APPEND_FL/FS_IMMUTABLE_FL/FS_NODUMP_FL instead of the ext2 alias names?
Arnd
Quoted 6 lines · Arnd Bergmann
Quoted 5 lines · kernel test robot
Quoted 2 lines
Quoted 2 lines
mm/shmem.c:1062:22: error: use of undeclared identifier 'EXT2_APPEND_FL'if (info->fsflags & EXT2_APPEND_FL) ^Quoted 1 line
Quoted 1 line
mm/shmem.c:1064:22: error: use of undeclared identifier 'EXT2_IMMUTABLE_FL'
Quoted 8 lines
Quoted 5 lines
if (info->fsflags & EXT2_IMMUTABLE_FL) ^Quoted 1 line
Quoted 1 line
mm/shmem.c:1066:22: error: use of undeclared identifier 'EXT2_NODUMP_FL'if (info->fsflags & EXT2_NODUMP_FL) ^I suppose this just needs to use FS_APPEND_FL/FS_IMMUTABLE_FL/FS_NODUMP_FL instead of the ext2 alias names?
The zero day bot was testing the v1 version of the patch. This was fixed in the -v2 and -v3 versions.
- Ted
kernel test robot
build botI love your patch! Yet something to improve:
Hi Theodore,
I love your patch! Yet something to improve:
[auto build test ERROR on akpm-mm/mm-everything]
url: https://github.com/intel-lab-lkp/linux/commits/Theodore-Ts-o/mm-shmem-add-support-for-FS_IOC_-SG-ETFLAGS-for-tmpfs/20220713-225257 base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything config: um-i386_defconfig (https://download.01.org/0day-ci/archive/20220715/[email protected]/config) compiler: gcc-11 (Debian 11.3.0-3) 11.3.0 reproduce (this is a W=1 build): # https://github.com/intel-lab-lkp/linux/commit/2a3164ac6dafb6c7a3cd8a1002e89370eec359c1 git remote add linux-review https://github.com/intel-lab-lkp/linux git fetch --no-tags linux-review Theodore-Ts-o/mm-shmem-add-support-for-FS_IOC_-SG-ETFLAGS-for-tmpfs/20220713-225257 git checkout 2a3164ac6dafb6c7a3cd8a1002e89370eec359c1 # save the config file mkdir build_dir && cp config build_dir/.config make W=1 O=build_dir ARCH=um SUBARCH=i386 SHELL=/bin/bash
If you fix the issue, kindly add following tag where applicable
All error/warnings (new ones prefixed by >>):
mm/shmem.c: In function 'shmem_getattr':
>> mm/shmem.c:1062:29: error: 'EXT2_APPEND_FL' undeclared (first use in this function); did you mean 'FS_APPEND_FL'?
1062 | if (info->fsflags & EXT2_APPEND_FL)
| ^~~~~~~~~~~~~~
| FS_APPEND_FL
mm/shmem.c:1062:29: note: each undeclared identifier is reported only once for each function it appears in
>> mm/shmem.c:1064:29: error: 'EXT2_IMMUTABLE_FL' undeclared (first use in this function); did you mean 'FS_IMMUTABLE_FL'?
1064 | if (info->fsflags & EXT2_IMMUTABLE_FL)
| ^~~~~~~~~~~~~~~~~
| FS_IMMUTABLE_FL
>> mm/shmem.c:1066:29: error: 'EXT2_NODUMP_FL' undeclared (first use in this function); did you mean 'FS_NODUMP_FL'?
1066 | if (info->fsflags & EXT2_NODUMP_FL)
| ^~~~~~~~~~~~~~
| FS_NODUMP_FL
mm/shmem.c: At top level:
>> mm/shmem.c:2840:5: warning: no previous prototype for 'shmem_fileattr_get' [-Wmissing-prototypes]
2840 | int shmem_fileattr_get(struct dentry *dentry, struct fileattr *fa)
| ^~~~~~~~~~~~~~~~~~
>> mm/shmem.c:2851:5: warning: no previous prototype for 'shmem_fileattr_set' [-Wmissing-prototypes] 2851 | int shmem_fileattr_set(struct user_namespace *mnt_userns,
| ^~~~~~~~~~~~~~~~~~
vim +1062 mm/shmem.c
1049
1050 static int shmem_getattr(struct user_namespace *mnt_userns,
1051 const struct path *path, struct kstat *stat,
1052 u32 request_mask, unsigned int query_flags)
1053 {
1054 struct inode *inode = path->dentry->d_inode;
1055 struct shmem_inode_info *info = SHMEM_I(inode);
1056
1057 if (info->alloced - info->swapped != inode->i_mapping->nrpages) {
1058 spin_lock_irq(&info->lock);
1059 shmem_recalc_inode(inode);
1060 spin_unlock_irq(&info->lock);
1061 }
> 1062 if (info->fsflags & EXT2_APPEND_FL) 1063 stat->attributes |= STATX_ATTR_APPEND; > 1064 if (info->fsflags & EXT2_IMMUTABLE_FL) 1065 stat->attributes |= STATX_ATTR_IMMUTABLE; > 1066 if (info->fsflags & EXT2_NODUMP_FL)
1067 stat->attributes |= STATX_ATTR_NODUMP;
1068 stat->attributes_mask |= (STATX_ATTR_APPEND |
1069 STATX_ATTR_IMMUTABLE |
1070 STATX_ATTR_NODUMP);
1071 generic_fillattr(&init_user_ns, inode, stat);
1072
1073 if (shmem_is_huge(NULL, inode, 0))
1074 stat->blksize = HPAGE_PMD_SIZE;
1075
1076 if (request_mask & STATX_BTIME) {
1077 stat->result_mask |= STATX_BTIME;
1078 stat->btime.tv_sec = info->i_crtime.tv_sec;
1079 stat->btime.tv_nsec = info->i_crtime.tv_nsec;
1080 }
1081
1082 return 0;
1083 }
1084
Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp