Attachment 90006 Details for Bug 69247 – Include active objects in the shrinker count

[patch] Include active objects in the shrinker count

0001-drm-i915-Include-bound-and-active-pages-in-the-count.patch (text/plain), 1.36 KB, created by Chris Wilson on 2013-11-29 22:31:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2013-11-29 22:31:52 UTC

Size: 1.36 KB

patch

obsolete

>From 7799bee7a27eeff586bc88cb3aa7fe18cfc5bda9 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Fri, 29 Nov 2013 22:30:39 +0000
>Subject: [PATCH] drm/i915: Include bound and active pages in the count of
> shrinkable objects
>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/i915_gem.c | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index 6786c8d..ffad111 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -5066,6 +5066,19 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
> #endif
> }
> 
>+static int num_vma_bound(struct drm_i915_gem_object *obj)
>+{
>+	struct i915_vma *vma;
>+	int count = 0;
>+
>+	list_for_each_entry(vma, &obj->vma_list, vma_link)
>+		if (drm_mm_node_allocated(&vma->node))
>+			count++;
>+
>+	return count;
>+
>+}
>+
> static unsigned long
> i915_gem_inactive_count(struct shrinker *shrinker, struct shrink_control *sc)
> {
>@@ -5097,7 +5110,8 @@ i915_gem_inactive_count(struct shrinker *shrinker, struct shrink_control *sc)
> 		if (obj->active)
> 			continue;
> 
>-		if (obj->pin_count == 0 && obj->pages_pin_count == 0)
>+		if (obj->pin_count == 0 &&
>+		    obj->pages_pin_count == num_vma_bound(obj))
> 			count += obj->base.size >> PAGE_SHIFT;
> 	}
> 
>-- 
>1.8.4.4
>

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.