Commit c24b06e1 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-5.19-2022-07-14' of git://git.infradead.org/nvme into block-5.19 

Pull NVMe fixes from Christoph:

"nvme fixes for Linux 5.19

 - fix a block device naming collision (Israel Rukshin)
 - fix freeze accounting for PCI error handling (Keith Busch)"

* tag 'nvme-5.19-2022-07-14' of git://git.infradead.org/nvme:
  nvme: fix block device naming collision
  nvme-pci: fix freeze accounting for error handling
parents 6b0de7d0 6961b5e0

drivers/nvme/host/core.c

+3 −3
Original line number Diff line number Diff line
@@ -3786,7 +3786,7 @@ static int nvme_add_ns_cdev(struct nvme_ns *ns) 
}



static struct nvme_ns_head *nvme_alloc_ns_head(struct nvme_ctrl *ctrl,

		unsigned nsid, struct nvme_ns_ids *ids)

		unsigned nsid, struct nvme_ns_ids *ids, bool is_shared)

{

	struct nvme_ns_head *head;

	size_t size = sizeof(*head);
@@ -3810,6 +3810,7 @@ static struct nvme_ns_head *nvme_alloc_ns_head(struct nvme_ctrl *ctrl, 
	head->subsys = ctrl->subsys;

	head->ns_id = nsid;

	head->ids = *ids;

	head->shared = is_shared;

	kref_init(&head->ref);



	if (head->ids.csi) {
@@ -3891,12 +3892,11 @@ static int nvme_init_ns_head(struct nvme_ns *ns, unsigned nsid, 
				nsid);

			goto out_unlock;

		}

		head = nvme_alloc_ns_head(ctrl, nsid, ids);

		head = nvme_alloc_ns_head(ctrl, nsid, ids, is_shared);

		if (IS_ERR(head)) {

			ret = PTR_ERR(head);

			goto out_unlock;

		}

		head->shared = is_shared;

	} else {

		ret = -EINVAL;

		if (!is_shared || !head->shared) {

drivers/nvme/host/pci.c

+7 −2
Original line number Diff line number Diff line
@@ -2690,8 +2690,13 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown) 
	struct pci_dev *pdev = to_pci_dev(dev->dev);



	mutex_lock(&dev->shutdown_lock);

	if (pci_device_is_present(pdev) && pci_is_enabled(pdev)) {

		u32 csts = readl(dev->bar + NVME_REG_CSTS);

	if (pci_is_enabled(pdev)) {

		u32 csts;



		if (pci_device_is_present(pdev))

			csts = readl(dev->bar + NVME_REG_CSTS);

		else

			csts = ~0;



		if (dev->ctrl.state == NVME_CTRL_LIVE ||

		    dev->ctrl.state == NVME_CTRL_RESETTING) {