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

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

nvmet: refactor configfs transport type handling 



Have a common table of mappings from numerical transport ids to names, and
zero the transport specific area in common code in nvmet_addr_trtype_store.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f871749a

drivers/nvme/target/configfs.c

+29 −32
Original line number Diff line number Diff line
@@ -23,6 +23,15 @@ 
static const struct config_item_type nvmet_host_type;

static const struct config_item_type nvmet_subsys_type;



static const struct nvmet_transport_name {

	u8		type;

	const char	*name;

} nvmet_transport_names[] = {

	{ NVMF_TRTYPE_RDMA,	"rdma" },

	{ NVMF_TRTYPE_FC,	"fc" },

	{ NVMF_TRTYPE_LOOP,	"loop" },

};



/*

 * nvmet_port Generic ConfigFS definitions.

 * Used in any place in the ConfigFS tree that refers to an address.
@@ -208,43 +217,30 @@ CONFIGFS_ATTR(nvmet_, addr_trsvcid); 
static ssize_t nvmet_addr_trtype_show(struct config_item *item,

		char *page)

{

	switch (to_nvmet_port(item)->disc_addr.trtype) {

	case NVMF_TRTYPE_RDMA:

		return sprintf(page, "rdma\n");

	case NVMF_TRTYPE_LOOP:

		return sprintf(page, "loop\n");

	case NVMF_TRTYPE_FC:

		return sprintf(page, "fc\n");

	default:

		return sprintf(page, "\n");

	struct nvmet_port *port = to_nvmet_port(item);

	int i;



	for (i = 0; i < ARRAY_SIZE(nvmet_transport_names); i++) {

		if (port->disc_addr.trtype != nvmet_transport_names[i].type)

			continue;

		return sprintf(page, "%s\n", nvmet_transport_names[i].name);

	}



	return sprintf(page, "\n");

}



static void nvmet_port_init_tsas_rdma(struct nvmet_port *port)

{

	port->disc_addr.trtype = NVMF_TRTYPE_RDMA;

	memset(&port->disc_addr.tsas.rdma, 0, NVMF_TSAS_SIZE);

	port->disc_addr.tsas.rdma.qptype = NVMF_RDMA_QPTYPE_CONNECTED;

	port->disc_addr.tsas.rdma.prtype = NVMF_RDMA_PRTYPE_NOT_SPECIFIED;

	port->disc_addr.tsas.rdma.cms = NVMF_RDMA_CMS_RDMA_CM;

}



static void nvmet_port_init_tsas_loop(struct nvmet_port *port)

{

	port->disc_addr.trtype = NVMF_TRTYPE_LOOP;

	memset(&port->disc_addr.tsas, 0, NVMF_TSAS_SIZE);

}



static void nvmet_port_init_tsas_fc(struct nvmet_port *port)

{

	port->disc_addr.trtype = NVMF_TRTYPE_FC;

	memset(&port->disc_addr.tsas, 0, NVMF_TSAS_SIZE);

}



static ssize_t nvmet_addr_trtype_store(struct config_item *item,

		const char *page, size_t count)

{

	struct nvmet_port *port = to_nvmet_port(item);

	int i;



	if (port->enabled) {

		pr_err("Cannot modify address while enabled\n");
@@ -252,17 +248,18 @@ static ssize_t nvmet_addr_trtype_store(struct config_item *item, 
		return -EACCES;

	}



	if (sysfs_streq(page, "rdma")) {

		nvmet_port_init_tsas_rdma(port);

	} else if (sysfs_streq(page, "loop")) {

		nvmet_port_init_tsas_loop(port);

	} else if (sysfs_streq(page, "fc")) {

		nvmet_port_init_tsas_fc(port);

	} else {

		pr_err("Invalid value '%s' for trtype\n", page);

		return -EINVAL;

	for (i = 0; i < ARRAY_SIZE(nvmet_transport_names); i++) {

		if (sysfs_streq(page, nvmet_transport_names[i].name))

			goto found;

	}



	pr_err("Invalid value '%s' for trtype\n", page);

	return -EINVAL;

found:

	memset(&port->disc_addr.tsas, 0, NVMF_TSAS_SIZE);

	port->disc_addr.trtype = nvmet_transport_names[i].type;

	if (port->disc_addr.trtype == NVMF_TRTYPE_RDMA)

		nvmet_port_init_tsas_rdma(port);

	return count;

}