Attachment 85712 Details for Bug 69247 – patch 2

[patch] patch 2

0002-mm-shrinker-flag-to-always-shrink-a-bit.patch (text/plain), 1.88 KB, created by Daniel Vetter on 2013-09-12 11:24:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2013-09-12 11:24:05 UTC

Size: 1.88 KB

patch

obsolete

>From 9bf3a335bed6b2212c937e291116675b1771f6c0 Mon Sep 17 00:00:00 2001
>From: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date: Thu, 12 Sep 2013 13:22:16 +0200
>Subject: [PATCH 2/2] mm/shrinker: flag to always shrink a bit
>
>Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>---
> drivers/gpu/drm/i915/i915_gem.c | 2 +-
> include/linux/shrinker.h        | 2 ++
> mm/vmscan.c                     | 4 ++++
> 3 files changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index 411f10e..5cae798 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -4582,7 +4582,7 @@ i915_gem_load(struct drm_device *dev)
> 
> 	dev_priv->mm.inactive_shrinker.shrink = i915_gem_inactive_shrink;
> 	dev_priv->mm.inactive_shrinker.seeks = 1;
>-	dev_priv->mm.inactive_shrinker.seeks = DEFAULT_SEEKS;
>+	dev_priv->mm.inactive_shrinker.shrink_me_harder = true;
> 	register_shrinker(&dev_priv->mm.inactive_shrinker);
> }
> 
>diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h
>index ac6b8ee..42eb181 100644
>--- a/include/linux/shrinker.h
>+++ b/include/linux/shrinker.h
>@@ -32,6 +32,8 @@ struct shrinker {
> 	int seeks;	/* seeks to recreate an obj */
> 	long batch;	/* reclaim batch size, 0 = default */
> 
>+	bool shrink_me_harder;
>+
> 	/* These are for internal use */
> 	struct list_head list;
> 	atomic_long_t nr_in_batch; /* objs pending delete */
>diff --git a/mm/vmscan.c b/mm/vmscan.c
>index 2cff0d4..4ae9cd3 100644
>--- a/mm/vmscan.c
>+++ b/mm/vmscan.c
>@@ -254,6 +254,10 @@ unsigned long shrink_slab(struct shrink_control *shrink,
> 			total_scan = max_pass;
> 		}
> 
>+		/* Always try to shrink a bit to make forward progress. */
>+		if (shrinker->shrink_me_harder)
>+			total_scan = max_t(long, total_scan, batch_size);
>+
> 		/*
> 		 * We need to avoid excessive windup on filesystem shrinkers
> 		 * due to large numbers of GFP_NOFS allocations causing the
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 69247: 85686 | 85711 | 85712 | 85750 | 85896 | 85966 | 86556 | 86782 | 90006 | 90124 | 95070 | 95294 | 99464 | 99601

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.