kernfs: use i_lock to protect concurrent inode updates

The inode operations .permission() and .getattr() use the kernfs node
write lock but all that's needed is the read lock to protect against
partial updates of these kernfs node fields which are all done under
the write lock.

And .permission() is called frequently during path walks and can cause
quite a bit of contention between kernfs node operations and path
walks when the number of concurrent walks is high.

To change kernfs_iop_getattr() and kernfs_iop_permission() to take
the rw sem read lock instead of the write lock an additional lock is
needed to protect against multiple processes concurrently updating
the inode attributes and link count in kernfs_refresh_inode().

The inode i_lock seems like the sensible thing to use to protect these
inode attribute updates so use it in kernfs_refresh_inode().

The last hunk in the patch, applied to kernfs_fill_super(), is possibly
not needed but taking the lock was present originally. I prefer to
continue to take it to protect against a partial update of the source
kernfs fields during the call to kernfs_refresh_inode() made by
kernfs_get_inode().

Reviewed-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Ian Kent <raven@themaw.net>
Link: https://lore.kernel.org/r/162642771474.63632.16295959115893904470.stgit@web.messagingengine.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c
index dad749f395181756c399cba010758bdb7f3c422a..c0eae1725435712c976010de3c6a975f34b72d71 100644 (file)
--- a/fs/kernfs/inode.c
+++ b/fs/kernfs/inode.c
@@ -185,11 +185,13 @@ int kernfs_iop_getattr(struct user_namespace *mnt_userns,
        struct inode *inode = d_inode(path->dentry);
        struct kernfs_node *kn = inode->i_private;
 
-       down_write(&kernfs_rwsem);
+       down_read(&kernfs_rwsem);
+       spin_lock(&inode->i_lock);
        kernfs_refresh_inode(kn, inode);
-       up_write(&kernfs_rwsem);
-
        generic_fillattr(&init_user_ns, inode, stat);
+       spin_unlock(&inode->i_lock);
+       up_read(&kernfs_rwsem);
+
        return 0;
 }
 
@@ -272,17 +274,21 @@ int kernfs_iop_permission(struct user_namespace *mnt_userns,
                          struct inode *inode, int mask)
 {
        struct kernfs_node *kn;
+       int ret;
 
        if (mask & MAY_NOT_BLOCK)
                return -ECHILD;
 
        kn = inode->i_private;
 
-       down_write(&kernfs_rwsem);
+       down_read(&kernfs_rwsem);
+       spin_lock(&inode->i_lock);
        kernfs_refresh_inode(kn, inode);
-       up_write(&kernfs_rwsem);
+       ret = generic_permission(&init_user_ns, inode, mask);
+       spin_unlock(&inode->i_lock);
+       up_read(&kernfs_rwsem);
 
-       return generic_permission(&init_user_ns, inode, mask);
+       return ret;
 }
 
 int kernfs_xattr_get(struct kernfs_node *kn, const char *name,

diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c
index baa4155ba2edf461aa6dadf4e689dbdaca31a673..f2f909d09f522bc7d91327d649e19347135169c2 100644 (file)
--- a/fs/kernfs/mount.c
+++ b/fs/kernfs/mount.c
@@ -255,9 +255,9 @@ static int kernfs_fill_super(struct super_block *sb, struct kernfs_fs_context *k
        sb->s_shrink.seeks = 0;
 
        /* get root inode, initialize and unlock it */
-       down_write(&kernfs_rwsem);
+       down_read(&kernfs_rwsem);
        inode = kernfs_get_inode(sb, info->root->kn);
-       up_write(&kernfs_rwsem);
+       up_read(&kernfs_rwsem);
        if (!inode) {
                pr_debug("kernfs: could not get root inode\n");
                return -ENOMEM;