Commit daf6e8c9 authored by Shai Malin's avatar Shai Malin Committed by David S. Miller
Browse files

Revert "nvme-tcp-offload: ULP Series" 

This reverts commits:
- 76241154
     nvme: NVME_TCP_OFFLOAD should not default to m
- 5ff5622e:
     Merge branch 'NVMeTCP-Offload-ULP'

As requested on the mailing-list: https://lore.kernel.org/netdev/SJ0PR18MB3882C20793EA35A3E8DAE300CC379@SJ0PR18MB3882.namprd18.prod.outlook.com/


This patch will revert the nvme-tcp-offload ULP from net-next.

The nvme-tcp-offload ULP series will continue to be considered only on
linux-nvme@lists.infradead.org.

Signed-off-by: default avatarPrabhakar Kushwaha <pkushwaha@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>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c6be5a22

MAINTAINERS

+0 −8
Original line number Diff line number Diff line
@@ -13107,14 +13107,6 @@ F: drivers/nvme/host/ 
F:	include/linux/nvme.h

F:	include/uapi/linux/nvme_ioctl.h









NVM EXPRESS TCP OFFLOAD TRANSPORT DRIVERS









M:	Shai Malin <smalin@marvell.com>









M:	Ariel Elior <aelior@marvell.com>









L:	linux-nvme@lists.infradead.org









S:	Supported









F:	drivers/nvme/host/tcp-offload.c









F:	drivers/nvme/host/tcp-offload.h

















NVM EXPRESS FC TRANSPORT DRIVERS









M:	James Smart <james.smart@broadcom.com>









L:	linux-nvme@lists.infradead.org
































drivers/nvme/host/Kconfig



+0
−16






























Original line number
Diff line number
Diff line







@@ -84,19 +84,3 @@ config NVME_TCP







	  from https://github.com/linux-nvme/nvme-cli.



















	  If unsure, say N.


















config NVME_TCP_OFFLOAD









	tristate "NVM Express over Fabrics TCP offload common layer"









	depends on BLOCK









	depends on INET









	select NVME_CORE









	select NVME_FABRICS









	help









	  This provides support for the NVMe over Fabrics protocol using









	  the TCP offload transport. This allows you to use remote block devices









	  exported using the NVMe protocol set.



















	  To configure a NVMe over Fabrics controller use the nvme-cli tool









	  from https://github.com/linux-nvme/nvme-cli.



















	  If unsure, say N.
























drivers/nvme/host/Makefile



+0
−3






























Original line number
Diff line number
Diff line







@@ -8,7 +8,6 @@ obj-$(CONFIG_NVME_FABRICS)		+= nvme-fabrics.o







obj-$(CONFIG_NVME_RDMA)			+= nvme-rdma.o









obj-$(CONFIG_NVME_FC)			+= nvme-fc.o









obj-$(CONFIG_NVME_TCP)			+= nvme-tcp.o









obj-$(CONFIG_NVME_TCP_OFFLOAD)	+= nvme-tcp-offload.o



















nvme-core-y				:= core.o ioctl.o









nvme-core-$(CONFIG_TRACING)		+= trace.o








@@ -27,5 +26,3 @@ nvme-rdma-y				+= rdma.o







nvme-fc-y				+= fc.o



















nvme-tcp-y				+= tcp.o


















nvme-tcp-offload-y		+= tcp-offload.o
























drivers/nvme/host/fabrics.c



+9
−3






























Original line number
Diff line number
Diff line







@@ -860,7 +860,7 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts,







	return ret;









}



















int nvmf_check_required_opts(struct nvmf_ctrl_options *opts,









static int nvmf_check_required_opts(struct nvmf_ctrl_options *opts,









		unsigned int required_opts)









{









	if ((opts->mask & required_opts) != required_opts) {








@@ -879,7 +879,6 @@ int nvmf_check_required_opts(struct nvmf_ctrl_options *opts,

















	return 0;









}









EXPORT_SYMBOL_GPL(nvmf_check_required_opts);



















bool nvmf_ip_options_match(struct nvme_ctrl *ctrl,









		struct nvmf_ctrl_options *opts)








@@ -943,6 +942,13 @@ 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



+0
−9






























Original line number
Diff line number
Diff line







@@ -68,13 +68,6 @@ 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.








@@ -193,7 +186,5 @@ int nvmf_get_address(struct nvme_ctrl *ctrl, char *buf, int size);







bool nvmf_should_reconnect(struct nvme_ctrl *ctrl);









bool nvmf_ip_options_match(struct nvme_ctrl *ctrl,









		struct nvmf_ctrl_options *opts);









int nvmf_check_required_opts(struct nvmf_ctrl_options *opts,









			     unsigned int required_opts);



















#endif /* _NVME_FABRICS_H */