drm/v3d: Add job to pending list if the reset was skipped#6822
Merged
pelwell merged 1 commit intoraspberrypi:rpi-6.12.yfrom Apr 29, 2025
Merged
drm/v3d: Add job to pending list if the reset was skipped#6822pelwell merged 1 commit intoraspberrypi:rpi-6.12.yfrom
pelwell merged 1 commit intoraspberrypi:rpi-6.12.yfrom
Conversation
When a CL/CSD job times out, we check if the GPU has made any progress since the last timeout. If so, instead of resetting the hardware, we skip the reset and let the timer get rearmed. This gives long-running jobs a chance to complete. However, when `timedout_job()` is called, the job in question is removed from the pending list, which means it won't be automatically freed through `free_job()`. Consequently, when we skip the reset and keep the job running, the job won't be freed when it finally completes. This situation leads to a memory leak, as exposed in [1]. Similarly to commit 704d3d6 ("drm/etnaviv: don't block scheduler when GPU is still active"), this patch ensures the job is put back on the pending list when extending the timeout. Cc: stable@vger.kernel.org # 6.0 Link: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12227 [1] Reported-by: Daivik Bhatia <dtgs1208@gmail.com> Signed-off-by: Maíra Canal <mcanal@igalia.com>
popcornmix
added a commit
to raspberrypi/firmware
that referenced
this pull request
Apr 30, 2025
See: raspberrypi/linux#6824 kernel: DT: arm: bcm2712: re-add mmio-hi ranges for pciex1 See: raspberrypi/linux#6825 kernel: Add DT controlled XTRIG control to imx296 See: raspberrypi/linux#6827 kernel: drm/v3d: Add job to pending list if the reset was skipped See: raspberrypi/linux#6822 kernel: drivers: media: i2c: imx335: Fix frame size enumeration See: raspberrypi/linux#6829
popcornmix
added a commit
to raspberrypi/rpi-firmware
that referenced
this pull request
Apr 30, 2025
See: raspberrypi/linux#6824 kernel: DT: arm: bcm2712: re-add mmio-hi ranges for pciex1 See: raspberrypi/linux#6825 kernel: Add DT controlled XTRIG control to imx296 See: raspberrypi/linux#6827 kernel: drm/v3d: Add job to pending list if the reset was skipped See: raspberrypi/linux#6822 kernel: drivers: media: i2c: imx335: Fix frame size enumeration See: raspberrypi/linux#6829
Contributor
|
I just sent a v2 of this patch [1] as v1 doesn't use the DRM sched internal lock, which can lead to a possible race condition. I'd appreciate it if you could take v2 in the tree. [1] [PATCH v2] drm/v3d: Add job to pending list if the reset was skipped |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
[ Potential fix for #6817 ]
When a CL/CSD job times out, we check if the GPU has made any progress since the last timeout. If so, instead of resetting the hardware, we skip the reset and let the timer get rearmed. This gives long-running jobs a chance to complete.
However, when
timedout_job()is called, the job in question is removed from the pending list, which means it won't be automatically freed throughfree_job(). Consequently, when we skip the reset and keep the job running, the job won't be freed when it finally completes.This situation leads to a memory leak, as exposed in [1].
Similarly to commit 704d3d6 ("drm/etnaviv: don't block scheduler when GPU is still active"), this patch ensures the job is put back on the pending list when extending the timeout.
Cc: stable@vger.kernel.org # 6.0
Link: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12227 [1]
Reported-by: Daivik Bhatia dtgs1208@gmail.com