 eb6ef3df4f
			
		
	
	
	eb6ef3df4f
	
	
	
		
			
			I've noticed significant locking contention in memory reclaimer around sb_lock inside grab_super_passive(). Grab_super_passive() is called from two places: in icache/dcache shrinkers (function super_cache_scan) and from writeback (function __writeback_inodes_wb). Both are required for progress in memory allocator. Grab_super_passive() acquires sb_lock to increment sb->s_count and check sb->s_instances. It seems sb->s_umount locked for read is enough here: super-block deactivation always runs under sb->s_umount locked for write. Protecting super-block itself isn't a problem: in super_cache_scan() sb is protected by shrinker_rwsem: it cannot be freed if its slab shrinkers are still active. Inside writeback super-block comes from inode from bdi writeback list under wb->list_lock. This patch removes locking sb_lock and checks s_instances under s_umount: generic_shutdown_super() unlinks it under sb->s_umount locked for write. New variant is called trylock_super() and since it only locks semaphore, callers must call up_read(&sb->s_umount) instead of drop_super(sb) when they're done. Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
		
			
				
	
	
		
			153 lines
		
	
	
	
		
			3.5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			153 lines
		
	
	
	
		
			3.5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /* fs/ internal definitions
 | |
|  *
 | |
|  * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
 | |
|  * Written by David Howells (dhowells@redhat.com)
 | |
|  *
 | |
|  * This program is free software; you can redistribute it and/or
 | |
|  * modify it under the terms of the GNU General Public License
 | |
|  * as published by the Free Software Foundation; either version
 | |
|  * 2 of the License, or (at your option) any later version.
 | |
|  */
 | |
| 
 | |
| struct super_block;
 | |
| struct file_system_type;
 | |
| struct linux_binprm;
 | |
| struct path;
 | |
| struct mount;
 | |
| struct shrink_control;
 | |
| 
 | |
| /*
 | |
|  * block_dev.c
 | |
|  */
 | |
| #ifdef CONFIG_BLOCK
 | |
| extern void __init bdev_cache_init(void);
 | |
| 
 | |
| extern int __sync_blockdev(struct block_device *bdev, int wait);
 | |
| 
 | |
| #else
 | |
| static inline void bdev_cache_init(void)
 | |
| {
 | |
| }
 | |
| 
 | |
| static inline int __sync_blockdev(struct block_device *bdev, int wait)
 | |
| {
 | |
| 	return 0;
 | |
| }
 | |
| #endif
 | |
| 
 | |
| /*
 | |
|  * buffer.c
 | |
|  */
 | |
| extern void guard_bio_eod(int rw, struct bio *bio);
 | |
| 
 | |
| /*
 | |
|  * char_dev.c
 | |
|  */
 | |
| extern void __init chrdev_init(void);
 | |
| 
 | |
| /*
 | |
|  * namei.c
 | |
|  */
 | |
| extern int user_path_mountpoint_at(int, const char __user *, unsigned int, struct path *);
 | |
| extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
 | |
| 			   const char *, unsigned int, struct path *);
 | |
| 
 | |
| /*
 | |
|  * namespace.c
 | |
|  */
 | |
| extern int copy_mount_options(const void __user *, unsigned long *);
 | |
| extern char *copy_mount_string(const void __user *);
 | |
| 
 | |
| extern struct vfsmount *lookup_mnt(struct path *);
 | |
| extern int finish_automount(struct vfsmount *, struct path *);
 | |
| 
 | |
| extern int sb_prepare_remount_readonly(struct super_block *);
 | |
| 
 | |
| extern void __init mnt_init(void);
 | |
| 
 | |
| extern int __mnt_want_write(struct vfsmount *);
 | |
| extern int __mnt_want_write_file(struct file *);
 | |
| extern void __mnt_drop_write(struct vfsmount *);
 | |
| extern void __mnt_drop_write_file(struct file *);
 | |
| 
 | |
| /*
 | |
|  * fs_struct.c
 | |
|  */
 | |
| extern void chroot_fs_refs(const struct path *, const struct path *);
 | |
| 
 | |
| /*
 | |
|  * file_table.c
 | |
|  */
 | |
| extern struct file *get_empty_filp(void);
 | |
| 
 | |
| /*
 | |
|  * super.c
 | |
|  */
 | |
| extern int do_remount_sb(struct super_block *, int, void *, int);
 | |
| extern bool trylock_super(struct super_block *sb);
 | |
| extern struct dentry *mount_fs(struct file_system_type *,
 | |
| 			       int, const char *, void *);
 | |
| extern struct super_block *user_get_super(dev_t);
 | |
| 
 | |
| /*
 | |
|  * open.c
 | |
|  */
 | |
| struct open_flags {
 | |
| 	int open_flag;
 | |
| 	umode_t mode;
 | |
| 	int acc_mode;
 | |
| 	int intent;
 | |
| 	int lookup_flags;
 | |
| };
 | |
| extern struct file *do_filp_open(int dfd, struct filename *pathname,
 | |
| 		const struct open_flags *op);
 | |
| extern struct file *do_file_open_root(struct dentry *, struct vfsmount *,
 | |
| 		const char *, const struct open_flags *);
 | |
| 
 | |
| extern long do_handle_open(int mountdirfd,
 | |
| 			   struct file_handle __user *ufh, int open_flag);
 | |
| extern int open_check_o_direct(struct file *f);
 | |
| 
 | |
| /*
 | |
|  * inode.c
 | |
|  */
 | |
| extern spinlock_t inode_sb_list_lock;
 | |
| extern long prune_icache_sb(struct super_block *sb, struct shrink_control *sc);
 | |
| extern void inode_add_lru(struct inode *inode);
 | |
| 
 | |
| /*
 | |
|  * fs-writeback.c
 | |
|  */
 | |
| extern void inode_wb_list_del(struct inode *inode);
 | |
| 
 | |
| extern long get_nr_dirty_inodes(void);
 | |
| extern void evict_inodes(struct super_block *);
 | |
| extern int invalidate_inodes(struct super_block *, bool);
 | |
| 
 | |
| /*
 | |
|  * dcache.c
 | |
|  */
 | |
| extern struct dentry *__d_alloc(struct super_block *, const struct qstr *);
 | |
| extern int d_set_mounted(struct dentry *dentry);
 | |
| extern long prune_dcache_sb(struct super_block *sb, struct shrink_control *sc);
 | |
| 
 | |
| /*
 | |
|  * read_write.c
 | |
|  */
 | |
| extern int rw_verify_area(int, struct file *, const loff_t *, size_t);
 | |
| 
 | |
| /*
 | |
|  * pipe.c
 | |
|  */
 | |
| extern const struct file_operations pipefifo_fops;
 | |
| 
 | |
| /*
 | |
|  * fs_pin.c
 | |
|  */
 | |
| extern void group_pin_kill(struct hlist_head *p);
 | |
| extern void mnt_pin_kill(struct mount *m);
 | |
| 
 | |
| /*
 | |
|  * fs/nsfs.c
 | |
|  */
 | |
| extern struct dentry_operations ns_dentry_operations;
 |