vfs: allow stacked ->get_acl() in RCU lookup
Subsystems (17)
PATCH 1/1 vfs: allow stacked ->get_acl() in RCU lookup
Overlayfs does not cache ACL's to avoid double caching with all its problems. Instead it just calls the underlying filesystem's i_op->get_acl(), which will return the cached value, if possible.
In rcu path walk, however, get_cached_acl_rcu() is employed to get the value from the cache, which will fail on overlayfs resulting in dropping out of rcu walk mode. This can result in a big performance hit in certain situations.
Add a flags argument to the ->get_acl() callback, and allow get_cached_acl_rcu() to call the ->get_acl() method with LOOKUP_RCU.
Don't do this for the generic case of a cache miss, only in case of ACL_DONT_CACHE.
--- fs/9p/acl.c | 2 +- fs/9p/acl.h | 2 +- fs/bad_inode.c | 2 +- fs/btrfs/acl.c | 2 +- fs/btrfs/ctree.h | 2 +- fs/ceph/acl.c | 2 +- fs/ceph/super.h | 2 +- fs/erofs/xattr.c | 2 +- fs/erofs/xattr.h | 2 +- fs/ext2/acl.c | 2 +- fs/ext2/acl.h | 2 +- fs/ext4/acl.c | 2 +- fs/ext4/acl.h | 2 +- fs/f2fs/acl.c | 2 +- fs/f2fs/acl.h | 2 +- fs/fuse/acl.c | 2 +- fs/fuse/fuse_i.h | 2 +- fs/gfs2/acl.c | 2 +- fs/gfs2/acl.h | 2 +- fs/jffs2/acl.c | 2 +- fs/jffs2/acl.h | 2 +- fs/jfs/acl.c | 2 +- fs/jfs/jfs_acl.h | 2 +- fs/nfs/nfs3_fs.h | 2 +- fs/nfs/nfs3acl.c | 2 +- fs/ocfs2/acl.c | 2 +- fs/ocfs2/acl.h | 2 +- fs/orangefs/acl.c | 2 +- fs/orangefs/orangefs-kernel.h | 2 +- fs/overlayfs/inode.c | 6 +++++- fs/overlayfs/overlayfs.h | 2 +- fs/posix_acl.c | 10 ++++++++-- fs/reiserfs/acl.h | 2 +- fs/reiserfs/xattr_acl.c | 2 +- fs/xfs/xfs_acl.c | 2 +- fs/xfs/xfs_acl.h | 4 ++-- include/linux/fs.h | 2 +- 37 files changed, 49 insertions(+), 39 deletions(-)
fs/9p/acl.c +1 -1
@@ -97,7 +97,7 @@ static struct posix_acl *v9fs_get_cached_acl(struct inode *inode, int type)return acl; } -struct posix_acl *v9fs_iop_get_acl (struct inode *inode,int type) +struct posix_acl *v9fs_iop_get_acl (struct inode *inode,int type,int flags) {struct v9fs_session_info *v9ses;
fs/9p/acl.h +1 -1
@@ -16,7 +16,7 @@#ifdef CONFIG_9P_FS_POSIX_ACL extern int v9fs_get_acl (struct inode *,struct p9_fid *); -extern struct posix_acl *v9fs_iop_get_acl (struct inode *inode,int type); +extern struct posix_acl *v9fs_iop_get_acl (struct inode *inode,int type,int flags);extern int v9fs_acl_chmod (struct inode *,struct p9_fid *);extern int v9fs_set_create_acl (struct inode *,struct p9_fid *,struct posix_acl *,struct posix_acl *);
fs/bad_inode.c +1 -1
@@ -121,7 +121,7 @@ static const char *bad_inode_get_link(struct dentry *dentry,return ERR_PTR (-EIO ); } -static struct posix_acl *bad_inode_get_acl (struct inode *inode,int type) +static struct posix_acl *bad_inode_get_acl (struct inode *inode,int type,int flags) {return ERR_PTR (-EIO ); }
fs/btrfs/acl.c +1 -1
@@ -16,7 +16,7 @@#include "btrfs_inode.h" #include "xattr.h" -struct posix_acl *btrfs_get_acl (struct inode *inode,int type) +struct posix_acl *btrfs_get_acl (struct inode *inode,int type,int flags) {int size;const char *name;
fs/btrfs/ctree.h +1 -1
@@ -3639,7 +3639,7 @@ static inline int __btrfs_fs_compat_ro(struct btrfs_fs_info *fs_info, u64 flag)/* acl.c */ #ifdef CONFIG_BTRFS_FS_POSIX_ACL -struct posix_acl *btrfs_get_acl (struct inode *inode,int type); +struct posix_acl *btrfs_get_acl (struct inode *inode,int type,int flags);int btrfs_set_acl (struct user_namespace *mnt_userns,struct inode *inode,struct posix_acl *acl,int type); int btrfs_init_acl(struct btrfs_trans_handle *trans,
fs/ceph/acl.c +1 -1
@@ -29,7 +29,7 @@ static inline void ceph_set_cached_acl(struct inode *inode,spin_unlock (&ci->i_ceph_lock); } -struct posix_acl *ceph_get_acl (struct inode *inode,int type) +struct posix_acl *ceph_get_acl (struct inode *inode,int type,int flags) {int size;unsigned int retry_cnt =0 ;
fs/ceph/super.h +1 -1
@@ -1066,7 +1066,7 @@ void ceph_release_acl_sec_ctx(struct ceph_acl_sec_ctx *as_ctx);/* acl.c */ #ifdef CONFIG_CEPH_FS_POSIX_ACL -struct posix_acl *ceph_get_acl (struct inode *,int ); +struct posix_acl *ceph_get_acl (struct inode *,int ,int );int ceph_set_acl (struct user_namespace *mnt_userns,struct inode *inode,struct posix_acl *acl,int type); int ceph_pre_init_acls(struct inode *dir, umode_t *mode,
fs/erofs/xattr.c +1 -1
@@ -674,7 +674,7 @@ ssize_t erofs_listxattr(struct dentry *dentry, }#ifdef CONFIG_EROFS_FS_POSIX_ACL -struct posix_acl *erofs_get_acl (struct inode *inode,int type) +struct posix_acl *erofs_get_acl (struct inode *inode,int type,int flags) {struct posix_acl *acl;int prefix, rc;
fs/erofs/xattr.h +1 -1
@@ -81,7 +81,7 @@ static inline int erofs_getxattr(struct inode *inode, int index,#endif /* !CONFIG_EROFS_FS_XATTR */ #ifdef CONFIG_EROFS_FS_POSIX_ACL -struct posix_acl *erofs_get_acl (struct inode *inode,int type); +struct posix_acl *erofs_get_acl (struct inode *inode,int type,int flags);#else #define erofs_get_acl (NULL)#endif
fs/ext2/acl.c +1 -1
@@ -141,7 +141,7 @@ ext2_acl_to_disk(const struct posix_acl *acl, size_t *size)* inode->i_mutex: don't care */ struct posix_acl * -ext2_get_acl (struct inode *inode,int type) +ext2_get_acl (struct inode *inode,int type,int flags) {int name_index;char *value =NULL ;
fs/ext2/acl.h +1 -1
@@ -55,7 +55,7 @@ static inline int ext2_acl_count(size_t size)#ifdef CONFIG_EXT2_FS_POSIX_ACL /* acl.c */ -extern struct posix_acl *ext2_get_acl (struct inode *inode,int type); +extern struct posix_acl *ext2_get_acl (struct inode *inode,int type,int flags);extern int ext2_set_acl (struct user_namespace *mnt_userns,struct inode *inode,struct posix_acl *acl,int type);extern int ext2_init_acl (struct inode *,struct inode *);
fs/ext4/acl.c +1 -1
@@ -142,7 +142,7 @@ ext4_acl_to_disk(const struct posix_acl *acl, size_t *size)* inode->i_mutex: don't care */ struct posix_acl * -ext4_get_acl (struct inode *inode,int type) +ext4_get_acl (struct inode *inode,int type,int flags) {int name_index;char *value =NULL ;
fs/ext4/acl.h +1 -1
@@ -55,7 +55,7 @@ static inline int ext4_acl_count(size_t size)#ifdef CONFIG_EXT4_FS_POSIX_ACL /* acl.c */ -struct posix_acl *ext4_get_acl (struct inode *inode,int type); +struct posix_acl *ext4_get_acl (struct inode *inode,int type,int flags);int ext4_set_acl (struct user_namespace *mnt_userns,struct inode *inode,struct posix_acl *acl,int type);extern int ext4_init_acl (handle_t *,struct inode *,struct inode *);
fs/f2fs/acl.c +1 -1
@@ -195,7 +195,7 @@ static struct posix_acl *__f2fs_get_acl(struct inode *inode, int type,return acl; } -struct posix_acl *f2fs_get_acl (struct inode *inode,int type) +struct posix_acl *f2fs_get_acl (struct inode *inode,int type,int flags) {return __f2fs_get_acl (inode, type,NULL ); }
fs/f2fs/acl.h +1 -1
@@ -33,7 +33,7 @@ struct f2fs_acl_header {#ifdef CONFIG_F2FS_FS_POSIX_ACL -extern struct posix_acl *f2fs_get_acl (struct inode *,int ); +extern struct posix_acl *f2fs_get_acl (struct inode *,int ,int );extern int f2fs_set_acl (struct user_namespace *,struct inode *,struct posix_acl *,int ); extern int f2fs_init_acl(struct inode *, struct inode *, struct page *,
fs/fuse/acl.c +1 -1
@@ -11,7 +11,7 @@#include <linux/posix_acl.h> #include <linux/posix_acl_xattr.h> -struct posix_acl *fuse_get_acl (struct inode *inode,int type) +struct posix_acl *fuse_get_acl (struct inode *inode,int type,int flags) {struct fuse_conn *fc =get_fuse_conn (inode);int size;
fs/fuse/fuse_i.h +1 -1
@@ -1180,7 +1180,7 @@ extern const struct xattr_handler *fuse_acl_xattr_handlers[];extern const struct xattr_handler *fuse_no_acl_xattr_handlers[];struct posix_acl ; -struct posix_acl *fuse_get_acl (struct inode *inode,int type); +struct posix_acl *fuse_get_acl (struct inode *inode,int type,int flags);int fuse_set_acl (struct user_namespace *mnt_userns,struct inode *inode,struct posix_acl *acl,int type);
fs/gfs2/acl.c +1 -1
@@ -57,7 +57,7 @@ static struct posix_acl *__gfs2_get_acl(struct inode *inode, int type)return acl; } -struct posix_acl *gfs2_get_acl (struct inode *inode,int type) +struct posix_acl *gfs2_get_acl (struct inode *inode,int type,int flags) {struct gfs2_inode *ip =GFS2_I (inode);struct gfs2_holder gh;
fs/gfs2/acl.h +1 -1
@@ -11,7 +11,7 @@#define GFS2_ACL_MAX_ENTRIES (sdp) ((300 << (sdp)->sd_sb.sb_bsize_shift) >> 12) -extern struct posix_acl *gfs2_get_acl (struct inode *inode,int type); +extern struct posix_acl *gfs2_get_acl (struct inode *inode,int type,int flags);extern int __gfs2_set_acl (struct inode *inode,struct posix_acl *acl,int type);extern int gfs2_set_acl (struct user_namespace *mnt_userns,struct inode *inode,struct posix_acl *acl,int type);
fs/jffs2/acl.c +1 -1
@@ -173,7 +173,7 @@ static void *jffs2_acl_to_medium(const struct posix_acl *acl, size_t *size)return ERR_PTR (-EINVAL ); } -struct posix_acl *jffs2_get_acl (struct inode *inode,int type) +struct posix_acl *jffs2_get_acl (struct inode *inode,int type,int flags) {struct posix_acl *acl;char *value =NULL ;
fs/jffs2/acl.h +1 -1
@@ -27,7 +27,7 @@ struct jffs2_acl_header {#ifdef CONFIG_JFFS2_FS_POSIX_ACL -struct posix_acl *jffs2_get_acl (struct inode *inode,int type); +struct posix_acl *jffs2_get_acl (struct inode *inode,int type,int flags);int jffs2_set_acl (struct user_namespace *mnt_userns,struct inode *inode,struct posix_acl *acl,int type);extern int jffs2_init_acl_pre (struct inode *,struct inode *,umode_t *);
fs/jfs/acl.c +1 -1
@@ -14,7 +14,7 @@#include "jfs_xattr.h" #include "jfs_acl.h" -struct posix_acl *jfs_get_acl (struct inode *inode,int type) +struct posix_acl *jfs_get_acl (struct inode *inode,int type,int flags) {struct posix_acl *acl;char *ea_name;
fs/jfs/jfs_acl.h +1 -1
@@ -7,7 +7,7 @@#ifdef CONFIG_JFS_POSIX_ACL -struct posix_acl *jfs_get_acl (struct inode *inode,int type); +struct posix_acl *jfs_get_acl (struct inode *inode,int type,int flags);int jfs_set_acl (struct user_namespace *mnt_userns,struct inode *inode,struct posix_acl *acl,int type);int jfs_init_acl (tid_t ,struct inode *,struct inode *);
fs/nfs/nfs3_fs.h +1 -1
@@ -11,7 +11,7 @@* nfs3acl.c */ #ifdef CONFIG_NFS_V3_ACL -extern struct posix_acl *nfs3_get_acl (struct inode *inode,int type); +extern struct posix_acl *nfs3_get_acl (struct inode *inode,int type,int flags);extern int nfs3_set_acl (struct user_namespace *mnt_userns,struct inode *inode,struct posix_acl *acl,int type); extern int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,
fs/nfs/nfs3acl.c +1 -1
@@ -44,7 +44,7 @@ static void nfs3_abort_get_acl(struct posix_acl **p)cmpxchg (p, sentinel,ACL_NOT_CACHED ); } -struct posix_acl *nfs3_get_acl (struct inode *inode,int type) +struct posix_acl *nfs3_get_acl (struct inode *inode,int type,int flags) {struct nfs_server *server =NFS_SERVER (inode);struct page *pages[NFSACL_MAXPAGES ] = { };
fs/ocfs2/acl.c +1 -1
@@ -291,7 +291,7 @@ int ocfs2_iop_set_acl(struct user_namespace *mnt_userns, struct inode *inode,return status; } -struct posix_acl *ocfs2_iop_get_acl (struct inode *inode,int type) +struct posix_acl *ocfs2_iop_get_acl (struct inode *inode,int type,int flags) {struct ocfs2_super *osb;struct buffer_head *di_bh =NULL ;
fs/ocfs2/acl.h +1 -1
@@ -18,7 +18,7 @@ struct ocfs2_acl_entry {__le32 e_id; }; -struct posix_acl *ocfs2_iop_get_acl (struct inode *inode,int type); +struct posix_acl *ocfs2_iop_get_acl (struct inode *inode,int type,int flags);int ocfs2_iop_set_acl (struct user_namespace *mnt_userns,struct inode *inode,struct posix_acl *acl,int type);extern int ocfs2_acl_chmod (struct inode *,struct buffer_head *);
fs/orangefs/acl.c +1 -1
@@ -10,7 +10,7 @@#include "orangefs-bufmap.h" #include <linux/posix_acl_xattr.h> -struct posix_acl *orangefs_get_acl (struct inode *inode,int type) +struct posix_acl *orangefs_get_acl (struct inode *inode,int type,int flags) {struct posix_acl *acl;int ret;
fs/orangefs/orangefs-kernel.h +1 -1
@@ -106,7 +106,7 @@ enum orangefs_vfs_op_states {extern int orangefs_init_acl (struct inode *inode,struct inode *dir);extern const struct xattr_handler *orangefs_xattr_handlers[]; -extern struct posix_acl *orangefs_get_acl (struct inode *inode,int type); +extern struct posix_acl *orangefs_get_acl (struct inode *inode,int type,int flags);extern int orangefs_set_acl (struct user_namespace *mnt_userns,struct inode *inode,struct posix_acl *acl,int type);
fs/overlayfs/inode.c +5 -1
@@ -11,6 +11,7 @@#include <linux/posix_acl.h> #include <linux/ratelimit.h> #include <linux/fiemap.h> +#include <linux/namei.h> #include "overlayfs.h"
@@ -450,7 +451,7 @@ ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)return res; } -struct posix_acl *ovl_get_acl (struct inode *inode,int type) +struct posix_acl *ovl_get_acl (struct inode *inode,int type,int flags) {struct inode *realinode =ovl_inode_real (inode);const struct cred *old_cred;
@@ -459,6 +460,9 @@ struct posix_acl *ovl_get_acl(struct inode *inode, int type)if (!IS_ENABLED (CONFIG_FS_POSIX_ACL ) || !IS_POSIXACL (realinode))return NULL ; +if (flags &LOOKUP_RCU ) +return get_cached_acl_rcu (realinode, type); + old_cred =ovl_override_creds (inode->i_sb); acl =get_acl (realinode, type);revert_creds (old_cred);
fs/overlayfs/overlayfs.h +1 -1
@@ -456,7 +456,7 @@ int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const char *name,int ovl_xattr_get (struct dentry *dentry,struct inode *inode,const char *name,void *value,size_t size);ssize_t ovl_listxattr (struct dentry *dentry,char *list,size_t size); -struct posix_acl *ovl_get_acl (struct inode *inode,int type); +struct posix_acl *ovl_get_acl (struct inode *inode,int type,int flags);int ovl_update_time (struct inode *inode,struct timespec64 *ts,int flags);bool ovl_is_private_xattr (struct super_block *sb,const char *name);
fs/posix_acl.c +8 -2
@@ -22,6 +22,7 @@#include <linux/xattr.h> #include <linux/export.h> #include <linux/user_namespace.h> +#include <linux/namei.h> static struct posix_acl **acl_by_type (struct inode *inode,int type) {
@@ -56,7 +57,12 @@ EXPORT_SYMBOL(get_cached_acl);struct posix_acl *get_cached_acl_rcu (struct inode *inode,int type) { -return rcu_dereference (*acl_by_type (inode, type)); +struct posix_acl *acl =rcu_dereference (*acl_by_type (inode, type)); + +if (acl ==ACL_DONT_CACHE ) + acl = inode->i_op->get_acl (inode, type,LOOKUP_RCU ); + +return acl; }EXPORT_SYMBOL (get_cached_acl_rcu);
@@ -138,7 +144,7 @@ struct posix_acl *get_acl(struct inode *inode, int type)set_cached_acl (inode, type,NULL );return NULL ; } - acl = inode->i_op->get_acl (inode, type); + acl = inode->i_op->get_acl (inode, type,0 );if (IS_ERR (acl)) {/*
fs/reiserfs/acl.h +1 -1
@@ -48,7 +48,7 @@ static inline int reiserfs_acl_count(size_t size) }#ifdef CONFIG_REISERFS_FS_POSIX_ACL -struct posix_acl *reiserfs_get_acl (struct inode *inode,int type); +struct posix_acl *reiserfs_get_acl (struct inode *inode,int type,int flags);int reiserfs_set_acl (struct user_namespace *mnt_userns,struct inode *inode,struct posix_acl *acl,int type);int reiserfs_acl_chmod (struct inode *inode);
fs/reiserfs/xattr_acl.c +1 -1
@@ -190,7 +190,7 @@ static void *reiserfs_posix_acl_to_disk(const struct posix_acl *acl, size_t * si* inode->i_mutex: down * BKL held [before 2.5.x] */ -struct posix_acl *reiserfs_get_acl (struct inode *inode,int type) +struct posix_acl *reiserfs_get_acl (struct inode *inode,int type,int flags) {char *name, *value;struct posix_acl *acl;
fs/xfs/xfs_acl.c +1 -1
@@ -125,7 +125,7 @@ xfs_acl_to_disk(struct xfs_acl *aclp, const struct posix_acl *acl) }struct posix_acl * -xfs_get_acl (struct inode *inode,int type) +xfs_get_acl (struct inode *inode,int type,int flags) {struct xfs_inode *ip =XFS_I (inode);struct xfs_mount *mp = ip->i_mount;
fs/xfs/xfs_acl.h +2 -2
@@ -10,13 +10,13 @@ struct inode;struct posix_acl ;#ifdef CONFIG_XFS_POSIX_ACL -extern struct posix_acl *xfs_get_acl (struct inode *inode,int type); +extern struct posix_acl *xfs_get_acl (struct inode *inode,int type,int flags);extern int xfs_set_acl (struct user_namespace *mnt_userns,struct inode *inode,struct posix_acl *acl,int type);extern int __xfs_set_acl (struct inode *inode,struct posix_acl *acl,int type);void xfs_forget_acl (struct inode *inode,const char *name);#else -static inline struct posix_acl *xfs_get_acl (struct inode *inode,int type) +static inline struct posix_acl *xfs_get_acl (struct inode *inode,int type,int flags) {return NULL ; }
include/linux/fs.h +1 -1
@@ -1931,7 +1931,7 @@ struct inode_operations {struct dentry * (*lookup) (struct inode *,struct dentry *,unsigned int );const char * (*get_link) (struct dentry *,struct inode *,struct delayed_call *);int (*permission) (struct user_namespace *,struct inode *,int ); -struct posix_acl * (*get_acl)(struct inode *,int ); +struct posix_acl * (*get_acl)(struct inode *,int ,int );int (*readlink) (struct dentry *,char __user *,int );
Signature · 1 line
2.30.2
Miklos Szeredi
maintainerQuoted 10 lines · Miklos Szeredi
Overlayfs does not cache ACL's to avoid double caching with all its problems. Instead it just calls the underlying filesystem's
i_op->get_acl(), which will return the cached value, if possible.In rcu path walk, however,
get_cached_acl_rcu()is employed to get the value from the cache, which will fail on overlayfs resulting in dropping out of rcu walk mode. This can result in a big performance hit in certain situations.
Quoted 8 lines
Add a flags argument to the ->get_acl() callback, and allow
get_cached_acl_rcu()to call the ->get_acl() method withLOOKUP_RCU.Don't do this for the generic case of a cache miss, only in case of
ACL_DONT_CACHE.Reported-by garyhuang <[email protected]>Signed-off-by Miklos Szeredi <[email protected]>
Hi Al,
Could you please apply this patch?
It's fairly trivial, but unfortunately adds a fair bit of API churn.
Thanks,
Miklos