WARNING: This is not a real submission yet, will need to do more testing for correctness. Also I slapped ext4 support into this patch as opposed to posting it separately. The no_acl caching was written by Linus, also see the necroed thread here: https://lore.kernel.org/linux-fsdevel/kn44smk4dgaj5rqmtcfr7ruecixzrik6omur2l2opitn7lbvfm@rm4y24fcfzbz/T/#m30d6cea6be48e95c0d824e98a328fb90c7a5766d and full thread: https://lore.kernel.org/linux-fsdevel/kn44smk4dgaj5rqmtcfr7ruecixzrik6omur2l2opitn7lbvfm@rm4y24fcfzbz/T/#t Not pointing fingers, but someone promised to get that bit in. ;) Now to business: Vast majority of real-world traversals happen on directories which are traversable by anyone. The patch below adds support for pre-computing that state and branching on it during lookup, avoiding tons of work. Stats from calls to security_inode_permission during kernel build: missing: 6097127 present: 60579018 Or just above 90% of all lookups on my debian install benefited from it. A simple microbench of stating /usr/include/linux/fs.h on ext4 in a loop on Sapphire Rapids (ops/s): before: 3640352 after: 3797258 (+4%) Note the speed up would be higher if it was not for stat itself being dog slow (to be addressed separately). Filesystems interested in participating call inode_enable_fast_may_exec() when instatianating an inode. Explicit opt-in is necessary as some filesystems have custom inode permission check hooks which happen to be of no significance for MAY_EXEC. With an opt-in we now it can be safely ignored. Otherwise any inode with such a func present would need to be excluded. --- fs/attr.c | 1 + fs/ext4/inode.c | 6 +++ fs/ext4/namei.c | 1 + fs/file_table.c | 12 +++++ fs/namei.c | 106 +++++++++++++++++++++++++++++++++++++++++++-- fs/posix_acl.c | 1 + fs/xattr.c | 1 + include/linux/fs.h | 20 ++++++--- mm/shmem.c | 2 + 9 files changed, 141 insertions(+), 9 deletions(-) diff --git a/fs/attr.c b/fs/attr.c index 795f231d00e8..572363ff9c6d 100644 --- a/fs/attr.c +++ b/fs/attr.c @@ -549,6 +549,7 @@ int notify_change(struct mnt_idmap *idmap, struct dentry *dentry, if (!error) { fsnotify_change(dentry, ia_valid); + inode_recalc_fast_may_exec(inode); security_inode_post_setattr(idmap, dentry, ia_valid); } diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index a163c0871373..ce2bfe3167e7 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -5519,6 +5519,12 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino, goto bad_inode; brelse(iloc.bh); + /* Initialize the "no ACL's" state for the simple cases */ + if (!ext4_test_inode_state(inode, EXT4_STATE_XATTR) && !ei->i_file_acl) + cache_no_acl(inode); + + inode_enable_fast_may_exec(inode); + unlock_new_inode(inode); return inode; diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 2cd36f59c9e3..bedd9bfca440 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -3042,6 +3042,7 @@ static struct dentry *ext4_mkdir(struct mnt_idmap *idmap, struct inode *dir, ext4_fc_track_create(handle, dentry); if (IS_DIRSYNC(dir)) ext4_handle_sync(handle); + inode_enable_fast_may_exec(inode); out_stop: if (handle) diff --git a/fs/file_table.c b/fs/file_table.c index cd4a3db4659a..de1ef700d144 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -109,6 +109,8 @@ static int proc_nr_files(const struct ctl_table *table, int write, void *buffer, return proc_doulongvec_minmax(table, write, buffer, lenp, ppos); } +unsigned long magic_tunable; + static const struct ctl_table fs_stat_sysctls[] = { { .procname = "file-nr", @@ -126,6 +128,16 @@ static const struct ctl_table fs_stat_sysctls[] = { .extra1 = SYSCTL_LONG_ZERO, .extra2 = SYSCTL_LONG_MAX, }, + { + .procname = "magic_tunable", + .data = &magic_tunable, + .maxlen = sizeof(magic_tunable), + .mode = 0644, + .proc_handler = proc_doulongvec_minmax, + .extra1 = SYSCTL_LONG_ZERO, + .extra2 = SYSCTL_LONG_MAX, + }, + { .procname = "nr_open", .data = &sysctl_nr_open, diff --git a/fs/namei.c b/fs/namei.c index 39c4d52f5b54..ac7252c0a428 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -123,6 +123,9 @@ * PATH_MAX includes the nul terminator --RR. */ +static __always_inline int inode_permission_may_exec(struct mnt_idmap *idmap, + struct inode *inode, int mask); + #define EMBEDDED_NAME_MAX (PATH_MAX - offsetof(struct filename, iname)) static inline void initname(struct filename *name, const char __user *uptr) @@ -574,7 +577,7 @@ int inode_permission(struct mnt_idmap *idmap, if (unlikely(retval)) return retval; - if (unlikely(mask & MAY_WRITE)) { + if (mask & MAY_WRITE) { /* * Nobody gets write access to an immutable file. */ @@ -601,6 +604,103 @@ int inode_permission(struct mnt_idmap *idmap, return security_inode_permission(inode, mask); } EXPORT_SYMBOL(inode_permission); +extern unsigned long magic_tunable; + +/** + * inode_permission_may_exec - Check traversal right for given inode + * + * This is a special case routine for may_lookup(). Use inode_permission() + * instead even if MAY_EXEC is the only thing you want to check for. + */ +static __always_inline int inode_permission_may_exec(struct mnt_idmap *idmap, + struct inode *inode, int mask) +{ + mask |= MAY_EXEC; + +#if 1 + if (!magic_tunable || !(READ_ONCE(inode->i_opflags) & IOP_FAST_MAY_EXEC)) + return inode_permission(idmap, inode, mask); +#else + if (!(READ_ONCE(inode->i_opflags) & IOP_FAST_MAY_EXEC)) + return inode_permission(idmap, inode, mask); +#endif + +#ifdef CONFIG_DEBUG_VFS + /* + * We expect everyone has the execute permission and that there are no + * acls. We assert the filesystem at hand complies by validating it + * below. + * + * However, We may be racing against setattr and/or setacl, in which case + * we will have to redo the check with the appropriate lock held to avoid + * false-positives. + */ + unsigned int mode = READ_ONCE(inode->i_mode); + + VFS_BUG_ON_INODE(!S_ISDIR(mode), inode); + if (((mode & 0111) != 0111) || !no_acl_inode(inode)) { + /* + * If we are in RCU mode may_lookup() will unlazy and try again. + * Worst case if we are still racing the lock will be taken below. + */ + if (mask & MAY_NOT_BLOCK) + return -ECHILD; + inode_lock(inode); + if (inode->i_opflags & IOP_FAST_MAY_EXEC) { + VFS_BUG_ON_INODE((inode->i_mode & 0111) != 0111, inode); + VFS_BUG_ON_INODE(!no_acl_inode(inode), inode); + } + inode_unlock(inode); + return inode_permission(idmap, inode, mask); + } +#endif + return security_inode_permission(inode, mask); +} + +/** + * inode_recalc_fast_may_exec - recalc IOP_FAST_MAY_EXEC + * @inode: Inode to set/unset the bit on + * + * To be called if the fs considers the inode eligible for short-circuited + * permission checks. + */ +void inode_recalc_fast_may_exec(struct inode *inode) +{ + unsigned int mode; + bool wantbit = false; + + if (!(inode_state_read(inode) & I_NEW)) + lockdep_assert_held_write(inode->i_rwsem); + + if (!(inode->i_flags & S_CAN_FAST_EXEC)) { + VFS_BUG_ON_INODE(inode->i_opflags & IOP_FAST_MAY_EXEC, inode); + return; + } + + mode = inode->i_mode; + if (!S_ISDIR(mode)) { + VFS_BUG_ON_INODE(inode->i_opflags & IOP_FAST_MAY_EXEC, inode); + return; + } + + if (((mode & 0111) == 0111) && no_acl_inode(inode)) + wantbit = true; + + if (wantbit) { + if (inode->i_opflags & IOP_FAST_MAY_EXEC) + return; + spin_lock(&inode->i_lock); + inode->i_opflags |= IOP_FAST_MAY_EXEC; + spin_unlock(&inode->i_lock); + } else { + if (!(inode->i_opflags & IOP_FAST_MAY_EXEC)) + return; + spin_lock(&inode->i_lock); + inode->i_opflags &= ~IOP_FAST_MAY_EXEC; + spin_unlock(&inode->i_lock); + } +} +EXPORT_SYMBOL(inode_recalc_fast_may_exec); /** * path_get - get a reference to a path @@ -1855,7 +1955,7 @@ static inline int may_lookup(struct mnt_idmap *idmap, int err, mask; mask = nd->flags & LOOKUP_RCU ? MAY_NOT_BLOCK : 0; - err = inode_permission(idmap, nd->inode, mask | MAY_EXEC); + err = inode_permission_may_exec(idmap, nd->inode, mask); if (likely(!err)) return 0; @@ -1870,7 +1970,7 @@ static inline int may_lookup(struct mnt_idmap *idmap, if (err != -ECHILD) // hard error return err; - return inode_permission(idmap, nd->inode, MAY_EXEC); + return inode_permission_may_exec(idmap, nd->inode, 0); } static int reserve_stack(struct nameidata *nd, struct path *link) diff --git a/fs/posix_acl.c b/fs/posix_acl.c index 4050942ab52f..da27dd536058 100644 --- a/fs/posix_acl.c +++ b/fs/posix_acl.c @@ -1135,6 +1135,7 @@ int vfs_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, error = -EIO; if (!error) { fsnotify_xattr(dentry); + inode_recalc_fast_may_exec(inode); security_inode_post_set_acl(dentry, acl_name, kacl); } diff --git a/fs/xattr.c b/fs/xattr.c index 8851a5ef34f5..917946a7f367 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -235,6 +235,7 @@ int __vfs_setxattr_noperm(struct mnt_idmap *idmap, size, flags); if (!error) { fsnotify_xattr(dentry); + inode_recalc_fast_may_exec(inode); security_inode_post_setxattr(dentry, name, value, size, flags); } diff --git a/include/linux/fs.h b/include/linux/fs.h index a8ffab9d4a64..41c855ef0594 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -659,13 +659,14 @@ is_uncached_acl(struct posix_acl *acl) return (long)acl & 1; } -#define IOP_FASTPERM 0x0001 -#define IOP_LOOKUP 0x0002 -#define IOP_NOFOLLOW 0x0004 -#define IOP_XATTR 0x0008 +#define IOP_FASTPERM 0x0001 +#define IOP_LOOKUP 0x0002 +#define IOP_NOFOLLOW 0x0004 +#define IOP_XATTR 0x0008 #define IOP_DEFAULT_READLINK 0x0010 -#define IOP_MGTIME 0x0020 -#define IOP_CACHED_LINK 0x0040 +#define IOP_MGTIME 0x0020 +#define IOP_CACHED_LINK 0x0040 +#define IOP_FAST_MAY_EXEC 0x0080 /* * Inode state bits. Protected by inode->i_lock @@ -2607,6 +2608,7 @@ struct super_operations { #define S_VERITY (1 << 16) /* Verity file (using fs/verity/) */ #define S_KERNEL_FILE (1 << 17) /* File is in use by the kernel (eg. fs/cachefiles) */ #define S_ANON_INODE (1 << 19) /* Inode is an anonymous inode */ +#define S_CAN_FAST_EXEC (1 << 20) /* Inode is eligible for IOP_FAST_MAY_EXEC */ /* * Note that nosuid etc flags are inode-specific: setting some file-system @@ -3395,6 +3397,12 @@ static inline int inode_init_always(struct super_block *sb, struct inode *inode) { return inode_init_always_gfp(sb, inode, GFP_NOFS); } +void inode_recalc_fast_may_exec(struct inode *); +static inline void inode_enable_fast_may_exec(struct inode *inode) +{ + inode->i_flags |= S_CAN_FAST_EXEC; + inode_recalc_fast_may_exec(inode); +} extern void inode_init_once(struct inode *); extern void address_space_init_once(struct address_space *mapping); diff --git a/mm/shmem.c b/mm/shmem.c index c819cecf1ed9..15d769882371 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3105,6 +3105,8 @@ static struct inode *__shmem_get_inode(struct mnt_idmap *idmap, break; } + inode_recalc_fast_may_exec(inode); + lockdep_annotate_inode_mutex_key(inode); return inode; } -- 2.48.1