| From f4534a0abc80a70771822d798b8517fda0feb26f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 30 Jan 2025 09:19:31 +0000 |
| Subject: drm/i915/selftests: avoid using uninitialized context |
| |
| From: Krzysztof Karas <krzysztof.karas@intel.com> |
| |
| [ Upstream commit 53139b3f9998ea07289e7b70b909fea2264a0de9 ] |
| |
| There is an error path in igt_ppgtt_alloc(), which leads |
| to ww object being passed down to i915_gem_ww_ctx_fini() without |
| initialization. Correct that by only putting ppgtt->vm and |
| returning early. |
| |
| Fixes: 480ae79537b2 ("drm/i915/selftests: Prepare gtt tests for obj->mm.lock removal") |
| Signed-off-by: Krzysztof Karas <krzysztof.karas@intel.com> |
| Reviewed-by: Mikolaj Wasiak <mikolaj.wasiak@intel.com> |
| Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> |
| Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/iuaonpjc3rywmvhna6umjlvzilocn2uqsrxfxfob24e2taocbi@lkaivvfp4777 |
| (cherry picked from commit 8d8334632ea62424233ac6529712868241d0f8df) |
| Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c |
| index e050a2de5fd1d..e25f76b46b0a4 100644 |
| --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c |
| +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c |
| @@ -164,7 +164,7 @@ static int igt_ppgtt_alloc(void *arg) |
| return PTR_ERR(ppgtt); |
| |
| if (!ppgtt->vm.allocate_va_range) |
| - goto err_ppgtt_cleanup; |
| + goto ppgtt_vm_put; |
| |
| /* |
| * While we only allocate the page tables here and so we could |
| @@ -232,7 +232,7 @@ static int igt_ppgtt_alloc(void *arg) |
| goto retry; |
| } |
| i915_gem_ww_ctx_fini(&ww); |
| - |
| +ppgtt_vm_put: |
| i915_vm_put(&ppgtt->vm); |
| return err; |
| } |
| -- |
| 2.39.5 |
| |
