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

Commit 1495f230 authored by Ying Han's avatar Ying Han Committed by Linus Torvalds
Browse files

vmscan: change shrinker API by passing shrink_control struct 



Change each shrinker's API by consolidating the existing parameters into
shrink_control struct.  This will simplify any further features added w/o
touching each file of shrinker.

[akpm@linux-foundation.org: fix build]
[akpm@linux-foundation.org: fix warning]
[kosaki.motohiro@jp.fujitsu.com: fix up new shrinker API]
[akpm@linux-foundation.org: fix xfs warning]
[akpm@linux-foundation.org: update gfs2]
Signed-off-by: default avatarYing Han <yinghan@google.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Minchan Kim <minchan.kim@gmail.com>
Acked-by: default avatarPavel Emelyanov <xemul@openvz.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Acked-by: default avatarRik van Riel <riel@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: Dave Hansen <dave@linux.vnet.ibm.com>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a09ed5e0

arch/x86/kvm/mmu.c

+2 −1
Original line number Diff line number Diff line
@@ -3545,10 +3545,11 @@ static int kvm_mmu_remove_some_alloc_mmu_pages(struct kvm *kvm, 
	return kvm_mmu_prepare_zap_page(kvm, page, invalid_list);

}



static int mmu_shrink(struct shrinker *shrink, int nr_to_scan, gfp_t gfp_mask)

static int mmu_shrink(struct shrinker *shrink, struct shrink_control *sc)

{

	struct kvm *kvm;

	struct kvm *kvm_freed = NULL;

	int nr_to_scan = sc->nr_to_scan;



	if (nr_to_scan == 0)

		goto out;

drivers/gpu/drm/i915/i915_gem.c

+3 −6
Original line number Diff line number Diff line
@@ -56,9 +56,7 @@ static int i915_gem_phys_pwrite(struct drm_device *dev, 
static void i915_gem_free_object_tail(struct drm_i915_gem_object *obj);



static int i915_gem_inactive_shrink(struct shrinker *shrinker,

				    int nr_to_scan,

				    gfp_t gfp_mask);



				    struct shrink_control *sc);



/* some bookkeeping */

static void i915_gem_info_add_obj(struct drm_i915_private *dev_priv,
@@ -4092,9 +4090,7 @@ i915_gpu_is_active(struct drm_device *dev) 
}



static int

i915_gem_inactive_shrink(struct shrinker *shrinker,

			 int nr_to_scan,

			 gfp_t gfp_mask)

i915_gem_inactive_shrink(struct shrinker *shrinker, struct shrink_control *sc)

{

	struct drm_i915_private *dev_priv =

		container_of(shrinker,
@@ -4102,6 +4098,7 @@ i915_gem_inactive_shrink(struct shrinker *shrinker, 
			     mm.inactive_shrinker);

	struct drm_device *dev = dev_priv->dev;

	struct drm_i915_gem_object *obj, *next;

	int nr_to_scan = sc->nr_to_scan;

	int cnt;



	if (!mutex_trylock(&dev->struct_mutex))

drivers/gpu/drm/ttm/ttm_page_alloc.c

+3 −1
Original line number Diff line number Diff line
@@ -395,12 +395,14 @@ static int ttm_pool_get_num_unused_pages(void) 
/**

 * Callback for mm to request pool to reduce number of page held.

 */

static int ttm_pool_mm_shrink(struct shrinker *shrink, int shrink_pages, gfp_t gfp_mask)

static int ttm_pool_mm_shrink(struct shrinker *shrink,

			      struct shrink_control *sc)

{

	static atomic_t start_pool = ATOMIC_INIT(0);

	unsigned i;

	unsigned pool_offset = atomic_add_return(1, &start_pool);

	struct ttm_page_pool *pool;

	int shrink_pages = sc->nr_to_scan;



	pool_offset = pool_offset % NUM_POOLS;

	/* select start pool in round robin fashion */

drivers/staging/zcache/zcache.c

+4 −1
Original line number Diff line number Diff line
@@ -1181,9 +1181,12 @@ static bool zcache_freeze; 
/*

 * zcache shrinker interface (only useful for ephemeral pages, so zbud only)

 */

static int shrink_zcache_memory(struct shrinker *shrink, int nr, gfp_t gfp_mask)

static int shrink_zcache_memory(struct shrinker *shrink,

				struct shrink_control *sc)

{

	int ret = -1;

	int nr = sc->nr_to_scan;

	gfp_t gfp_mask = sc->gfp_mask;



	if (nr >= 0) {

		if (!(gfp_mask & __GFP_FS))

fs/dcache.c

+6 −2
Original line number Diff line number Diff line
@@ -1220,7 +1220,7 @@ void shrink_dcache_parent(struct dentry * parent) 
EXPORT_SYMBOL(shrink_dcache_parent);



/*

 * Scan `nr' dentries and return the number which remain.

 * Scan `sc->nr_slab_to_reclaim' dentries and return the number which remain.

 *

 * We need to avoid reentering the filesystem if the caller is performing a

 * GFP_NOFS allocation attempt.  One example deadlock is:
@@ -1231,8 +1231,12 @@ EXPORT_SYMBOL(shrink_dcache_parent); 
 *

 * In this case we return -1 to tell the caller that we baled.

 */

static int shrink_dcache_memory(struct shrinker *shrink, int nr, gfp_t gfp_mask)

static int shrink_dcache_memory(struct shrinker *shrink,

				struct shrink_control *sc)

{

	int nr = sc->nr_to_scan;

	gfp_t gfp_mask = sc->gfp_mask;



	if (nr) {

		if (!(gfp_mask & __GFP_FS))

			return -1;