[PATCH] nvme: avoid deleting uncreated queues

[PATCH] nvme: avoid deleting uncreated queues

[Prashant Kamble]

nvme_create_queue() may issue Delete CQ or Delete SQ
commands even when the corresponding queue creation
failed.

Avoid sending delete commands for queues that were never
successfully created.

Signed-off-by: Prashant Kamble <prashant.kamble223@gmail.com>
---
 drivers/nvme/nvme.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
index 9df7824b1c5..980ca919632 100644
--- a/drivers/nvme/nvme.c
+++ b/drivers/nvme/nvme.c
@@ -298,11 +298,6 @@ static int nvme_delete_queue(struct nvme_dev *dev, u8 opcode, u16 id)
 	return nvme_submit_admin_cmd(dev, &c, NULL);
 }
 
-static int nvme_delete_sq(struct nvme_dev *dev, u16 sqid)
-{
-	return nvme_delete_queue(dev, nvme_admin_delete_sq, sqid);
-}
-
 static int nvme_delete_cq(struct nvme_dev *dev, u16 cqid)
 {
 	return nvme_delete_queue(dev, nvme_admin_delete_cq, cqid);
@@ -563,20 +558,19 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid)
 	nvmeq->cq_vector = qid - 1;
 	result = nvme_alloc_cq(dev, qid, nvmeq);
 	if (result < 0)
-		goto release_cq;
+		goto release_ret;
 
 	result = nvme_alloc_sq(dev, qid, nvmeq);
 	if (result < 0)
-		goto release_sq;
+		goto release_cq;
 
 	nvme_init_queue(nvmeq, qid);
 
 	return result;
 
- release_sq:
-	nvme_delete_sq(dev, qid);
  release_cq:
 	nvme_delete_cq(dev, qid);
+ release_ret:
 
 	return result;
 }
-- 
2.43.0

Re: [PATCH] nvme: avoid deleting uncreated queues

[Neil Armstrong]

On 5/24/26 17:47, Prashant Kamble wrote:
> nvme_create_queue() may issue Delete CQ or Delete SQ
> commands even when the corresponding queue creation
> failed.
> 
> Avoid sending delete commands for queues that were never
> successfully created.
> 
> Signed-off-by: Prashant Kamble <prashant.kamble223@gmail.com>
> ---
>   drivers/nvme/nvme.c | 12 +++---------
>   1 file changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
> index 9df7824b1c5..980ca919632 100644
> --- a/drivers/nvme/nvme.c
> +++ b/drivers/nvme/nvme.c
> @@ -298,11 +298,6 @@ static int nvme_delete_queue(struct nvme_dev *dev, u8 opcode, u16 id)
>   	return nvme_submit_admin_cmd(dev, &c, NULL);
>   }
>   
> -static int nvme_delete_sq(struct nvme_dev *dev, u16 sqid)
> -{
> -	return nvme_delete_queue(dev, nvme_admin_delete_sq, sqid);
> -}
> -
>   static int nvme_delete_cq(struct nvme_dev *dev, u16 cqid)
>   {
>   	return nvme_delete_queue(dev, nvme_admin_delete_cq, cqid);
> @@ -563,20 +558,19 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid)
>   	nvmeq->cq_vector = qid - 1;
>   	result = nvme_alloc_cq(dev, qid, nvmeq);
>   	if (result < 0)
> -		goto release_cq;
> +		goto release_ret;
>   
>   	result = nvme_alloc_sq(dev, qid, nvmeq);
>   	if (result < 0)
> -		goto release_sq;
> +		goto release_cq;
>   
>   	nvme_init_queue(nvmeq, qid);
>   
>   	return result;
>   
> - release_sq:
> -	nvme_delete_sq(dev, qid);
>    release_cq:
>   	nvme_delete_cq(dev, qid);
> + release_ret:
>   
>   	return result;
>   }

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>

Thanks,
Neil

Re: [PATCH] nvme: avoid deleting uncreated queues

[Neil Armstrong]

Hi,

On Sun, 24 May 2026 21:17:14 +0530, Prashant Kamble wrote:
> nvme_create_queue() may issue Delete CQ or Delete SQ
> commands even when the corresponding queue creation
> failed.
> 
> Avoid sending delete commands for queues that were never
> successfully created.
> 
> [...]

Thanks, Applied to https://source.denx.de/u-boot/custodians/u-boot-ufs (u-boot-nvme-fixes)

[1/1] nvme: avoid deleting uncreated queues
      https://source.denx.de/u-boot/custodians/u-boot-ufs/-/commit/61280341e926aee1787d9aedb358a43fad96e787

-- 
Neil