[PATCH v1 1/2] drm/amdgpu/userq: remove queue from doorbell xarray

[PATCH v1 1/2] drm/amdgpu/userq: remove queue from doorbell xarray

[Sunil Khatri]

In case of failure in xa_alloc, remove the queue during
clean up from the userq_doorbell_xa.

Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
index 001fcfcbde0f..5224871a099c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
@@ -865,6 +865,7 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args)
 	if (r) {
 		drm_file_err(uq_mgr->file, "Failed to allocate a queue id\n");
 		amdgpu_userq_fence_driver_free(queue);
+		xa_erase_irq(&adev->userq_doorbell_xa, index);
 		uq_funcs->mqd_destroy(queue);
 		kfree(queue);
 		r = -ENOMEM;
-- 
2.34.1

[PATCH v1 2/2] drm/amdgpu/userq: remove queue from doorbell xa during clean up

[Sunil Khatri]

If function amdgpu_userq_map_helper fails we do need to clean
up and remove the queue from the userq_doorbell_xa.

Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
index 5224871a099c..7d2f78899c47 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
@@ -885,6 +885,7 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args)
 		r = amdgpu_userq_map_helper(queue);
 		if (r) {
 			drm_file_err(uq_mgr->file, "Failed to map Queue\n");
+			xa_erase_irq(&adev->userq_doorbell_xa, index);
 			xa_erase(&uq_mgr->userq_xa, qid);
 			amdgpu_userq_fence_driver_free(queue);
 			uq_funcs->mqd_destroy(queue);
-- 
2.34.1

Re: [PATCH v1 1/2] drm/amdgpu/userq: remove queue from doorbell xarray

[Khatri, Sunil]

[-- Attachment #1: Type: text/plain, Size: 1431 bytes --]

[AMD Official Use Only - AMD Internal Distribution Only]

Ping

Get Outlook for iOS<https://aka.ms/o0ukef>
________________________________
From: Sunil Khatri <sunil.khatri@amd.com>
Sent: Tuesday, March 3, 2026 10:41:10 PM
To: Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>
Cc: amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>; Khatri, Sunil <Sunil.Khatri@amd.com>
Subject: [PATCH v1 1/2] drm/amdgpu/userq: remove queue from doorbell xarray

In case of failure in xa_alloc, remove the queue during
clean up from the userq_doorbell_xa.

Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
index 001fcfcbde0f..5224871a099c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
@@ -865,6 +865,7 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args)
         if (r) {
                 drm_file_err(uq_mgr->file, "Failed to allocate a queue id\n");
                 amdgpu_userq_fence_driver_free(queue);
+               xa_erase_irq(&adev->userq_doorbell_xa, index);
                 uq_funcs->mqd_destroy(queue);
                 kfree(queue);
                 r = -ENOMEM;
--
2.34.1


[-- Attachment #2: Type: text/html, Size: 3305 bytes --]

Re: [PATCH v1 1/2] drm/amdgpu/userq: remove queue from doorbell xarray

[Christian König]

Reviewed-by: Christian König <christian.koenig@amd.com> for both.

On 3/4/26 14:09, Khatri, Sunil wrote:
> [AMD Official Use Only - AMD Internal Distribution Only]
> 
> 
> Ping
> 
> Get Outlook for iOS <https://aka.ms/o0ukef>
> ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
> *From:* Sunil Khatri <sunil.khatri@amd.com>
> *Sent:* Tuesday, March 3, 2026 10:41:10 PM
> *To:* Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>
> *Cc:* amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>; Khatri, Sunil <Sunil.Khatri@amd.com>
> *Subject:* [PATCH v1 1/2] drm/amdgpu/userq: remove queue from doorbell xarray
>  
> In case of failure in xa_alloc, remove the queue during
> clean up from the userq_doorbell_xa.
> 
> Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> index 001fcfcbde0f..5224871a099c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> @@ -865,6 +865,7 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args)
>          if (r) {
>                  drm_file_err(uq_mgr->file, "Failed to allocate a queue id\n");
>                  amdgpu_userq_fence_driver_free(queue);
> +               xa_erase_irq(&adev->userq_doorbell_xa, index);
>                  uq_funcs->mqd_destroy(queue);
>                  kfree(queue);
>                  r = -ENOMEM;
> -- 
> 2.34.1
>