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

Commit 9b17c623 authored by Dave Chinner's avatar Dave Chinner Committed by Al Viro
Browse files

fs: convert inode and dentry shrinking to be node aware 



Now that the shrinker is passing a node in the scan control structure, we
can pass this to the the generic LRU list code to isolate reclaim to the
lists on matching nodes.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarGlauber Costa <glommer@parallels.com>
Acked-by: default avatarMel Gorman <mgorman@suse.de>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: Arve Hjønnevåg <arve@android.com>
Cc: Carlos Maiolino <cmaiolino@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: David Rientjes <rientjes@google.com>
Cc: Gleb Natapov <gleb@redhat.com>
Cc: Greg Thelen <gthelen@google.com>
Cc: J. Bruce Fields <bfields@redhat.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Kent Overstreet <koverstreet@google.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1d3d4437

fs/dcache.c

+5 −3
Original line number Diff line number Diff line
@@ -937,6 +937,7 @@ dentry_lru_isolate(struct list_head *item, spinlock_t *lru_lock, void *arg) 
 * prune_dcache_sb - shrink the dcache

 * @sb: superblock

 * @nr_to_scan : number of entries to try to free

 * @nid: which node to scan for freeable entities

 *

 * Attempt to shrink the superblock dcache LRU by @nr_to_scan entries. This is

 * done when we need more memory an called from the superblock shrinker
@@ -945,13 +946,14 @@ dentry_lru_isolate(struct list_head *item, spinlock_t *lru_lock, void *arg) 
 * This function may fail to free any resources if all the dentries are in

 * use.

 */

long prune_dcache_sb(struct super_block *sb, unsigned long nr_to_scan)

long prune_dcache_sb(struct super_block *sb, unsigned long nr_to_scan,

		     int nid)

{

	LIST_HEAD(dispose);

	long freed;



	freed = list_lru_walk(&sb->s_dentry_lru, dentry_lru_isolate,

			      &dispose, nr_to_scan);

	freed = list_lru_walk_node(&sb->s_dentry_lru, nid, dentry_lru_isolate,

				       &dispose, &nr_to_scan);

	shrink_dentry_list(&dispose);

	return freed;

}

fs/inode.c

+4 −3
Original line number Diff line number Diff line
@@ -748,13 +748,14 @@ inode_lru_isolate(struct list_head *item, spinlock_t *lru_lock, void *arg) 
 * to trim from the LRU. Inodes to be freed are moved to a temporary list and

 * then are freed outside inode_lock by dispose_list().

 */

long prune_icache_sb(struct super_block *sb, unsigned long nr_to_scan)

long prune_icache_sb(struct super_block *sb, unsigned long nr_to_scan,

		     int nid)

{

	LIST_HEAD(freeable);

	long freed;



	freed = list_lru_walk(&sb->s_inode_lru, inode_lru_isolate,

						&freeable, nr_to_scan);

	freed = list_lru_walk_node(&sb->s_inode_lru, nid, inode_lru_isolate,

				       &freeable, &nr_to_scan);

	dispose_list(&freeable);

	return freed;

}

fs/internal.h

+4 −2
Original line number Diff line number Diff line
@@ -114,7 +114,8 @@ 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, unsigned long nr_to_scan);

extern long prune_icache_sb(struct super_block *sb, unsigned long nr_to_scan,

			    int nid);

extern void inode_add_lru(struct inode *inode);



/*
@@ -131,7 +132,8 @@ extern int invalidate_inodes(struct super_block *, bool); 
 */

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, unsigned long nr_to_scan);

extern long prune_dcache_sb(struct super_block *sb, unsigned long nr_to_scan,

			    int nid);



/*

 * read_write.c

fs/super.c

+14 −9
Original line number Diff line number Diff line
@@ -76,10 +76,10 @@ static unsigned long super_cache_scan(struct shrinker *shrink, 
		return SHRINK_STOP;



	if (sb->s_op->nr_cached_objects)

		fs_objects = sb->s_op->nr_cached_objects(sb);

		fs_objects = sb->s_op->nr_cached_objects(sb, sc->nid);



	inodes = list_lru_count(&sb->s_inode_lru);

	dentries = list_lru_count(&sb->s_dentry_lru);

	inodes = list_lru_count_node(&sb->s_inode_lru, sc->nid);

	dentries = list_lru_count_node(&sb->s_dentry_lru, sc->nid);

	total_objects = dentries + inodes + fs_objects + 1;



	/* proportion the scan between the caches */
@@ -90,13 +90,14 @@ static unsigned long super_cache_scan(struct shrinker *shrink, 
	 * prune the dcache first as the icache is pinned by it, then

	 * prune the icache, followed by the filesystem specific caches

	 */

	freed = prune_dcache_sb(sb, dentries);

	freed += prune_icache_sb(sb, inodes);

	freed = prune_dcache_sb(sb, dentries, sc->nid);

	freed += prune_icache_sb(sb, inodes, sc->nid);



	if (fs_objects) {

		fs_objects = mult_frac(sc->nr_to_scan, fs_objects,

								total_objects);

		freed += sb->s_op->free_cached_objects(sb, fs_objects);

		freed += sb->s_op->free_cached_objects(sb, fs_objects,

						       sc->nid);

	}



	drop_super(sb);
@@ -115,10 +116,13 @@ static unsigned long super_cache_count(struct shrinker *shrink, 
		return 0;



	if (sb->s_op && sb->s_op->nr_cached_objects)

		total_objects = sb->s_op->nr_cached_objects(sb);

		total_objects = sb->s_op->nr_cached_objects(sb,

						 sc->nid);



	total_objects += list_lru_count(&sb->s_dentry_lru);

	total_objects += list_lru_count(&sb->s_inode_lru);

	total_objects += list_lru_count_node(&sb->s_dentry_lru,

						 sc->nid);

	total_objects += list_lru_count_node(&sb->s_inode_lru,

						 sc->nid);



	total_objects = vfs_pressure_ratio(total_objects);

	drop_super(sb);
@@ -228,6 +232,7 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags) 
		s->s_shrink.scan_objects = super_cache_scan;

		s->s_shrink.count_objects = super_cache_count;

		s->s_shrink.batch = 1024;

		s->s_shrink.flags = SHRINKER_NUMA_AWARE;

	}

out:

	return s;

fs/xfs/xfs_super.c

+4 −2
Original line number Diff line number Diff line
@@ -1537,7 +1537,8 @@ xfs_fs_mount( 


static long

xfs_fs_nr_cached_objects(

	struct super_block	*sb)

	struct super_block	*sb,

	int			nid)

{

	return xfs_reclaim_inodes_count(XFS_M(sb));

}
@@ -1545,7 +1546,8 @@ xfs_fs_nr_cached_objects( 
static long

xfs_fs_free_cached_objects(

	struct super_block	*sb,

	long			nr_to_scan)

	long			nr_to_scan,

	int			nid)

{

	return xfs_reclaim_inodes_nr(XFS_M(sb), nr_to_scan);

}