bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-26 14:17:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/i915: Invalidate our pages under memory pressure

Browse source 
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. In effect, this should just allow us to discard unused pages for
memory reclaim and to start writeback earlier.

v2: Hugh Dickins warned that explicitly starting writeback from
shrink_slab was prone to deadlocks within shmemfs.

Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Robert Beckett <robert.beckett@intel.com>
Reviewed-by: Rafael Barbalho <rafael.barbalho@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Chris Wilson 2014-03-25 13:23:06 +00:00 • committed by Daniel Vetter
parent b453c4dbc3
commit 5537252b6b
1 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

38
drivers/gpu/drm/i915/i915_gem.c
View file

@ -63,7 +63,6 @@ static unsigned long i915_gem_shrinker_scan(struct shrinker *shrinker,
struct shrink_control *sc); struct shrink_control *sc);
static unsigned long i915_gem_purge(struct drm_i915_private *dev_priv, long target); 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 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, static bool cpu_cache_is_coherent(struct drm_device *dev,
enum i915_cache_level level) enum i915_cache_level level)
@ -1691,12 +1690,16 @@ i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data,
return i915_gem_mmap_gtt(file, dev, args->handle, &args->offset); 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 */ /* Immediately discard the backing storage */
static void static void
i915_gem_object_truncate(struct drm_i915_gem_object *obj) i915_gem_object_truncate(struct drm_i915_gem_object *obj)
{ {
struct inode *inode;
i915_gem_object_free_mmap_offset(obj); i915_gem_object_free_mmap_offset(obj);
if (obj->base.filp == NULL) if (obj->base.filp == NULL)
@ -1707,16 +1710,28 @@ i915_gem_object_truncate(struct drm_i915_gem_object *obj)
* To do this we must instruct the shmfs to drop all of its * To do this we must instruct the shmfs to drop all of its
* backing pages, *now*. * backing pages, *now*.
*/ */
inode = file_inode(obj->base.filp); shmem_truncate_range(file_inode(obj->base.filp), 0, (loff_t)-1);
shmem_truncate_range(inode, 0, (loff_t)-1);
obj->madv = __I915_MADV_PURGED; obj->madv = __I915_MADV_PURGED;
} }
static inline int /* Try to discard unwanted pages */
i915_gem_object_is_purgeable(struct drm_i915_gem_object *obj) static void
i915_gem_object_invalidate(struct drm_i915_gem_object *obj)
{ {
return obj->madv == I915_MADV_DONTNEED; 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,
invalidate_mapping_pages(mapping, 0, (loff_t)-1);
} }
static void static void
@ -1781,8 +1796,7 @@ i915_gem_object_put_pages(struct drm_i915_gem_object *obj)
ops->put_pages(obj); ops->put_pages(obj);
obj->pages = NULL; obj->pages = NULL;
if (i915_gem_object_is_purgeable(obj)) i915_gem_object_invalidate(obj);
i915_gem_object_truncate(obj);
return 0; return 0;
} }
@ -4266,6 +4280,8 @@ void i915_gem_free_object(struct drm_gem_object *gem_obj)
if (WARN_ON(obj->pages_pin_count)) if (WARN_ON(obj->pages_pin_count))
obj->pages_pin_count = 0; 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_put_pages(obj);
i915_gem_object_free_mmap_offset(obj); i915_gem_object_free_mmap_offset(obj);
i915_gem_object_release_stolen(obj); i915_gem_object_release_stolen(obj);