drm/i915/execlists: Prevent merging requests with conflicting flags
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 11 Oct 2019 19:03:25 +0000 (20:03 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Sat, 12 Oct 2019 06:54:52 +0000 (07:54 +0100)
We set out-of-bound parameters inside the i915_requests.flags field,
such as disabling preemption or marking the end-of-context. We should
not coalesce consecutive requests if they have differing instructions
as we only inspect the last active request in a context. Thus if we
allow a later request to be merged into the same execution context, it
will mask any of the earlier flags.

References: 2a98f4e65bba ("drm/i915: add infrastructure to hold off preemption on a request")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191011190325.10979-9-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/gt/intel_lrc.c

index 13fa61ed85de81e54db9591bd6a95093ef6c43bd..7f2d28bf9ea33d1ba8dd90e7baf7c87458da5696 100644 (file)
@@ -1208,6 +1208,9 @@ static bool can_merge_rq(const struct i915_request *prev,
        if (i915_request_completed(next))
                return true;
 
+       if (unlikely(prev->flags ^ next->flags) & I915_REQUEST_NOPREEMPT)
+               return false;
+
        if (!can_merge_ctx(prev->hw_context, next->hw_context))
                return false;