UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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)
 -----BEGIN PGP SIGNATURE-----
 
 iQI/BAABCgApFiEEgdbnc3r/njty3Iq9D55TZVIEUYMFAmATCKALHGhjaEBsc3Qu
 ZGUACgkQD55TZVIEUYO6aA/+OjQX/u+yFA2pCyJLZ3jNKSnyWNaqR+FRayUSkG+I
 sATskep4TWEuSo/DqAe03UjTRjnehi74GMP9zDW/S2uLw41GjriVOwAHborYpEZs
 XANR2+TWttT+hDCTCTFIjI+g/Dt+5l1SId668sy5npuc3lr15RHqOt0UXHbnkm5u
 yTq7q968Eu/HnhWyHR3yX3E+0LN33r2+DwGxoE0PRJJAHoTKEKGSShFF5xnmpdoA
 zV10KpbYwbUB0kZ97ZZi+2Ev6W6k1gZBIIDuSmWmsDClDHM26bq3ibNxSUw8Eljx
 dhdReFIRHglhZ26sR9Qm/dkLtgyoNsGzSMpJqTjYXz/bGYFkqfyWdvkUx+qFAsva
 xZ0J8+2PItQybQZOjL2nXSpcNZIhRwd5oKHwxNCOWzr4qAcy4G7FGtXjpxlWo4Zf
 wyErwK/2wE+hz3DgrFRzFj6mXcr+ZeOAwf2KREzdoIhjFtA3zStqj70Jh8/EvPRR
 UzTAEUDPJbFDmdslncmkNUygOP4nEizhlYOQmJ45M5p5CAy8/de9Mz/YBnzNDeaE
 bixctgL7Lga2TM2O0LwRXQ31FOxnZLfS23j2KGl3LTa0vgkah6tex9Q59/VkDfXJ
 TVV3oauLOaNRjSIHiTYlpIYXohXptjOER8y7ruHMlPFG2w/PxvuQqtrTb6szdeYO
 1lU=
 =Pcyx
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Jens Axboe 2021-01-28 11:57:33 -07:00
parent 0df28cad06 772ea326a4
commit e2579c76fb
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/nvme/host/core.c
View File

@ -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;

2
drivers/nvme/host/multipath.c
View File

@ -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;

2
drivers/nvme/host/pci.c
View File

@ -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) },