Re: [PATCH] drm/xe: unlock on error path in xe_vm_add_compute_exec_queue()

[Matthew Brost]

On Fri, Jan 05, 2024 at 03:20:22PM +0300, Dan Carpenter wrote:
> Drop the ">lock" before returning.
> 
> Fixes: 24f947d58fe5 ("drm/xe: Use DRM GPUVM helpers for external- and evicted 
> objects")
> Signed-off-by: Dan Carpenter 

Reviewed-by: Matthew Brost 

> ---
>  drivers/gpu/drm/xe/xe_vm.c | 7 ---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
> index 9180f2d2d71d..4aa7979fe6bf 100644
> --- a/drivers/gpu/drm/xe/xe_vm.c
> +++ b/drivers/gpu/drm/xe/xe_vm.c
> @@ -332,13 +332,13 @@ int xe_vm_add_compute_exec_queue(struct xe_vm *vm, 
> struct xe_exec_queue *q)
>   down_write(>lock);
>   err = drm_gpuvm_exec_lock(_exec);
>   if (err)
> - return err;
> + goto out_up_write;
>  
>   pfence = xe_preempt_fence_create(q, q->compute.context,
>++q->compute.seqno);
>   if (!pfence) {
>   err = -ENOMEM;
> - goto out_unlock;
> + goto out_fini;
>   }
>  
>   list_add(>compute.link, >preempt.exec_queues);
> @@ -361,8 +361,9 @@ int xe_vm_add_compute_exec_queue(struct xe_vm *vm, struct 
> xe_exec_queue *q)
>  
>   up_read(>userptr.notifier_lock);
>  
> -out_unlock:
> +out_fini:
>   drm_exec_fini(exec);
> +out_up_write:
>   up_write(>lock);
>  
>   return err;
> -- 
> 2.42.0
> 

[PATCH] drm/xe: unlock on error path in xe_vm_add_compute_exec_queue()

[Dan Carpenter]

Drop the ">lock" before returning.

Fixes: 24f947d58fe5 ("drm/xe: Use DRM GPUVM helpers for external- and evicted 
objects")
Signed-off-by: Dan Carpenter 
---
 drivers/gpu/drm/xe/xe_vm.c | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
index 9180f2d2d71d..4aa7979fe6bf 100644
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -332,13 +332,13 @@ int xe_vm_add_compute_exec_queue(struct xe_vm *vm, struct 
xe_exec_queue *q)
down_write(>lock);
err = drm_gpuvm_exec_lock(_exec);
if (err)
-   return err;
+   goto out_up_write;
 
pfence = xe_preempt_fence_create(q, q->compute.context,
 ++q->compute.seqno);
if (!pfence) {
err = -ENOMEM;
-   goto out_unlock;
+   goto out_fini;
}
 
list_add(>compute.link, >preempt.exec_queues);
@@ -361,8 +361,9 @@ int xe_vm_add_compute_exec_queue(struct xe_vm *vm, struct 
xe_exec_queue *q)
 
up_read(>userptr.notifier_lock);
 
-out_unlock:
+out_fini:
drm_exec_fini(exec);
+out_up_write:
up_write(>lock);
 
return err;
-- 
2.42.0