iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Mark requests for GuC virtual engines to avoid use-after-free (Andrzej).

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEbSBwaO7dZQkcLOKj+mJfZA7rE8oFAmTxBb8ACgkQ+mJfZA7r
 E8oO+wf+MCMDTGW5eFRsr0JFgUo6mvcKqrNQjAKro+BaHK/Y/uvbOK1/IAMBjsC2
 H48G5Pnli2GVpSbsmjKlZgZwIcuZQmeiGktgHULDMlEpcL6703GJEHsaktlgDlEw
 EGsr6eE5ElWkAcQq/w5Hs2O0CsNbpT1SUjJXKFBMhX5BvhBmaK+oU4beenqfzyC8
 ngxn65z0btZ2AtmQ8I56cxCUrLPjPY2epu10XIvr5euXG+Qzj5qr6smSHSyFbA+8
 C5YK/vGxWxtppF2kdQc8hjCW5VSWzLLGttsEN+rgYufaHHcpGhAgTLpVH/KSF+iJ
 NbbIckdkacZOILFsnEEm0hLtIZXuLA==
 =CO5h
 -----END PGP SIGNATURE-----

Merge tag 'drm-intel-next-fixes-2023-08-31' of git://anongit.freedesktop.org/drm/drm-intel into drm-next

- Mark requests for GuC virtual engines to avoid use-after-free (Andrzej).

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZPEGEeP2EwCtx9hM@intel.com
This commit is contained in:
Dave Airlie 2023-09-08 10:35:17 +10:00
commit 51eed9d4ce
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/i915/gt/intel_engine_types.h
View File

@ -58,6 +58,7 @@ struct i915_perf_group;
typedef u32 intel_engine_mask_t; typedef u32 intel_engine_mask_t;
#define ALL_ENGINES ((intel_engine_mask_t)~0ul) #define ALL_ENGINES ((intel_engine_mask_t)~0ul)
#define VIRTUAL_ENGINES BIT(BITS_PER_TYPE(intel_engine_mask_t) - 1)
struct intel_hw_status_page { struct intel_hw_status_page {
struct list_head timelines; struct list_head timelines;

3
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
View File

@ -5470,6 +5470,9 @@ guc_create_virtual(struct intel_engine_cs **siblings, unsigned int count,
ve->base.flags = I915_ENGINE_IS_VIRTUAL; ve->base.flags = I915_ENGINE_IS_VIRTUAL;
BUILD_BUG_ON(ilog2(VIRTUAL_ENGINES) < I915_NUM_ENGINES);
ve->base.mask = VIRTUAL_ENGINES;
intel_context_init(&ve->context, &ve->base); intel_context_init(&ve->context, &ve->base);
for (n = 0; n < count; n++) { for (n = 0; n < count; n++) {

7
drivers/gpu/drm/i915/i915_request.c
View File

@ -134,9 +134,7 @@ static void i915_fence_release(struct dma_fence *fence)
i915_sw_fence_fini(&rq->semaphore); i915_sw_fence_fini(&rq->semaphore);
/* /*
* Keep one request on each engine for reserved use under mempressure * Keep one request on each engine for reserved use under mempressure.
* do not use with virtual engines as this really is only needed for
* kernel contexts.
* *
* We do not hold a reference to the engine here and so have to be * We do not hold a reference to the engine here and so have to be
* very careful in what rq->engine we poke. The virtual engine is * very careful in what rq->engine we poke. The virtual engine is
@ -166,8 +164,7 @@ static void i915_fence_release(struct dma_fence *fence)
* know that if the rq->execution_mask is a single bit, rq->engine * know that if the rq->execution_mask is a single bit, rq->engine
* can be a physical engine with the exact corresponding mask. * can be a physical engine with the exact corresponding mask.
*/ */
if (!intel_engine_is_virtual(rq->engine) && if (is_power_of_2(rq->execution_mask) &&
is_power_of_2(rq->execution_mask) &&
!cmpxchg(&rq->engine->request_pool, NULL, rq)) !cmpxchg(&rq->engine->request_pool, NULL, rq))
return; return;