]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915/selftests: mark huge_gem_object as not shrinkable
authorMatthew Auld <matthew.auld@intel.com>
Mon, 23 Mar 2020 13:08:21 +0000 (13:08 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 23 Mar 2020 13:49:31 +0000 (13:49 +0000)
It looks like some callers expect a non-volatile object, that they do not
want the contents of the pages lost if they happen to not be looking at it.
The shrinker however sees that we mark the pages as DONTNEED and
believes that it can freely reap them. However, since the huge object
use plain pages, they cannot be swapped out as they have no backing
storge, and the only way we can shrink them is by discarding the
contents. In light of the callers wanting to keep the contents around,
both IS_SHRINKABLE and marking the pages as volatile are incorrect.

If we drop the IS_SHRINKABLE flag we avoid the immediate issue of the
shrinker accidentally removing valuable content. We will have to
remember that a huge object is not suitable for exercising the shrinker
interaction -- although we can introduce a shrinkable one if we require.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200323130821.47914-1-matthew.auld@intel.com
drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c

index fa16f2c3f3ac538b4b982eb51d4471ccbe83675b..2b46c6530da9eb3b55ed42b6d97351b47165905d 100644 (file)
@@ -88,8 +88,7 @@ static void huge_put_pages(struct drm_i915_gem_object *obj,
 }
 
 static const struct drm_i915_gem_object_ops huge_ops = {
-       .flags = I915_GEM_OBJECT_HAS_STRUCT_PAGE |
-                I915_GEM_OBJECT_IS_SHRINKABLE,
+       .flags = I915_GEM_OBJECT_HAS_STRUCT_PAGE,
        .get_pages = huge_get_pages,
        .put_pages = huge_put_pages,
 };