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

Merge tag 'nvme-5.11-2021-01-28' of git://git.infradead.org/nvme into block-5.11 

Pull NVMe fixes from Christoph:

"nvme fixes for 5.11:

 - add another Write Zeroes quirk (Chaitanya Kulkarni)
 - handle a no path available corner case (Daniel Wagner)
 - use the proper RCU aware list_add helper (Chao Leng)"

* tag 'nvme-5.11-2021-01-28' of git://git.infradead.org/nvme:
  nvme-core: use list_add_tail_rcu instead of list_add_tail for nvme_init_ns_head
  nvme-multipath: Early exit if no path is available
  nvme-pci: add the DISABLE_WRITE_ZEROES quirk for a SPCC device
parents 0df28cad 772ea326

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -3829,7 +3829,7 @@ static int nvme_init_ns_head(struct nvme_ns *ns, unsigned nsid, 
		}

	}



	list_add_tail(&ns->siblings, &head->list);

	list_add_tail_rcu(&ns->siblings, &head->list);

	ns->head = head;

	mutex_unlock(&ctrl->subsys->lock);

	return 0;

drivers/nvme/host/multipath.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head, 
	}



	for (ns = nvme_next_ns(head, old);

	     ns != old;

	     ns && ns != old;

	     ns = nvme_next_ns(head, ns)) {

		if (nvme_path_is_disabled(ns))

			continue;

drivers/nvme/host/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -3257,6 +3257,8 @@ static const struct pci_device_id nvme_id_table[] = { 
		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },

	{ PCI_DEVICE(0x15b7, 0x2001),   /*  Sandisk Skyhawk */

		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },

	{ PCI_DEVICE(0x1d97, 0x2263),   /* SPCC */

		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },

	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001),

		.driver_data = NVME_QUIRK_SINGLE_VECTOR },

	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },