Skip to contentSkip to conversation

nvme: avoid deleting uncreated queues

PATCH In review Prashant Kamble 2 participants 3 messages May 24 – Jun 3

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvme: avoid deleting uncreated queues

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.

---
 drivers/nvme/nvme.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/nvme/nvme.c +3 -9
index 9df7824b1c5..980ca919632 100644
@@ -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;
 }
Signature · 1 line
2.43.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 42 lines · 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.

---
  drivers/nvme/nvme.c | 12 +++---------
  1 file changed, 3 insertions(+), 9 deletions(-)
drivers/nvme/nvme.c +2 -7
index 9df7824b1c5..980ca919632 100644
@@ -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);
 

drivers/nvme/nvme.c static int nvme_create_queue(struct nvme_queue *nvmeq, int qid) · line 576

Quoted 10 lines
drivers/nvme/nvme.c +1 -2
  	return result;
 
- release_sq:
-	nvme_delete_sq(dev, qid);
   release_cq:
  	nvme_delete_cq(dev, qid);
+ release_ret:
 
  	return result;
  }

Thanks,
Neil

#2 lore raw
In reply to Prashant Kamble

Hi,

Quoted 8 lines · 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.

[...]

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
Signature · 1 line
Neil