OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d650d1f
)
drm/i915: Mark up vma->active as safe for use inside shrinkers
author
Chris Wilson
<chris@chris-wilson.co.uk>
Wed, 3 Jul 2019 09:17:19 +0000
(10:17 +0100)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Wed, 3 Jul 2019 11:24:08 +0000
(12:24 +0100)
Since a shrinker may be forced to wait on GPU activity,
i915_active_wait(&vma->active) must be safe for use inside a shrinker,
and so let's mark up the lock as being acquired by the shrinker to avoid
any nasty surprises creeping in.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/20190703091726.11690-8-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/i915_vma.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_vma.c
b/drivers/gpu/drm/i915/i915_vma.c
index
c20a302
..
ee73baf
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_vma.c
+++ b/
drivers/gpu/drm/i915/i915_vma.c
@@
-22,6
+22,7
@@
*
*/
+#include <linux/sched/mm.h>
#include <drm/drm_gem.h>
#include "display/intel_frontbuffer.h"
@@
-120,6
+121,13
@@
vma_create(struct drm_i915_gem_object *obj,
__i915_vma_active, __i915_vma_retire);
INIT_ACTIVE_REQUEST(&vma->last_fence);
+ /* Declare ourselves safe for use inside shrinkers */
+ if (IS_ENABLED(CONFIG_LOCKDEP)) {
+ fs_reclaim_acquire(GFP_KERNEL);
+ might_lock(&vma->active.mutex);
+ fs_reclaim_release(GFP_KERNEL);
+ }
+
INIT_LIST_HEAD(&vma->closed_link);
if (view && view->type != I915_GGTT_VIEW_NORMAL) {