drm/i915/gem: Don't leak non-persistent requests on changing engines

Browse source

If we have a set of active engines marked as being non-persistent, we
lose track of those if the user replaces those engines with
I915_CONTEXT_PARAM_ENGINES. As part of our uABI contract is that
non-persistent requests are terminated if they are no longer being
tracked by the user's context (in order to prevent a lost request
causing an untracked and so unstoppable GPU hang), we need to apply the
same context cancellation upon changing engines.

v2: Track stale engines[] so we only reap at context closure.
v3: Tvrtko spotted races with closing contexts and set-engines, so add a
veneer of kill-everything paranoia to clean up after losing a race.

Fixes: a0e047156c ("drm/i915/gem: Make context persistence optional")
Testcase: igt/gem_ctx_peristence/replace
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200211144831.1011498-1-chris@chris-wilson.co.uk

...

This commit is contained in:

Chris Wilson 2020-02-11 14:48:31 +00:00

parent 0b02f97f40

commit 42fb60de31

4 changed files with 141 additions and 13 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

122

drivers/gpu/drm/i915/gem/i915_gem_context.c

View file

13

drivers/gpu/drm/i915/gem/i915_gem_context_types.h

View file

17

drivers/gpu/drm/i915/i915_sw_fence.c

View file

2

drivers/gpu/drm/i915/i915_sw_fence.h

View file