This is a note to let you know that I've just added the patch titled
drm/etnaviv: fix MMU context leak on GPU reset
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-etnaviv-fix-mmu-context-leak-on-gpu-reset.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From f978a5302f5566480c58ffae64a16d34456801bd Mon Sep 17 00:00:00 2001
From: Lucas Stach <l.stach@xxxxxxxxxxxxxx>
Date: Fri, 20 Aug 2021 22:18:28 +0200
Subject: drm/etnaviv: fix MMU context leak on GPU reset
From: Lucas Stach <l.stach@xxxxxxxxxxxxxx>
commit f978a5302f5566480c58ffae64a16d34456801bd upstream.
After a reset the GPU is no longer using the MMU context and may be
restarted with a different context. While the mmu_state proeprly was
cleared, the context wasn't unreferenced, leading to a memory leak.
Cc: stable@xxxxxxxxxxxxxxx # 5.4
Reported-by: Michael Walle <michael@xxxxxxxx>
Signed-off-by: Lucas Stach <l.stach@xxxxxxxxxxxxxx>
Tested-by: Michael Walle <michael@xxxxxxxx>
Tested-by: Marek Vasut <marex@xxxxxxx>
Reviewed-by: Christian Gmeiner <christian.gmeiner@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -563,6 +563,8 @@ static int etnaviv_hw_reset(struct etnav
gpu->fe_running = false;
gpu->exec_state = -1;
+ if (gpu->mmu_context)
+ etnaviv_iommu_context_put(gpu->mmu_context);
gpu->mmu_context = NULL;
return 0;
Patches currently in stable-queue which might be from l.stach@xxxxxxxxxxxxxx are
queue-5.10/drm-etnaviv-put-submit-prev-mmu-context-when-it-exists.patch
queue-5.10/drm-etnaviv-reference-mmu-context-when-setting-up-hardware-state.patch
queue-5.10/drm-etnaviv-stop-abusing-mmu_context-as-fe-running-marker.patch
queue-5.10/drm-etnaviv-return-context-from-etnaviv_iommu_context_get.patch
queue-5.10/drm-etnaviv-keep-mmu-context-across-runtime-suspend-resume.patch
queue-5.10/drm-etnaviv-exec-and-mmu-state-is-lost-when-resetting-the-gpu.patch
queue-5.10/drm-etnaviv-add-missing-mmu-context-put-when-reaping-mmu-mapping.patch
queue-5.10/drm-etnaviv-fix-mmu-context-leak-on-gpu-reset.patch
