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

Commit e9a48034 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Jens Axboe
Browse files

nvme: create 'slaves' and 'holders' entries for hidden controllers 



When creating nvme multipath devices we should populate the 'slaves' and
'holders' directorys properly to aid userspace topology detection.

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
[hch: split from a larger patch, compile fix for CONFIG_NVME_MULTIPATH=n]
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 17eac099

drivers/nvme/host/core.c

+2 −0
Original line number Diff line number Diff line
@@ -2896,6 +2896,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) 


	if (new)

		nvme_mpath_add_disk(ns->head);

	nvme_mpath_add_disk_links(ns);

	return;

 out_unlink_ns:

	mutex_lock(&ctrl->subsys->lock);
@@ -2919,6 +2920,7 @@ static void nvme_ns_remove(struct nvme_ns *ns) 
	if (ns->disk && ns->disk->flags & GENHD_FL_UP) {

		if (blk_get_integrity(ns->disk))

			blk_integrity_unregister(ns->disk);

		nvme_mpath_remove_disk_links(ns);

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

					&nvme_ns_id_attr_group);

		if (ns->ndev)

drivers/nvme/host/multipath.c

+30 −0
Original line number Diff line number Diff line
@@ -245,6 +245,25 @@ void nvme_mpath_add_disk(struct nvme_ns_head *head) 
			head->disk->disk_name);

}



void nvme_mpath_add_disk_links(struct nvme_ns *ns)

{

	struct kobject *slave_disk_kobj, *holder_disk_kobj;



	if (!ns->head->disk)

		return;



	slave_disk_kobj = &disk_to_dev(ns->disk)->kobj;

	if (sysfs_create_link(ns->head->disk->slave_dir, slave_disk_kobj,

			kobject_name(slave_disk_kobj)))

		return;



	holder_disk_kobj = &disk_to_dev(ns->head->disk)->kobj;

	if (sysfs_create_link(ns->disk->part0.holder_dir, holder_disk_kobj,

			kobject_name(holder_disk_kobj)))

		sysfs_remove_link(ns->head->disk->slave_dir,

			kobject_name(slave_disk_kobj));

}



void nvme_mpath_remove_disk(struct nvme_ns_head *head)

{

	if (!head->disk)
@@ -259,3 +278,14 @@ void nvme_mpath_remove_disk(struct nvme_ns_head *head) 
	blk_cleanup_queue(head->disk->queue);

	put_disk(head->disk);

}



void nvme_mpath_remove_disk_links(struct nvme_ns *ns)

{

	if (!ns->head->disk)

		return;



	sysfs_remove_link(ns->disk->part0.holder_dir,

			kobject_name(&disk_to_dev(ns->head->disk)->kobj));

	sysfs_remove_link(ns->head->disk->slave_dir,

			kobject_name(&disk_to_dev(ns->disk)->kobj));

}

drivers/nvme/host/nvme.h

+8 −0
Original line number Diff line number Diff line
@@ -405,7 +405,9 @@ bool nvme_req_needs_failover(struct request *req); 
void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl);

int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head);

void nvme_mpath_add_disk(struct nvme_ns_head *head);

void nvme_mpath_add_disk_links(struct nvme_ns *ns);

void nvme_mpath_remove_disk(struct nvme_ns_head *head);

void nvme_mpath_remove_disk_links(struct nvme_ns *ns);



static inline void nvme_mpath_clear_current_path(struct nvme_ns *ns)

{
@@ -437,6 +439,12 @@ static inline void nvme_mpath_add_disk(struct nvme_ns_head *head) 
static inline void nvme_mpath_remove_disk(struct nvme_ns_head *head)

{

}

static inline void nvme_mpath_add_disk_links(struct nvme_ns *ns)

{

}

static inline void nvme_mpath_remove_disk_links(struct nvme_ns *ns)

{

}

static inline void nvme_mpath_clear_current_path(struct nvme_ns *ns)

{

}