Commit 2eb56027 authored by Keith Busch's avatar Keith Busch Committed by Wen Zhiwei
Browse files

nvme-pci: allocate tagset on reset if necessary 

stable inclusion
from stable-v6.6.51
commit 05500a48d80d13390b1a7666cabbdc5f10fec667
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYRVR

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=05500a48d80d13390b1a7666cabbdc5f10fec667



--------------------------------

[ Upstream commit 6f01bdbfef3b62955cf6503a8425d527b3a5cf94 ]

If a drive is unable to create IO queues on the initial probe, a
subsequent reset will need to allocate the tagset if IO queue creation
is successful. Without this, blk_mq_update_nr_hw_queues will crash on a
bad pointer due to the invalid tagset.

Fixes: eac3ef26 ("nvme-pci: split the initial probe from the rest path")
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 0868147d

drivers/nvme/host/pci.c

+6 −0
Original line number Diff line number Diff line
@@ -2471,6 +2471,12 @@ static unsigned int nvme_pci_nr_maps(struct nvme_dev *dev) 


static void nvme_pci_update_nr_queues(struct nvme_dev *dev)

{

	if (!dev->ctrl.tagset) {

		nvme_alloc_io_tag_set(&dev->ctrl, &dev->tagset, &nvme_mq_ops,

				nvme_pci_nr_maps(dev), sizeof(struct nvme_iod));

		return;

	}



	blk_mq_update_nr_hw_queues(&dev->tagset, dev->online_queues - 1);

	/* free previously allocated queues that are no longer usable */

	nvme_free_queues(dev, dev->online_queues);