Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23f9fb0f authored by Jianchao Wang's avatar Jianchao Wang Committed by Greg Kroah-Hartman
Browse files

nvme-pci: Fix nvme queue cleanup if IRQ setup fails 



[ Upstream commit f25a2dfc20e3a3ed8fe6618c331799dd7bd01190 ]

This patch fixes nvme queue cleanup if requesting an IRQ handler for
the queue's vector fails. It does this by resetting the cq_vector to
the uninitialized value of -1 so it is ignored for a controller reset.

Signed-off-by: default avatarJianchao Wang <jianchao.w.wang@oracle.com>
[changelog updates, removed misc whitespace changes]
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fef6509a

drivers/nvme/host/pci.c

+4 −1
Original line number Diff line number Diff line
@@ -1120,7 +1120,7 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid) 
	nvmeq->cq_vector = qid - 1;

	result = adapter_alloc_cq(dev, qid, nvmeq);

	if (result < 0)

		return result;

		goto release_vector;



	result = adapter_alloc_sq(dev, qid, nvmeq);

	if (result < 0)
@@ -1134,9 +1134,12 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid) 
	return result;



 release_sq:

	dev->online_queues--;

	adapter_delete_sq(dev, qid);

 release_cq:

	adapter_delete_cq(dev, qid);

 release_vector:

	nvmeq->cq_vector = -1;

	return result;

}