Attachment 94529 Details for Bug 72742 – 3. Writeback our pages under memory pressure

[patch] 3. Writeback our pages under memory pressure

0001-drm-i915-Writeback-our-pages-under-memory-pressure.patch (text/plain), 3.54 KB, created by Chris Wilson on 2014-02-21 17:18:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2014-02-21 17:18:00 UTC

Size: 3.54 KB

patch

obsolete

>From 6659fa61f6596c532d43ad6f66370a4254598861 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Fri, 21 Feb 2014 12:32:13 +0000
>Subject: [PATCH] drm/i915: Writeback our pages under memory pressure
>
>Try to flush out dirty pages into the swapcache (and from there into the
>swapfile) when under memory pressure and forced to drop GEM objects from
>memory.
>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/i915_gem.c |   48 +++++++++++++++++++++++++++++----------
> 1 file changed, 36 insertions(+), 12 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index 957f02c..69c0199 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -34,6 +34,7 @@
> #include <linux/shmem_fs.h>
> #include <linux/slab.h>
> #include <linux/swap.h>
>+#include <linux/writeback.h>
> #include <linux/pci.h>
> #include <linux/dma-buf.h>
> 
>@@ -63,7 +64,6 @@ static unsigned long i915_gem_inactive_scan(struct shrinker *shrinker,
> 					    struct shrink_control *sc);
> static unsigned long i915_gem_purge(struct drm_i915_private *dev_priv, long target);
> static unsigned long i915_gem_shrink_all(struct drm_i915_private *dev_priv);
>-static void i915_gem_object_truncate(struct drm_i915_gem_object *obj);
> 
> static bool cpu_cache_is_coherent(struct drm_device *dev,
> 				  enum i915_cache_level level)
>@@ -1772,12 +1772,16 @@ i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data,
> 	return i915_gem_mmap_gtt(file, dev, args->handle, &args->offset);
> }
> 
>+static inline int
>+i915_gem_object_is_purgeable(struct drm_i915_gem_object *obj)
>+{
>+	return obj->madv == I915_MADV_DONTNEED;
>+}
>+
> /* Immediately discard the backing storage */
> static void
> i915_gem_object_truncate(struct drm_i915_gem_object *obj)
> {
>-	struct inode *inode;
>-
> 	i915_gem_object_free_mmap_offset(obj);
> 
> 	if (obj->base.filp == NULL)
>@@ -1788,16 +1792,35 @@ i915_gem_object_truncate(struct drm_i915_gem_object *obj)
> 	 * To do this we must instruct the shmfs to drop all of its
> 	 * backing pages, *now*.
> 	 */
>-	inode = file_inode(obj->base.filp);
>-	shmem_truncate_range(inode, 0, (loff_t)-1);
>-
>+	shmem_truncate_range(file_inode(obj->base.filp), 0, (loff_t)-1);
> 	obj->madv = __I915_MADV_PURGED;
> }
> 
>-static inline int
>-i915_gem_object_is_purgeable(struct drm_i915_gem_object *obj)
>-{
>-	return obj->madv == I915_MADV_DONTNEED;
>+/* Try to discard unwanted pages */
>+static void
>+i915_gem_object_writeback(struct drm_i915_gem_object *obj)
>+{
>+	struct writeback_control wbc = {
>+		.nr_to_write = LONG_MAX,
>+		.sync_mode = WB_SYNC_NONE,
>+		.range_start = 0,
>+		.range_end = LLONG_MAX,
>+	};
>+	struct address_space *mapping;
>+
>+	switch (obj->madv) {
>+	case I915_MADV_DONTNEED:
>+		i915_gem_object_truncate(obj);
>+	case __I915_MADV_PURGED:
>+		return;
>+	}
>+
>+	if (obj->base.filp == NULL)
>+		return;
>+
>+	mapping = file_inode(obj->base.filp)->i_mapping,
>+	generic_writepages(mapping, &wbc);
>+	invalidate_mapping_pages(mapping, 0, (loff_t)-1);
> }
> 
> static void
>@@ -1862,8 +1885,7 @@ i915_gem_object_put_pages(struct drm_i915_gem_object *obj)
> 	ops->put_pages(obj);
> 	obj->pages = NULL;
> 
>-	if (i915_gem_object_is_purgeable(obj))
>-		i915_gem_object_truncate(obj);
>+	i915_gem_object_writeback(obj);
> 
> 	return 0;
> }
>@@ -4282,6 +4304,8 @@ void i915_gem_free_object(struct drm_gem_object *gem_obj)
> 
> 	if (WARN_ON(obj->pages_pin_count))
> 		obj->pages_pin_count = 0;
>+	if (obj->madv != __I915_MADV_PURGED)
>+		obj->madv = I915_MADV_DONTNEED;
> 	i915_gem_object_put_pages(obj);
> 	i915_gem_object_free_mmap_offset(obj);
> 	i915_gem_object_release_stolen(obj);
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 72742: 90818 | 92039 | 92133 | 92134 | 94529 | 94705 | 94717 | 94718 | 94719 | 95000 | 95580 | 96818 | 96825 | 96883 | 97060 | 97161 | 97332 | 98103 | 98104 | 98212 | 98398 | 98670 | 98671 | 99462 | 99567 | 99919 | 100010 | 100011 | 106829 | 114604

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.