Skip to contentSkip to conversation

drm/msm/gem: Fix double resv lock aquire

PATCH Superseded Rob Clark 2 participants 2 messages Jan 31, 2024

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Rob Clark

author
#0 lore raw

PATCH v2 1/1 drm/msm/gem: Fix double resv lock aquire

From: Rob Clark <[email protected]>

Since commit 56e5abba8c3e ("dma-buf: Add unlocked variant of vmapping functions"), the resv lock is already held in the prime vmap path, so don't try to grab it again.

v2: This applies to vunmap path as well

Fixes 56e5abba8c3e ("dma-buf: Add unlocked variant of vmapping functions")
---
 drivers/gpu/drm/msm/msm_gem_prime.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/msm_gem_prime.c +2 -2
index 5f68e31a3e4e..0915f3b68752 100644
@@ -26,7 +26,7 @@ int msm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map)
 {
 	void *vaddr;
 
-	vaddr = msm_gem_get_vaddr(obj);
+	vaddr = msm_gem_get_vaddr_locked(obj);
 	if (IS_ERR(vaddr))
 		return PTR_ERR(vaddr);
 	iosys_map_set_vaddr(map, vaddr);
@@ -36,7 +36,7 @@ int msm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map)
 
 void msm_gem_prime_vunmap(struct drm_gem_object *obj, struct iosys_map *map)
 {
-	msm_gem_put_vaddr(obj);
+	msm_gem_put_vaddr_locked(obj);
 }
 
 struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev,
Signature · 1 line
2.43.0
#1 lore raw
Quoted 10 lines · Rob Clark

From: Rob Clark <[email protected]>

Since commit 56e5abba8c3e ("dma-buf: Add unlocked variant of vmapping functions"), the resv lock is already held in the prime vmap path, so don't try to grab it again.

v2: This applies to vunmap path as well

Fixes 56e5abba8c3e ("dma-buf: Add unlocked variant of vmapping functions")

Nit: the offending commit should be 79e2cf2e7a19 ("drm/gem: Take reservation lock for vmap/vunmap operations")

Quoted 18 lines
---
 drivers/gpu/drm/msm/msm_gem_prime.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/msm_gem_prime.c +1 -1
index 5f68e31a3e4e..0915f3b68752 100644
@@ -26,7 +26,7 @@ int msm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map)
 {
 	void *vaddr;
 
-	vaddr = msm_gem_get_vaddr(obj);
+	vaddr = msm_gem_get_vaddr_locked(obj);
 	if (IS_ERR(vaddr))
 		return PTR_ERR(vaddr);
 	iosys_map_set_vaddr(map, vaddr);

drivers/gpu/drm/msm/msm_gem_prime.c int msm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map) · line 42

Quoted 8 lines
drivers/gpu/drm/msm/msm_gem_prime.c +1 -1
@@ -36,7 +36,7 @@ int msm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map)
 
 void msm_gem_prime_vunmap(struct drm_gem_object *obj, struct iosys_map *map)
 {
-	msm_gem_put_vaddr(obj);
+	msm_gem_put_vaddr_locked(obj);
 }
 
 struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev,

Looks good otherwise

Signature · 2 lines
Best regards,
Dmitry