Skip to content

drm: Revert general use of struct drm_gem_object.dma_buf

Thomas Zimmermann dri-devel intel-gfx stable virtualization 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest7 patches 1 replyIn review
  2. v27 patches 1 replySuperseded
  3. v19 patches 18 repliesSuperseded

Changes in v3 from the cover letter

- cc stable where necessary

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7Revert "drm/virtio: Use dma_buf from GEM object instance"drivers/gpu/drm/virtio/virtgpu_prime.c+3 -20 replies
2/7Revert "drm/vmwgfx: Use dma_buf from GEM object instance"drivers/gpu/drm/vmwgfx/vmwgfx_gem.c+3 -30 replies
3/7Revert "drm/etnaviv: Use dma_buf from GEM object instance"drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c+2 -20 replies
4/7Revert "drm/prime: Use dma_buf from GEM object instance"drivers/gpu/drm/drm_prime.c+7 -10 replies
5/7Revert "drm/gem-framebuffer: Use dma_buf from GEM object instance"drivers/gpu/drm/drm_gem_framebuffer_helper.c+6 -20 replies
6/7Revert "drm/gem-shmem: Use dma_buf from GEM object instance"drivers/gpu/drm/drm_gem_shmem_helper.c+2 -20 replies
7/7Revert "drm/gem-dma: Use dma_buf from GEM object instance"drivers/gpu/drm/drm_gem_dma_helper.c+1 -10 replies

Reviews trailers per patch

All 7 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchSimona VetterChristian KönigZack Rusin
SeriesA-b
1/7R-b A-b
2/7R-b A-b
3/7R-b A-b
4/7R-b A-b
5/7R-b A-b
6/7R-b A-b
7/7R-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v3 thread

Cover letter [PATCH v3 0/7] drm: Revert general use of struct drm_gem_object.dma_buf

Revert the use of drm_gem_object.dma_buf back to .import_attach->dmabuf in the affected places. Separates references to imported and exported DMA bufs within a GEM object; as before.

The dma_buf field in struct drm_gem_object is not stable over the object instance's lifetime. The field becomes NULL when user space releases the final GEM handle on the buffer object. This resulted in a NULL-pointer deref.

Workarounds in commit 5307dce878d4 ("drm/gem: Acquire references on GEM handles for framebuffers") and commit f6bfc9afc751 ("drm/framebuffer:
Acquire internal references on GEM handles") only solved the problem partially. They especially don't work for buffer objects without a DRM framebuffer associated.

v3:
- cc stable where necessary
v2:
- extended commit messages (Sima)
- drop the GEM-handle changes to be resolved separately

Thomas Zimmermann (7):
Revert "drm/virtio: Use dma_buf from GEM object instance" Revert "drm/vmwgfx: Use dma_buf from GEM object instance" Revert "drm/etnaviv: Use dma_buf from GEM object instance" Revert "drm/prime: Use dma_buf from GEM object instance" Revert "drm/gem-framebuffer: Use dma_buf from GEM object instance" Revert "drm/gem-shmem: Use dma_buf from GEM object instance" Revert "drm/gem-dma: Use dma_buf from GEM object instance"

 drivers/gpu/drm/drm_gem_dma_helper.c         | 2 +-
 drivers/gpu/drm/drm_gem_framebuffer_helper.c | 8 ++++++--
 drivers/gpu/drm/drm_gem_shmem_helper.c       | 4 ++--
 drivers/gpu/drm/drm_prime.c                  | 8 +++++++-
 drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c  | 4 ++--
 drivers/gpu/drm/virtio/virtgpu_prime.c       | 5 +++--
 drivers/gpu/drm/vmwgfx/vmwgfx_gem.c          | 6 +++---
 7 files changed, 24 insertions(+), 13 deletions(-)
Signature · 1 line
2.50.0