Commit 298ba0e3 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme: keep ctrl->namespaces ordered 



Various places in the nvme code that rely on ctrl->namespace to be
ordered.  Ensure that the namespae is inserted into the list at the
right position from the start instead of sorting it after the fact.

Fixes: 540c801c ("NVMe: Implement namespace list scanning")
Reported-by: default avatarAnton Eidelman <anton.eidelman@gmail.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
parent e371af03

drivers/nvme/host/core.c

+17 −16
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/backing-dev.h>

#include <linux/list_sort.h>

#include <linux/slab.h>

#include <linux/types.h>

#include <linux/pr.h>
@@ -3716,15 +3715,6 @@ static int nvme_init_ns_head(struct nvme_ns *ns, unsigned nsid, 
	return ret;

}



static int ns_cmp(void *priv, const struct list_head *a,

		const struct list_head *b)

{

	struct nvme_ns *nsa = container_of(a, struct nvme_ns, list);

	struct nvme_ns *nsb = container_of(b, struct nvme_ns, list);



	return nsa->head->ns_id - nsb->head->ns_id;

}



struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned nsid)

{

	struct nvme_ns *ns, *ret = NULL;
@@ -3745,6 +3735,22 @@ struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned nsid) 
}

EXPORT_SYMBOL_NS_GPL(nvme_find_get_ns, NVME_TARGET_PASSTHRU);



/*

 * Add the namespace to the controller list while keeping the list ordered.

 */

static void nvme_ns_add_to_ctrl_list(struct nvme_ns *ns)

{

	struct nvme_ns *tmp;



	list_for_each_entry_reverse(tmp, &ns->ctrl->namespaces, list) {

		if (tmp->head->ns_id < ns->head->ns_id) {

			list_add(&ns->list, &tmp->list);

			return;

		}

	}

	list_add(&ns->list, &ns->ctrl->namespaces);

}



static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid,

		struct nvme_ns_ids *ids)

{
@@ -3795,9 +3801,8 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid, 
		goto out_unlink_ns;



	down_write(&ctrl->namespaces_rwsem);

	list_add_tail(&ns->list, &ctrl->namespaces);

	nvme_ns_add_to_ctrl_list(ns);

	up_write(&ctrl->namespaces_rwsem);



	nvme_get_ctrl(ctrl);



	if (device_add_disk(ctrl->device, ns->disk, nvme_ns_id_attr_groups))
@@ -4080,10 +4085,6 @@ static void nvme_scan_work(struct work_struct *work) 
	if (nvme_scan_ns_list(ctrl) != 0)

		nvme_scan_ns_sequential(ctrl);

	mutex_unlock(&ctrl->scan_lock);



	down_write(&ctrl->namespaces_rwsem);

	list_sort(NULL, &ctrl->namespaces, ns_cmp);

	up_write(&ctrl->namespaces_rwsem);

}



/*