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

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

nvme-fabrics: add a generic NVMe over Fabrics library 



The NVMe over Fabrics library provides an interface for both transports
and the nvme core to handle fabrics specific commands and attributes
independent of the underlying transport.

In addition, the fabrics library adds a misc device interface that allow
actually creating a fabrics controller, as we can't just autodiscover
it like in the PCI case.  The nvme-cli utility has been enhanced to use
this interface to support fabric connect and discovery.

Signed-off-by: default avatarArmen Baloyan <armenx.baloyan@intel.com&gt;,>
Signed-off-by: default avatarJay Freyensee <james.p.freyensee@intel.com&gt;,>
Signed-off-by: default avatarMing Lin <ming.l@ssi.samsung.com>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent eb793e2c

drivers/nvme/host/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -24,3 +24,6 @@ config BLK_DEV_NVME_SCSI 
	  to say N here, unless you run a distro that abuses the SCSI

	  emulation to provide stable device names for mount by id, like

	  some OpenSuSE and SLES versions.



config NVME_FABRICS

	tristate

drivers/nvme/host/Makefile

+3 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_NVME_CORE)			+= nvme-core.o

obj-$(CONFIG_BLK_DEV_NVME)		+= nvme.o

obj-$(CONFIG_NVME_FABRICS)		+= nvme-fabrics.o



nvme-core-y				:= core.o

nvme-core-$(CONFIG_BLK_DEV_NVME_SCSI)	+= scsi.o

nvme-core-$(CONFIG_NVM)			+= lightnvm.o



nvme-y					+= pci.o



nvme-fabrics-y				+= fabrics.o

drivers/nvme/host/core.c

+18 −1
Original line number Diff line number Diff line
@@ -1178,9 +1178,26 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) 
	}



	nvme_set_queue_limits(ctrl, ctrl->admin_q);

	ctrl->sgls = le32_to_cpu(id->sgls);



	if (ctrl->ops->is_fabrics) {

		ctrl->icdoff = le16_to_cpu(id->icdoff);

		ctrl->ioccsz = le32_to_cpu(id->ioccsz);

		ctrl->iorcsz = le32_to_cpu(id->iorcsz);

		ctrl->maxcmd = le16_to_cpu(id->maxcmd);



		/*

		 * In fabrics we need to verify the cntlid matches the

		 * admin connect

		 */

		if (ctrl->cntlid != le16_to_cpu(id->cntlid))

			ret = -EINVAL;

	} else {

		ctrl->cntlid = le16_to_cpu(id->cntlid);

	}



	kfree(id);

	return 0;

	return ret;

}

EXPORT_SYMBOL_GPL(nvme_init_identify);