OSDN Git Service

drm/i915: use might_lock_nested in get_pages annotation
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 4 Nov 2019 17:37:20 +0000 (18:37 +0100)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Thu, 7 Nov 2019 08:58:54 +0000 (09:58 +0100)
commit74ceefd10b1f40b0b4bc71bcf6fe14d4df66c163
treeb01b9b7ba9e4903bdb240366e67b5a5b5b127e87
parente692b4021a2e48745d4bdac2b2775bdc8f03b433
drm/i915: use might_lock_nested in get_pages annotation

So strictly speaking the existing annotation is also ok, because we
have a chain of

obj->mm.lock#I915_MM_GET_PAGES -> fs_reclaim -> obj->mm.lock

(the shrinker cannot get at an object while we're in get_pages, hence
this is safe). But it's confusing, so try to take the right subclass
of the lock.

This does a bit reduce our lockdep based checking, but then it's also
less fragile, in case we ever change the nesting around.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Will Deacon <will@kernel.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191104173720.2696-3-daniel.vetter@ffwll.ch
drivers/gpu/drm/i915/gem/i915_gem_object.h