FAILED: patch "[PATCH] Revert "drm/gem-shmem: Use dma_buf from GEM object instance"" failed to apply to 6.15-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.15.y
git checkout FETCH_HEAD
git cherry-pick -x 6d496e9569983a0d7a05be6661126d0702cf94f7
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025072830-reveler-drop-down-d571@gregkh' --subject-prefix 'PATCH 6.15.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 6d496e9569983a0d7a05be6661126d0702cf94f7 Mon Sep 17 00:00:00 2001
From: Thomas Zimmermann <[email protected]>
Date: Tue, 15 Jul 2025 17:58:16 +0200
Subject: [PATCH] Revert "drm/gem-shmem: Use dma_buf from GEM object instance"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 1a148af06000e545e714fe3210af3d77ff903c11.
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.
Hence, this revert to going back to using .import_attach->dmabuf.
v3:
- cc stable
drivers/gpu/drm/drm_gem_shmem_helper.c +2 -2
@@ -349,7 +349,7 @@ int drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem,int ret =0 ;if (drm_gem_is_imported (obj)) { - ret =dma_buf_vmap (obj->dma_buf, map); + ret =dma_buf_vmap (obj->import_attach->dmabuf, map); }else {pgprot_t prot =PAGE_KERNEL ;
@@ -409,7 +409,7 @@ void drm_gem_shmem_vunmap_locked(struct drm_gem_shmem_object *shmem,struct drm_gem_object *obj = &shmem->base;if (drm_gem_is_imported (obj)) { -dma_buf_vunmap (obj->dma_buf, map); +dma_buf_vunmap (obj->import_attach->dmabuf, map); }else {dma_resv_assert_held (shmem->base.resv);
Sasha Levin
maintainerPATCH 1/2 drm/shmem-helper: Remove obsoleted is_iomem test
From: Dmitry Osipenko <[email protected]>
[ Upstream commit eab10538073c3ff9e21c857bd462f79f2f6f7e00 ]
Everything that uses the mapped buffer should be agnostic to is_iomem. The only reason for the is_iomem test is that we're setting shmem->vaddr to the returned map->vaddr. Now that the shmem->vaddr code is gone, remove the obsoleted is_iomem test to clean up the code.
Stable-dep-of: 6d496e956998 ("Revert "drm/gem-shmem: Use dma_buf from GEM object instance"")
--- drivers/gpu/drm/drm_gem_shmem_helper.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/gpu/drm/drm_gem_shmem_helper.c +0 -6
@@ -340,12 +340,6 @@ int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem,if (drm_gem_is_imported (obj)) { ret =dma_buf_vmap (obj->dma_buf, map); -if (!ret) { -if (drm_WARN_ON (obj->dev, map->is_iomem)) { -dma_buf_vunmap (obj->dma_buf, map); -return -EIO ; - } - } }else {pgprot_t prot =PAGE_KERNEL ;
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 2/2 Revert "drm/gem-shmem: Use dma_buf from GEM object instance"
From: Thomas Zimmermann <[email protected]>
[ Upstream commit 6d496e9569983a0d7a05be6661126d0702cf94f7 ]
This reverts commit 1a148af06000e545e714fe3210af3d77ff903c11.
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.
Hence, this revert to going back to using .import_attach->dmabuf.
v3:
- cc stable
--- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_gem_shmem_helper.c +2 -2
@@ -339,7 +339,7 @@ int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem,int ret =0 ;if (drm_gem_is_imported (obj)) { - ret =dma_buf_vmap (obj->dma_buf, map); + ret =dma_buf_vmap (obj->import_attach->dmabuf, map); }else {pgprot_t prot =PAGE_KERNEL ;
@@ -399,7 +399,7 @@ void drm_gem_shmem_vunmap(struct drm_gem_shmem_object *shmem,struct drm_gem_object *obj = &shmem->base;if (drm_gem_is_imported (obj)) { -dma_buf_vunmap (obj->dma_buf, map); +dma_buf_vunmap (obj->import_attach->dmabuf, map); }else {dma_resv_assert_held (shmem->base.resv);
Signature · 1 line
2.39.5