drm/shmem-helper: Fix unsetting shmem vaddr while vmap refcount > 0
Subsystems (2)
PATCH 1/1 drm/shmem-helper: Fix unsetting shmem vaddr while vmap refcount > 0
We switched to use refcount_t for vmaps and missed to change the vunmap code to properly unset the vmap pointer, which is now cleared while vmap's refcount > 0. Clear the cached vmap pointer only when refcounting drops to zero to fix the bug.
--- 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
@@ -415,11 +415,11 @@ void drm_gem_shmem_vunmap_locked(struct drm_gem_shmem_object *shmem,if (refcount_dec_and_test (&shmem->vmap_use_count)) {vunmap (shmem->vaddr); + shmem->vaddr =NULL ; +drm_gem_shmem_unpin_locked (shmem); } } - - shmem->vaddr =NULL ; }EXPORT_SYMBOL_GPL (drm_gem_shmem_vunmap_locked);
Signature · 1 line
2.49.0
Quoted 9 lines · On Thu, 3 Apr 2025 17:26:33 +0300 Dmitry Osipenko…
We switched to use
refcount_tfor vmaps and missed to change the vunmap code to properly unset the vmap pointer, which is now cleared while vmap's refcount > 0. Clear the cached vmap pointer only when refcounting drops to zero to fix the bug.Fixes e1fc39a92332 ("drm/shmem-helper: Use refcount_t for vmap_use_count")Reported-by Lucas De Marchi <[email protected]>Closes https://lore.kernel.org/dri-devel/[email protected]/T/#m3dca6d81bedc8d6146a56b82694624fbc6fa4c96 open hereSigned-off-by Dmitry Osipenko <[email protected]>
Quoted 22 lines
--- 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@@ -415,11 +415,11 @@ void drm_gem_shmem_vunmap_locked(struct drm_gem_shmem_object *shmem,if (refcount_dec_and_test (&shmem->vmap_use_count)) {vunmap (shmem->vaddr); + shmem->vaddr =NULL ; +drm_gem_shmem_unpin_locked (shmem); } } - - shmem->vaddr =NULL ; }EXPORT_SYMBOL_GPL (drm_gem_shmem_vunmap_locked);
Quoted 9 lines · Dmitry Osipenko
We switched to use
refcount_tfor vmaps and missed to change the vunmap code to properly unset the vmap pointer, which is now cleared while vmap's refcount > 0. Clear the cached vmap pointer only when refcounting drops to zero to fix the bug.Fixes e1fc39a92332 ("drm/shmem-helper: Use refcount_t for vmap_use_count")Reported-by Lucas De Marchi <[email protected]>Closes https://lore.kernel.org/dri-devel/[email protected]/T/#m3dca6d81bedc8d6146a56b82694624fbc6fa4c96 open hereSigned-off-by Dmitry Osipenko <[email protected]>
this fixes it for me when using qemu ... -device cirrus-vga
thanks
Lucas De Marchi
Dmitry Osipenko
AppliedQuoted 21 lines · Dmitry Osipenko
We switched to use
refcount_tfor vmaps and missed to change the vunmap code to properly unset the vmap pointer, which is now cleared while vmap's refcount > 0. Clear the cached vmap pointer only when refcounting drops to zero to fix the bug.Fixes e1fc39a92332 ("drm/shmem-helper: Use refcount_t for vmap_use_count")Reported-by Lucas De Marchi <[email protected]>Closes https://lore.kernel.org/dri-devel/[email protected]/T/#m3dca6d81bedc8d6146a56b82694624fbc6fa4c96 open hereSigned-off-by Dmitry Osipenko <[email protected]>--- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/drm_gem_shmem_helper.c +0
-0@@ -415,11 +415,11 @@ void drm_gem_shmem_vunmap_locked(struct drm_gem_shmem_object *shmem,if (refcount_dec_and_test (&shmem->vmap_use_count)) {vunmap (shmem->vaddr);
drivers/gpu/drm/drm_gem_shmem_helper.c void drm_gem_shmem_vunmap_locked(struct drm_gem_shmem_object *shmem, · line 425
Quoted 10 lines
drivers/gpu/drm/drm_gem_shmem_helper.c +2
-2+ shmem->vaddr =NULL ; +drm_gem_shmem_unpin_locked (shmem); } } - - shmem->vaddr =NULL ; }EXPORT_SYMBOL_GPL (drm_gem_shmem_vunmap_locked);
Applied to misc-next
Signature · 2 lines
Best regards, Dmitry