Skip to content

drm/v3d: Widen cache_clean_lock over the whole L2TCACTL sequence#7491

Draft
popcornmix wants to merge 1 commit into
raspberrypi:rpi-6.18.yfrom
popcornmix:v3d_flush_l2t
Draft

drm/v3d: Widen cache_clean_lock over the whole L2TCACTL sequence#7491
popcornmix wants to merge 1 commit into
raspberrypi:rpi-6.18.yfrom
popcornmix:v3d_flush_l2t

Conversation

@popcornmix

Copy link
Copy Markdown
Collaborator

v3d_clean_caches() and v3d_flush_l2t() both write the single L2TCACTL register and poll its status bits. The mutex cache_clean_lock exists to serialize them, but v3d_clean_caches() only took the lock around its final FLM_CLEAN write.

These functions run concurrently: v3d_flush_l2t() is issued from the BIN/RENDER/CSD invalidate path while v3d_clean_caches() runs from the CACHE_CLEAN queue, and each queue's scheduler uses its own ordered workqueue, so their run_job callbacks execute in parallel.

Because clean locked only its final write, a concurrent flush can write L2TCACTL during clean's unlocked phase. Both use non read-modify-write writes to the one register, so whichever lands last wins: clean's TMUWCF write can land on the flush's in-flight L2TFLS invalidate, triggering the GFXH-1897 hazard of writing L2TCACTL while a flush is pending.

Hold cache_clean_lock across the entire L2TCACTL access sequence so it is fully mutually exclusive with v3d_flush_l2t(), which already takes the lock around its own write.

Cc: stable@vger.kernel.org
Fixes: abf888b ("drm/v3d: Wait for pending L2T flush before cleaning caches")

v3d_clean_caches() and v3d_flush_l2t() both write the single L2TCACTL
register and poll its status bits. The mutex cache_clean_lock exists to
serialize them, but v3d_clean_caches() only took the lock around its final
FLM_CLEAN write.

These functions run concurrently: v3d_flush_l2t() is issued from the
BIN/RENDER/CSD invalidate path while v3d_clean_caches() runs from the
CACHE_CLEAN queue, and each queue's scheduler uses its own ordered
workqueue, so their run_job callbacks execute in parallel.

Because clean locked only its final write, a concurrent flush can write
L2TCACTL during clean's unlocked phase. Both use non read-modify-write
writes to the one register, so whichever lands last wins: clean's TMUWCF
write can land on the flush's in-flight L2TFLS invalidate, triggering the
GFXH-1897 hazard of writing L2TCACTL while a flush is pending.

Hold cache_clean_lock across the entire L2TCACTL access sequence so it
is fully mutually exclusive with v3d_flush_l2t(), which already takes the
lock around its own write.

Cc: stable@vger.kernel.org
Fixes: abf888b ("drm/v3d: Wait for pending L2T flush before cleaning caches")
Signed-off-by: Maíra Canal <mcanal@igalia.com>
@popcornmix

Copy link
Copy Markdown
Collaborator Author

Submitting for a test build artefact.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants