Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b85b826 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme: also expose the namespace identification sysfs files for mpath nodes 



We do this by adding a helper that returns the ns_head for a device that
can belong to either the per-controller or per-subsystem block device
nodes, and otherwise reuse all the existing code.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 32acab31

drivers/nvme/host/core.c

+31 −26
Original line number Diff line number Diff line
@@ -2382,12 +2382,22 @@ static ssize_t nvme_sysfs_rescan(struct device *dev, 
}

static DEVICE_ATTR(rescan_controller, S_IWUSR, NULL, nvme_sysfs_rescan);



static inline struct nvme_ns_head *dev_to_ns_head(struct device *dev)

{

	struct gendisk *disk = dev_to_disk(dev);



	if (disk->fops == &nvme_fops)

		return nvme_get_ns_from_dev(dev)->head;

	else

		return disk->private_data;

}



static ssize_t wwid_show(struct device *dev, struct device_attribute *attr,

		char *buf)

{

	struct nvme_ns *ns = nvme_get_ns_from_dev(dev);

	struct nvme_ns_ids *ids = &ns->head->ids;

	struct nvme_subsystem *subsys = ns->ctrl->subsys;

	struct nvme_ns_head *head = dev_to_ns_head(dev);

	struct nvme_ns_ids *ids = &head->ids;

	struct nvme_subsystem *subsys = head->subsys;

	int serial_len = sizeof(subsys->serial);

	int model_len = sizeof(subsys->model);
@@ -2409,23 +2419,21 @@ static ssize_t wwid_show(struct device *dev, struct device_attribute *attr, 


	return sprintf(buf, "nvme.%04x-%*phN-%*phN-%08x\n", subsys->vendor_id,

		serial_len, subsys->serial, model_len, subsys->model,

		ns->head->ns_id);

		head->ns_id);

}

static DEVICE_ATTR(wwid, S_IRUGO, wwid_show, NULL);



static ssize_t nguid_show(struct device *dev, struct device_attribute *attr,

		char *buf)

{

	struct nvme_ns *ns = nvme_get_ns_from_dev(dev);

	return sprintf(buf, "%pU\n", ns->head->ids.nguid);

	return sprintf(buf, "%pU\n", dev_to_ns_head(dev)->ids.nguid);

}

static DEVICE_ATTR(nguid, S_IRUGO, nguid_show, NULL);



static ssize_t uuid_show(struct device *dev, struct device_attribute *attr,

		char *buf)

{

	struct nvme_ns *ns = nvme_get_ns_from_dev(dev);

	struct nvme_ns_ids *ids = &ns->head->ids;

	struct nvme_ns_ids *ids = &dev_to_ns_head(dev)->ids;



	/* For backward compatibility expose the NGUID to userspace if

	 * we have no UUID set
@@ -2442,20 +2450,18 @@ static DEVICE_ATTR(uuid, S_IRUGO, uuid_show, NULL); 
static ssize_t eui_show(struct device *dev, struct device_attribute *attr,

		char *buf)

{

	struct nvme_ns *ns = nvme_get_ns_from_dev(dev);

	return sprintf(buf, "%8ph\n", ns->head->ids.eui64);

	return sprintf(buf, "%8ph\n", dev_to_ns_head(dev)->ids.eui64);

}

static DEVICE_ATTR(eui, S_IRUGO, eui_show, NULL);



static ssize_t nsid_show(struct device *dev, struct device_attribute *attr,

		char *buf)

{

	struct nvme_ns *ns = nvme_get_ns_from_dev(dev);

	return sprintf(buf, "%d\n", ns->head->ns_id);

	return sprintf(buf, "%d\n", dev_to_ns_head(dev)->ns_id);

}

static DEVICE_ATTR(nsid, S_IRUGO, nsid_show, NULL);



static struct attribute *nvme_ns_attrs[] = {

static struct attribute *nvme_ns_id_attrs[] = {

	&dev_attr_wwid.attr,

	&dev_attr_uuid.attr,

	&dev_attr_nguid.attr,
@@ -2464,12 +2470,11 @@ static struct attribute *nvme_ns_attrs[] = { 
	NULL,

};



static umode_t nvme_ns_attrs_are_visible(struct kobject *kobj,

static umode_t nvme_ns_id_attrs_are_visible(struct kobject *kobj,

		struct attribute *a, int n)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct nvme_ns *ns = nvme_get_ns_from_dev(dev);

	struct nvme_ns_ids *ids = &ns->head->ids;

	struct nvme_ns_ids *ids = &dev_to_ns_head(dev)->ids;



	if (a == &dev_attr_uuid.attr) {

		if (uuid_is_null(&ids->uuid) ||
@@ -2487,9 +2492,9 @@ static umode_t nvme_ns_attrs_are_visible(struct kobject *kobj, 
	return a->mode;

}



static const struct attribute_group nvme_ns_attr_group = {

	.attrs		= nvme_ns_attrs,

	.is_visible	= nvme_ns_attrs_are_visible,

const struct attribute_group nvme_ns_id_attr_group = {

	.attrs		= nvme_ns_id_attrs,

	.is_visible	= nvme_ns_id_attrs_are_visible,

};



#define nvme_show_str_function(field)						\
@@ -2882,7 +2887,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) 


	device_add_disk(ctrl->device, ns->disk);

	if (sysfs_create_group(&disk_to_dev(ns->disk)->kobj,

					&nvme_ns_attr_group))

					&nvme_ns_id_attr_group))

		pr_warn("%s: failed to create sysfs group for identification\n",

			ns->disk->disk_name);

	if (ns->ndev && nvme_nvm_register_sysfs(ns))
@@ -2915,7 +2920,7 @@ static void nvme_ns_remove(struct nvme_ns *ns) 
		if (blk_get_integrity(ns->disk))

			blk_integrity_unregister(ns->disk);

		sysfs_remove_group(&disk_to_dev(ns->disk)->kobj,

					&nvme_ns_attr_group);

					&nvme_ns_id_attr_group);

		if (ns->ndev)

			nvme_nvm_unregister_sysfs(ns);

		del_gendisk(ns->disk);

drivers/nvme/host/multipath.c

+6 −0
Original line number Diff line number Diff line
@@ -239,12 +239,18 @@ void nvme_mpath_add_disk(struct nvme_ns_head *head) 
	if (!head->disk)

		return;

	device_add_disk(&head->subsys->dev, head->disk);

	if (sysfs_create_group(&disk_to_dev(head->disk)->kobj,

			&nvme_ns_id_attr_group))

		pr_warn("%s: failed to create sysfs group for identification\n",

			head->disk->disk_name);

}



void nvme_mpath_remove_disk(struct nvme_ns_head *head)

{

	if (!head->disk)

		return;

	sysfs_remove_group(&disk_to_dev(head->disk)->kobj,

			   &nvme_ns_id_attr_group);

	del_gendisk(head->disk);

	blk_set_queue_dying(head->disk->queue);

	/* make sure all pending bios are cleaned up */

drivers/nvme/host/nvme.h

+1 −0
Original line number Diff line number Diff line
@@ -396,6 +396,7 @@ int nvme_reset_ctrl(struct nvme_ctrl *ctrl); 
int nvme_delete_ctrl(struct nvme_ctrl *ctrl);

int nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl);



extern const struct attribute_group nvme_ns_id_attr_group;

extern const struct block_device_operations nvme_ns_head_ops;



#ifdef CONFIG_NVME_MULTIPATH