Commit 98a5097d authored by Prabhakar Kushwaha's avatar Prabhakar Kushwaha Committed by David S. Miller
Browse files

nvme-fabrics: Move NVMF_ALLOWED_OPTS and NVMF_REQUIRED_OPTS definitions 



Move NVMF_ALLOWED_OPTS and NVMF_REQUIRED_OPTS definitions
to header file, so it can be used by the different HW devices.

NVMeTCP offload devices might have different limitations of the
allowed options, for example, a device that does not support all the
queue types. With tcp and rdma, only the nvme-tcp and nvme-rdma layers
handle those attributes and the HW devices do not create any limitations
for the allowed options.

An alternative design could be to add separate fields in
nvme_tcp_ofld_ops such as max_hw_sectors and max_segments that
we already have in this series.

Acked-by: default avatarIgor Russkikh <irusskikh@marvell.com>
Signed-off-by: default avatarArie Gershberg <agershberg@marvell.com>
Signed-off-by: default avatarPrabhakar Kushwaha <pkushwaha@marvell.com>
Signed-off-by: default avatarOmkar Kulkarni <okulkarni@marvell.com>
Signed-off-by: default avatarMichal Kalderon <mkalderon@marvell.com>
Signed-off-by: default avatarAriel Elior <aelior@marvell.com>
Signed-off-by: default avatarShai Malin <smalin@marvell.com>
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Acked-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f0e8cb61

drivers/nvme/host/fabrics.c

+0 −7
Original line number Diff line number Diff line
@@ -942,13 +942,6 @@ void nvmf_free_options(struct nvmf_ctrl_options *opts) 
}

EXPORT_SYMBOL_GPL(nvmf_free_options);



#define NVMF_REQUIRED_OPTS	(NVMF_OPT_TRANSPORT | NVMF_OPT_NQN)

#define NVMF_ALLOWED_OPTS	(NVMF_OPT_QUEUE_SIZE | NVMF_OPT_NR_IO_QUEUES | \

				 NVMF_OPT_KATO | NVMF_OPT_HOSTNQN | \

				 NVMF_OPT_HOST_ID | NVMF_OPT_DUP_CONNECT |\

				 NVMF_OPT_DISABLE_SQFLOW |\

				 NVMF_OPT_FAIL_FAST_TMO)



static struct nvme_ctrl *

nvmf_create_ctrl(struct device *dev, const char *buf)

{

drivers/nvme/host/fabrics.h

+7 −0
Original line number Diff line number Diff line
@@ -68,6 +68,13 @@ enum { 
	NVMF_OPT_FAIL_FAST_TMO	= 1 << 20,

};



#define NVMF_REQUIRED_OPTS	(NVMF_OPT_TRANSPORT | NVMF_OPT_NQN)

#define NVMF_ALLOWED_OPTS	(NVMF_OPT_QUEUE_SIZE | NVMF_OPT_NR_IO_QUEUES | \

				 NVMF_OPT_KATO | NVMF_OPT_HOSTNQN | \

				 NVMF_OPT_HOST_ID | NVMF_OPT_DUP_CONNECT |\

				 NVMF_OPT_DISABLE_SQFLOW |\

				 NVMF_OPT_FAIL_FAST_TMO)



/**

 * struct nvmf_ctrl_options - Used to hold the options specified

 *			      with the parsing opts enum.