Skip to contentSkip to conversation

drm/amdgpu/userq: Call unreserve on error in amdgpu_userq_fence_read_wptr()

PATCH Applied Dan Carpenter 2 participants 2 messages Apr 30, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu/userq: Call unreserve on error in amdgpu_userq_fence_read_wptr()

This error path should call amdgpu_bo_unreserve() before returning.

Fixes d8675102ba32 ("drm/amdgpu: add vm root BO lock before accessing the vm")
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c +1 -0
index be068e8e37d1..57169a8224be 100644
@@ -373,6 +373,7 @@ static int amdgpu_userq_fence_read_wptr(struct amdgpu_usermode_queue *queue,
 
 	mapping = amdgpu_vm_bo_lookup_mapping(queue->vm, addr >> PAGE_SHIFT);
 	if (!mapping) {
+		amdgpu_bo_unreserve(queue->vm->root.bo);
 		DRM_ERROR("Failed to lookup amdgpu_bo_va_mapping\n");
 		return -EINVAL;
 	}
Signature · 1 line
2.47.2
Applied
#1 lore raw

Applied. Thanks!

Quoted 24 lines · Dan Carpenter

This error path should call amdgpu_bo_unreserve() before returning.

Fixes d8675102ba32 ("drm/amdgpu: add vm root BO lock before accessing the vm")
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c +1 -1
index be068e8e37d1..57169a8224be 100644
@@ -373,6 +373,7 @@ static int amdgpu_userq_fence_read_wptr(struct amdgpu_usermode_queue *queue,
 
        mapping = amdgpu_vm_bo_lookup_mapping(queue->vm, addr >> PAGE_SHIFT);
        if (!mapping) {
+               amdgpu_bo_unreserve(queue->vm->root.bo);
                DRM_ERROR("Failed to lookup amdgpu_bo_va_mapping\n");
                return -EINVAL;
        }
--

2.47.2