Commit 6fa350f7 authored by Max Gurtovoy's avatar Max Gurtovoy Committed by Christoph Hellwig
Browse files

nvmet: introduce flags member in nvmet_fabrics_ops 



Replace has_keyed_sgls and metadata_support booleans with a flags member
that will be used for adding more features in the future.

Signed-off-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: default avatarIsrael Rukshin <israelr@mellanox.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 4e102559

drivers/nvme/target/admin-cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req) 
	id->awupf = 0;



	id->sgls = cpu_to_le32(1 << 0);	/* we always support SGLs */

	if (ctrl->ops->has_keyed_sgls)

	if (ctrl->ops->flags & NVMF_KEYED_SGLS)

		id->sgls |= cpu_to_le32(1 << 2);

	if (req->port->inline_data_size)

		id->sgls |= cpu_to_le32(1 << 20);

drivers/nvme/target/core.c

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ int nvmet_enable_port(struct nvmet_port *port) 
	 * If the user requested PI support and the transport isn't pi capable,

	 * don't enable the port.

	 */

	if (port->pi_enable && !ops->metadata_support) {

	if (port->pi_enable && !(ops->flags & NVMF_METADATA_SUPPORTED)) {

		pr_err("T10-PI is not supported by transport type %d\n",

		       port->disc_addr.trtype);

		ret = -EINVAL;

drivers/nvme/target/discovery.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static void nvmet_execute_disc_identify(struct nvmet_req *req) 
	id->maxcmd = cpu_to_le16(NVMET_MAX_CMD);



	id->sgls = cpu_to_le32(1 << 0);	/* we always support SGLs */

	if (ctrl->ops->has_keyed_sgls)

	if (ctrl->ops->flags & NVMF_KEYED_SGLS)

		id->sgls |= cpu_to_le32(1 << 2);

	if (req->port->inline_data_size)

		id->sgls |= cpu_to_le32(1 << 20);

drivers/nvme/target/nvmet.h

+3 −2
Original line number Diff line number Diff line
@@ -286,8 +286,9 @@ struct nvmet_fabrics_ops { 
	struct module *owner;

	unsigned int type;

	unsigned int msdbd;

	bool has_keyed_sgls : 1;

	bool metadata_support : 1;

	unsigned int flags;

#define NVMF_KEYED_SGLS			(1 << 0)

#define NVMF_METADATA_SUPPORTED		(1 << 1)

	void (*queue_response)(struct nvmet_req *req);

	int (*add_port)(struct nvmet_port *port);

	void (*remove_port)(struct nvmet_port *port);

drivers/nvme/target/rdma.c

+1 −2
Original line number Diff line number Diff line
@@ -1970,8 +1970,7 @@ static const struct nvmet_fabrics_ops nvmet_rdma_ops = { 
	.owner			= THIS_MODULE,

	.type			= NVMF_TRTYPE_RDMA,

	.msdbd			= 1,

	.has_keyed_sgls		= 1,

	.metadata_support	= 1,

	.flags			= NVMF_KEYED_SGLS | NVMF_METADATA_SUPPORTED,

	.add_port		= nvmet_rdma_add_port,

	.remove_port		= nvmet_rdma_remove_port,

	.queue_response		= nvmet_rdma_queue_response,