Re: [PATCH] drm/xe/multi_queue: Fix error path skipping group xa cleanup

[Matthew Brost <matthew.brost@intel.com>]

On Mon, Mar 02, 2026 at 09:24:47PM +0000, Shuicheng Lin wrote:
> When xe_hw_engine_group_add_exec_queue() fails for a secondary
> multi-queue queue, the error path jumped directly to put_exec_queue,
> bypassing the delete_queue_group label.  This left the LRC reference
> inserted by xe_exec_queue_group_add() sitting in the group's xarray
> until the primary queue is eventually destroyed.
> 
> Jump to delete_queue_group instead so that xe_exec_queue_group_delete()
> is called and the xarray entry is properly removed.
> 
> Fixes: d9ec63474648 ("drm/xe/multi_queue: Add user interface for multi queue support")
> Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
> ---
> 
> Cc: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
> Cc: Matthew Brost <matthew.brost@intel.com>
> 
> ---
>  drivers/gpu/drm/xe/xe_exec_queue.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c
> index 1a7a4a37bbc6..fbe3ac399cae 100644
> --- a/drivers/gpu/drm/xe/xe_exec_queue.c
> +++ b/drivers/gpu/drm/xe/xe_exec_queue.c
> @@ -1298,7 +1298,7 @@ int xe_exec_queue_create_ioctl(struct drm_device *dev, void *data,
>  		if (q->vm && q->hwe->hw_engine_group) {
>  			err = xe_hw_engine_group_add_exec_queue(q->hwe->hw_engine_group, q);
>  			if (err)
> -				goto put_exec_queue;
> +				goto delete_queue_group;

This entire killup is questionable at best but the label you want here
is 'kill_exec_queue' as that step will undo the
'xe_vm_add_compute_exec_queue' step.

Matt

>  		}
>  	}
>  
> -- 
> 2.34.1
>