Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 423e0ab0 authored by Tim Chen's avatar Tim Chen Committed by Al Viro
Browse files

VFS : mount lock scalability for internal mounts 



For a number of file systems that don't have a mount point (e.g. sockfs
and pipefs), they are not marked as long term. Therefore in
mntput_no_expire, all locks in vfs_mount lock are taken instead of just
local cpu's lock to aggregate reference counts when we release
reference to file objects.  In fact, only local lock need to have been
taken to update ref counts as these file systems are in no danger of
going away until we are ready to unregister them.

The attached patch marks file systems using kern_mount without
mount point as long term.  The contentions of vfs_mount lock
is now eliminated.  Before un-registering such file system,
kern_unmount should be called to remove the long term flag and
make the mount point ready to be freed.

Signed-off-by: default avatarTim Chen <tim.c.chen@linux.intel.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent bbd9d6f7

drivers/mtd/mtdchar.c

+1 −1
Original line number Diff line number Diff line
@@ -1192,7 +1192,7 @@ static int __init init_mtdchar(void) 
static void __exit cleanup_mtdchar(void)

{

	unregister_mtd_user(&mtdchar_notifier);

	mntput(mtd_inode_mnt);

	kern_unmount(mtd_inode_mnt);

	unregister_filesystem(&mtd_inodefs_type);

	__unregister_chrdev(MTD_CHAR_MAJOR, 0, 1 << MINORBITS, "mtd");

}

fs/anon_inodes.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static int __init anon_inode_init(void) 
	return 0;



err_mntput:

	mntput(anon_inode_mnt);

	kern_unmount(anon_inode_mnt);

err_unregister_filesystem:

	unregister_filesystem(&anon_inode_fs_type);

err_exit:

fs/hugetlbfs/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -1030,6 +1030,7 @@ static int __init init_hugetlbfs_fs(void) 
static void __exit exit_hugetlbfs_fs(void)

{

	kmem_cache_destroy(hugetlbfs_inode_cachep);

	kern_unmount(hugetlbfs_vfsmount);

	unregister_filesystem(&hugetlbfs_fs_type);

	bdi_destroy(&hugetlbfs_backing_dev_info);

}

fs/namespace.c

+20 −1
Original line number Diff line number Diff line
@@ -2721,6 +2721,25 @@ EXPORT_SYMBOL(put_mnt_ns); 


struct vfsmount *kern_mount_data(struct file_system_type *type, void *data)

{

	return vfs_kern_mount(type, MS_KERNMOUNT, type->name, data);

	struct vfsmount *mnt;

	mnt = vfs_kern_mount(type, MS_KERNMOUNT, type->name, data);

	if (!IS_ERR(mnt)) {

		/*

		 * it is a longterm mount, don't release mnt until

		 * we unmount before file sys is unregistered

		*/

		mnt_make_longterm(mnt);

	}

	return mnt;

}

EXPORT_SYMBOL_GPL(kern_mount_data);



void kern_unmount(struct vfsmount *mnt)

{

	/* release long term mount so mount point can be released */

	if (!IS_ERR_OR_NULL(mnt)) {

		mnt_make_shortterm(mnt);

		mntput(mnt);

	}

}

EXPORT_SYMBOL(kern_unmount);

fs/pipe.c

+1 −1
Original line number Diff line number Diff line
@@ -1291,8 +1291,8 @@ static int __init init_pipe_fs(void) 


static void __exit exit_pipe_fs(void)

{

	kern_unmount(pipe_mnt);

	unregister_filesystem(&pipe_fs_type);

	mntput(pipe_mnt);

}



fs_initcall(init_pipe_fs);