RFC Fix the v7.3-rc4 DMABUF_DEBUG regression breaking drm/msm hardware video decode
Get series with b4
b4 am [email protected]Versions newest first
- v1 RFC Latest2 patches 7 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/2 | dma-buf: keep DMABUF_DEBUG off by defaultdrivers/ | +8 | 6 replies | |
| 2/2 | drm/msm: reject dma-buf imports without struct page infodrivers/ | +28 | 1 reply |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [RFC PATCH v1 0/2] Fix the v7.3-rc4 DMABUF_DEBUG regression breaking drm/msm hardware video decode
Hardware video decode in clapper and chromium (V4L2 decoder output buffers imported into drm/msm for rendering and scanout) breaks on v7.3-rc4 with arm-smmu translation faults:
gpu fault: ttbr0=000000088a889000 iova=000000010741c000 dir=READ type=TRANSLATION source=UCHE
v7.3-rc3 works fine. Bisecting between the two points at 143755bdabaa9 ("dma-buf: Make DMABUF_DEBUG default to y on DEBUG_KERNEL kernels"), which fixed a dangling reference in the DMABUF_DEBUG default and thereby silently enabled the option - and with it the page-stripping sg_table wrapper that dma_buf_map_attachment() hands to importers - on every kernel with DEBUG_KERNEL=y, i.e. virtually every distro kernel.
drm/msm is affected in two places. It fills the page array of imported GEM objects through the deprecated drm_prime_sg_to_page_array(), and it maps the attachment sg_table into the GPU's own pagetables with iommu_map_sgtable(). Both need the struct page of the sg_table, which the debug wrapper removes (and it zeroes sg->length, so the page iterator yields nothing while the uninitialized page array is kept, with the helper still returning success).
When such an import is used for rendering, the VM_BIND map job then fails asynchronously after userspace has already enqueued GPU work referencing the mapping, which surfaces as the UCHE translation fault above instead of a clean error.
Patch 1 restores the DMABUF_DEBUG default to n until msm can be converted to build its GPU mappings from the attachment's DMA addresses. Patch 2 replaces the deprecated helper in msm with an explicit loop that rejects page-less sg_tables at import time, so userspace gets a clean -EINVAL and can fall back instead of crashing the GPU.
Tested on a Snapdragon laptop with an Adreno GPU and arm-smmu (v7.3-rc4):
- DMABUF_DEBUG off: hardware video decode works as on v7.3-rc3
- DMABUF_DEBUG on, without patch 2: GPU faults as above
- DMABUF_DEBUG on, with patch 2: imports are rejected cleanly ("import of dmabuf from 'videobuf2_dma_contig' rejected: sg_table has no/misaligned struct page info"), no GPU faults. clapper falls back to a working display path; chromium shows a black window as it has no fallback for a failed zero-copy import.
A full fix for DMABUF_DEBUG=y requires msm to map imported buffers from their DMA addresses rather than struct pages; that conversion is left as future work.
Comments welcome.
Jianfeng Liu (2):
dma-buf: keep DMABUF_DEBUG off by default drm/msm: reject dma-buf imports without struct page info
drivers/dma-buf/Kconfig | 9 ++++++++- drivers/gpu/drm/msm/msm_gem.c | 31 ++++++++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 4 deletions(-)
---
base-commit: 93f51579e7df248780214094418f205253383cc5
branch: fix/dmabuf-debug-msm-import
Signature · 1 line
2.47.3