Commit 1cf7a12e authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Christoph Hellwig
Browse files

nvme: use an xarray to lookup the Commands Supported and Effects log 



When using linked list we have to open code the locking, search, and
destroy operations with the loops even if data structure doesn't fall
into the fast path.

One of the main advantage of having XArray to store, search, and remove
items is that it handles all the locking by itself, avoids the loops
when using linked lists, provides clear API to replace the linked list's
search and destroy loops.

This patch replaces the ctrl->cel list with XArray and removes :-

a. Extra code needed for the linked list for ctrl->cel item management
   such as nvme_find_cel().
b. Destroy loop in the nvme_free_ctrl().
c. Explicit insertion locking in the nvme_get_effects_log().

Signed-off-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent b2702aaa

drivers/nvme/host/core.c

+4 −27
Original line number Diff line number Diff line
@@ -3025,26 +3025,10 @@ int nvme_get_log(struct nvme_ctrl *ctrl, u32 nsid, u8 log_page, u8 lsp, u8 csi, 
	return nvme_submit_sync_cmd(ctrl->admin_q, &c, log, size);

}



static struct nvme_cel *nvme_find_cel(struct nvme_ctrl *ctrl, u8 csi)

{

	struct nvme_cel *cel, *ret = NULL;



	spin_lock_irq(&ctrl->lock);

	list_for_each_entry(cel, &ctrl->cels, entry) {

		if (cel->csi == csi) {

			ret = cel;

			break;

		}

	}

	spin_unlock_irq(&ctrl->lock);



	return ret;

}



static int nvme_get_effects_log(struct nvme_ctrl *ctrl, u8 csi,

				struct nvme_effects_log **log)

{

	struct nvme_cel *cel = nvme_find_cel(ctrl, csi);

	struct nvme_cel *cel = xa_load(&ctrl->cels, csi);

	int ret;



	if (cel)
@@ -3062,10 +3046,7 @@ static int nvme_get_effects_log(struct nvme_ctrl *ctrl, u8 csi, 
	}



	cel->csi = csi;



	spin_lock_irq(&ctrl->lock);

	list_add_tail(&cel->entry, &ctrl->cels);

	spin_unlock_irq(&ctrl->lock);

	xa_store(&ctrl->cels, cel->csi, cel, GFP_KERNEL);

out:

	*log = &cel->log;

	return 0;
@@ -4448,15 +4429,11 @@ static void nvme_free_ctrl(struct device *dev) 
	struct nvme_ctrl *ctrl =

		container_of(dev, struct nvme_ctrl, ctrl_device);

	struct nvme_subsystem *subsys = ctrl->subsys;

	struct nvme_cel *cel, *next;



	if (!subsys || ctrl->instance != subsys->instance)

		ida_simple_remove(&nvme_instance_ida, ctrl->instance);



	list_for_each_entry_safe(cel, next, &ctrl->cels, entry) {

		list_del(&cel->entry);

		kfree(cel);

	}

	xa_destroy(&ctrl->cels);



	nvme_mpath_uninit(ctrl);

	__free_page(ctrl->discard_page);
@@ -4488,7 +4465,7 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, 
	spin_lock_init(&ctrl->lock);

	mutex_init(&ctrl->scan_lock);

	INIT_LIST_HEAD(&ctrl->namespaces);

	INIT_LIST_HEAD(&ctrl->cels);

	xa_init(&ctrl->cels);

	init_rwsem(&ctrl->namespaces_rwsem);

	ctrl->dev = dev;

	ctrl->ops = ops;

drivers/nvme/host/nvme.h

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ struct nvme_ctrl { 
	unsigned long quirks;

	struct nvme_id_power_state psd[32];

	struct nvme_effects_log *effects;

	struct list_head cels;

	struct xarray cels;

	struct work_struct scan_work;

	struct work_struct async_event_work;

	struct delayed_work ka_work;

CRA Git | Maintained and supported by SUSTech CRA and CCSE