NVMe: Use namespace list for scanning devices
Subsystems (2)
PATCH v2 1/1 NVMe: Use namespace list for scanning devices
The NVMe 1.1 specification provides an identify mode to return a list of active namespaces. This is more efficient to discover which namespace identifiers are active on a controller. Consider a controller with only one namespace. The NSID could theoretically be the highest possible, 0xfffffffe. The specification requires ID_CTRL.NN be >= to this for the NSID to be valid, but the driver would have scanned 4 billion inactive namespaces before finding the only active one.
This patch shortens the process by reading the list of active namespaces for controllers that support this capability.
---
v1 -> v2:
Fixed a check for a NULL, and zalloc the memory just to be safe in case h/w doesn't zero fill the list.
Minor cleanup, simplifying a loop for namespace removal.
drivers/block/nvme-core.c | 77 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 67 insertions(+), 10 deletions(-)
drivers/block/nvme-core.c +67 -10
@@ -1170,6 +1170,16 @@ static int adapter_delete_sq(struct nvme_dev *dev, u16 sqid)return adapter_delete_queue (dev, nvme_admin_delete_sq, sqid); } +int nvme_identify_ns_list (struct nvme_dev *dev,u32 *ns_list,unsigned nsid) +{ +struct nvme_command c = { }; + + c.identify.opcode = nvme_admin_identify; + c.identify.cns =cpu_to_le32 (2 ); + c.identify.nsid =cpu_to_le32 (nsid); +return nvme_submit_sync_cmd (dev->admin_q, &c, ns_list,0x1000 ); +} +int nvme_identify_ctrl (struct nvme_dev *dev,struct nvme_id_ctrl **id) {struct nvme_command c = { };
@@ -2415,6 +2425,12 @@ static void nvme_ns_remove(struct nvme_ns *ns) } } +static void nvme_remove_ns (struct nvme_ns *ns) +{ +nvme_ns_remove (ns); +nvme_free_namespace (ns); +} +static void nvme_scan_namespaces (struct nvme_dev *dev,unsigned nn) {struct nvme_ns *ns, *next;
@@ -2422,21 +2438,55 @@ static void nvme_scan_namespaces(struct nvme_dev *dev, unsigned nn)for (i =1 ; i <= nn; i++) { ns =nvme_find_ns (dev, i); -if (ns) { -if (revalidate_disk (ns->disk)) { -nvme_ns_remove (ns); -nvme_free_namespace (ns); - } - }else +if (!ns)nvme_alloc_ns (dev, i); +else if (revalidate_disk (ns->disk)) +nvme_remove_ns (ns); }list_for_each_entry_safe (ns, next, &dev->namespaces, list) { -if (ns->ns_id > nn) { -nvme_ns_remove (ns); -nvme_free_namespace (ns); +if (ns->ns_id > nn) +nvme_remove_ns (ns); + } +list_sort (NULL , &dev->namespaces, ns_cmp); +} + +static int nvme_scan_ns_list (struct nvme_dev *dev,unsigned nn) +{ +struct nvme_ns *ns; +u32 *ns_list, nsid, prev =0 ; +int i, j, ret =0 , num_lists =DIV_ROUND_UP (nn,1024 ); + + ns_list =kzalloc (0x1000 ,GFP_KERNEL ); +if (!ns_list) +return -ENOMEM ; + +for (i =0 ; i < num_lists; i++) { + ret =nvme_identify_ns_list (dev, ns_list, prev); +if (ret) + goto out; + +for (j =0 ; j <min_t (int, nn,1024 ); j++) { + nsid =le32_to_cpu (ns_list[j]); +if (!nsid) + goto out; + ns =nvme_find_ns (dev, nsid); +if (ns) { +if (revalidate_disk (ns->disk)) +nvme_remove_ns (ns); + }else +nvme_alloc_ns (dev, nsid); +while (++prev < nsid) { + ns =nvme_find_ns (dev, prev); +if (ns) +nvme_remove_ns (ns); + } } + nn -= j; } + out:list_sort (NULL , &dev->namespaces, ns_cmp); +kfree (ns_list); +return ret; }static void nvme_set_irq_hints (struct nvme_dev *dev)
@@ -2459,12 +2509,19 @@ static void nvme_dev_scan(struct work_struct *work) { struct nvme_dev *dev = container_of(work, struct nvme_dev, scan_work);struct nvme_id_ctrl *ctrl; +unsigned nn;if (!dev->tagset.tags)return ;if (nvme_identify_ctrl (dev, &ctrl))return ; -nvme_scan_namespaces (dev,le32_to_cpup (&ctrl->nn)); + nn =le32_to_cpup (&ctrl->nn); +if (readl (&dev->bar->vs) >=NVME_VS (1 ,1 )) { +if (!nvme_scan_ns_list (dev, nn)) + goto done; + } +nvme_scan_namespaces (dev, nn); + done:kfree (ctrl);nvme_set_irq_hints (dev); }
Signature · 1 line
1.7.10.4