Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756656Ab2K0XVS (ORCPT ); Tue, 27 Nov 2012 18:21:18 -0500 Received: from ipmail04.adl6.internode.on.net ([150.101.137.141]:26299 "EHLO ipmail04.adl6.internode.on.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754925Ab2K0XPM (ORCPT ); Tue, 27 Nov 2012 18:15:12 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AicGABZJtVB5LIZ7/2dsb2JhbABFi320IRdzgh4BAQUnLyMQCBgxOQMbGYgMv3WQewOmRYMEgU4k From: Dave Chinner To: glommer@parallels.com Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, xfs@oss.sgi.com Subject: [PATCH 11/19] fs: convert inode and dentry shrinking to be node aware Date: Wed, 28 Nov 2012 10:14:38 +1100 Message-Id: <1354058086-27937-12-git-send-email-david@fromorbit.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1354058086-27937-1-git-send-email-david@fromorbit.com> References: <1354058086-27937-1-git-send-email-david@fromorbit.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 9378 Lines: 281 From: Dave Chinner Now that the shrinker is passing a nodemask 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. This requires a small amount of refactoring of the LRU list API, which might be best split out into a separate patch. Signed-off-by: Dave Chinner --- fs/dcache.c | 7 ++++--- fs/inode.c | 7 ++++--- fs/internal.h | 6 ++++-- fs/super.c | 22 +++++++++++++--------- fs/xfs/xfs_super.c | 6 ++++-- include/linux/fs.h | 4 ++-- include/linux/list_lru.h | 19 ++++++++++++++++--- lib/list_lru.c | 18 ++++++++++-------- 8 files changed, 57 insertions(+), 32 deletions(-) diff --git a/fs/dcache.c b/fs/dcache.c index d72e388..7f107fb 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -907,13 +907,14 @@ static int dentry_lru_isolate(struct list_head *item, spinlock_t *lru_lock, * This function may fail to free any resources if all the dentries are in * use. */ -long prune_dcache_sb(struct super_block *sb, long nr_to_scan) +long prune_dcache_sb(struct super_block *sb, long nr_to_scan, + nodemask_t *nodes_to_walk) { LIST_HEAD(dispose); long freed; - freed = list_lru_walk(&sb->s_dentry_lru, dentry_lru_isolate, - &dispose, nr_to_scan); + freed = list_lru_walk_nodemask(&sb->s_dentry_lru, dentry_lru_isolate, + &dispose, nr_to_scan, nodes_to_walk); shrink_dentry_list(&dispose); return freed; } diff --git a/fs/inode.c b/fs/inode.c index 2662305..3857f9f 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -731,13 +731,14 @@ static int inode_lru_isolate(struct list_head *item, spinlock_t *lru_lock, * 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, long nr_to_scan) +long prune_icache_sb(struct super_block *sb, long nr_to_scan, + nodemask_t *nodes_to_walk) { LIST_HEAD(freeable); long freed; - freed = list_lru_walk(&sb->s_inode_lru, inode_lru_isolate, - &freeable, nr_to_scan); + freed = list_lru_walk_nodemask(&sb->s_inode_lru, inode_lru_isolate, + &freeable, nr_to_scan, nodes_to_walk); dispose_list(&freeable); return freed; } diff --git a/fs/internal.h b/fs/internal.h index 7d7908b..95c4e9b 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -110,7 +110,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, long nr_to_scan); +extern long prune_icache_sb(struct super_block *sb, long nr_to_scan, + nodemask_t *nodes_to_scan); /* @@ -126,4 +127,5 @@ extern int invalidate_inodes(struct super_block *, bool); * dcache.c */ extern struct dentry *__d_alloc(struct super_block *, const struct qstr *); -extern long prune_dcache_sb(struct super_block *sb, long nr_to_scan); +extern long prune_dcache_sb(struct super_block *sb, long nr_to_scan, + nodemask_t *nodes_to_scan); diff --git a/fs/super.c b/fs/super.c index b1d24ef..3c975b1 100644 --- a/fs/super.c +++ b/fs/super.c @@ -75,10 +75,10 @@ static long super_cache_scan(struct shrinker *shrink, struct shrink_control *sc) return -1; if (sb->s_op && 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->nodes_to_scan); - inodes = list_lru_count(&sb->s_inode_lru); - dentries = list_lru_count(&sb->s_dentry_lru); + inodes = list_lru_count_nodemask(&sb->s_inode_lru, &sc->nodes_to_scan); + dentries = list_lru_count_nodemask(&sb->s_dentry_lru, &sc->nodes_to_scan); total_objects = dentries + inodes + fs_objects + 1; /* proportion the scan between the caches */ @@ -89,12 +89,13 @@ static long super_cache_scan(struct shrinker *shrink, struct shrink_control *sc) * 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->nodes_to_scan); + freed += prune_icache_sb(sb, inodes, &sc->nodes_to_scan); if (fs_objects) { fs_objects = (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->nodes_to_scan); } drop_super(sb); @@ -112,10 +113,13 @@ static long super_cache_count(struct shrinker *shrink, struct shrink_control *sc return -1; 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->nodes_to_scan); - total_objects += list_lru_count(&sb->s_dentry_lru); - total_objects += list_lru_count(&sb->s_inode_lru); + total_objects += list_lru_count_nodemask(&sb->s_dentry_lru, + &sc->nodes_to_scan); + total_objects += list_lru_count_nodemask(&sb->s_inode_lru, + &sc->nodes_to_scan); total_objects = (total_objects / 100) * sysctl_vfs_cache_pressure; drop_super(sb); diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 00aa61d..33d67d5 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1516,7 +1516,8 @@ xfs_fs_mount( static long xfs_fs_nr_cached_objects( - struct super_block *sb) + struct super_block *sb, + nodemask_t *nodes_to_count) { return xfs_reclaim_inodes_count(XFS_M(sb)); } @@ -1524,7 +1525,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, + nodemask_t *nodes_to_scan) { return xfs_reclaim_inodes_nr(XFS_M(sb), nr_to_scan); } diff --git a/include/linux/fs.h b/include/linux/fs.h index befa46f..fda4ee2 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1614,8 +1614,8 @@ struct super_operations { ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t); #endif int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t); - long (*nr_cached_objects)(struct super_block *); - long (*free_cached_objects)(struct super_block *, long); + long (*nr_cached_objects)(struct super_block *, nodemask_t *); + long (*free_cached_objects)(struct super_block *, long, nodemask_t *); }; /* diff --git a/include/linux/list_lru.h b/include/linux/list_lru.h index b0e3ba2..02796da 100644 --- a/include/linux/list_lru.h +++ b/include/linux/list_lru.h @@ -24,14 +24,27 @@ struct list_lru { int list_lru_init(struct list_lru *lru); int list_lru_add(struct list_lru *lru, struct list_head *item); int list_lru_del(struct list_lru *lru, struct list_head *item); -long list_lru_count(struct list_lru *lru); +long list_lru_count_nodemask(struct list_lru *lru, nodemask_t *nodes_to_count); + +static inline long list_lru_count(struct list_lru *lru) +{ + return list_lru_count_nodemask(lru, &lru->active_nodes); +} + typedef int (*list_lru_walk_cb)(struct list_head *item, spinlock_t *lock, void *cb_arg); typedef void (*list_lru_dispose_cb)(struct list_head *dispose_list); -long list_lru_walk(struct list_lru *lru, list_lru_walk_cb isolate, - void *cb_arg, long nr_to_walk); +long list_lru_walk_nodemask(struct list_lru *lru, list_lru_walk_cb isolate, + void *cb_arg, long nr_to_walk, nodemask_t *nodes_to_walk); + +static inline long list_lru_walk(struct list_lru *lru, list_lru_walk_cb isolate, + void *cb_arg, long nr_to_walk) +{ + return list_lru_walk_nodemask(lru, isolate, cb_arg, nr_to_walk, + &lru->active_nodes); +} long list_lru_dispose_all(struct list_lru *lru, list_lru_dispose_cb dispose); diff --git a/lib/list_lru.c b/lib/list_lru.c index 881e342..0f08ed6 100644 --- a/lib/list_lru.c +++ b/lib/list_lru.c @@ -54,13 +54,14 @@ list_lru_del( EXPORT_SYMBOL_GPL(list_lru_del); long -list_lru_count( - struct list_lru *lru) +list_lru_count_nodemask( + struct list_lru *lru, + nodemask_t *nodes_to_count) { long count = 0; int nid; - for_each_node_mask(nid, lru->active_nodes) { + for_each_node_mask(nid, *nodes_to_count) { struct list_lru_node *nlru = &lru->node[nid]; spin_lock(&nlru->lock); @@ -71,7 +72,7 @@ list_lru_count( return count; } -EXPORT_SYMBOL_GPL(list_lru_count); +EXPORT_SYMBOL_GPL(list_lru_count_nodemask); static long list_lru_walk_node( @@ -116,16 +117,17 @@ restart: } long -list_lru_walk( +list_lru_walk_nodemask( struct list_lru *lru, list_lru_walk_cb isolate, void *cb_arg, - long nr_to_walk) + long nr_to_walk, + nodemask_t *nodes_to_walk) { long isolated = 0; int nid; - for_each_node_mask(nid, lru->active_nodes) { + for_each_node_mask(nid, *nodes_to_walk) { isolated += list_lru_walk_node(lru, nid, isolate, cb_arg, &nr_to_walk); if (nr_to_walk <= 0) @@ -133,7 +135,7 @@ list_lru_walk( } return isolated; } -EXPORT_SYMBOL_GPL(list_lru_walk); +EXPORT_SYMBOL_GPL(list_lru_walk_nodemask); long list_lru_dispose_all_node( -- 1.7.10 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/