Commit 30a31a16 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

sock/vpp: remove VPP implementation 



This patch removes implementation of VPP socket abstraction
along with ways to compile it.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I089f7703cfc4fb517f8f80f4368e544bced549b6
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3734


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 050df88c

CONFIG

+0 −4
Original line number Diff line number Diff line
@@ -125,10 +125,6 @@ CONFIG_PMDK_DIR= 
# Enable the dependencies for building the compress vbdev

CONFIG_REDUCE=n



# Build with VPP

CONFIG_VPP=n

CONFIG_VPP_DIR=



# Requires libiscsi development libraries.

CONFIG_ISCSI_INITIATOR=n

configure

+0 −25
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ function usage() 
	echo "                           example: /usr/share/pmdk"

	echo " reduce                    Build vbdev compression module."

	echo "                           No path required."

	echo " vpp                       Build VPP net module."

	echo "                           example: /vpp_repo/build-root/rpmbuild/vpp-18.01.1.0/build-root/install-vpp-native/vpp"

	echo " rbd                       Build Ceph RBD bdev module."

	echo "                           No path required."

	echo " rdma                      Build RDMA transport for NVMf target and initiator."
@@ -363,17 +361,6 @@ for i in "$@"; do 
		--without-reduce)

			CONFIG[REDUCE]=n

			;;

		--with-vpp)

			CONFIG[VPP]=y

			;;

		--with-vpp=*)

			CONFIG[VPP]=y

			check_dir "$i"

			CONFIG[VPP_DIR]=$(readlink -f ${i#*=})

			;;

		--without-vpp)

			CONFIG[VPP]=n

			;;

		--with-fio) ;&

		--with-fio=*)

			if [[ ${i#*=} != "$i" ]]; then
@@ -706,18 +693,6 @@ if [[ "${CONFIG[REDUCE]}" = "y" ]]; then 
	fi

fi



if [[ "${CONFIG[VPP]}" = "y" ]]; then

	if [ ! -z "${CONFIG[VPP_DIR]}" ]; then

		VPP_CFLAGS="-L${CONFIG[VPP_DIR]}/lib -I${CONFIG[VPP_DIR]}/include"

	fi

	if ! echo -e '#include <vnet/session/application_interface.h>\nint main(void) { return 0; }\n' \

		| ${BUILD_CMD[@]} ${VPP_CFLAGS} -lvppinfra -lsvm -lvlibmemoryclient - 2>/dev/null; then

		echo --with-vpp requires installed vpp.

		echo Please install then re-run this script.

		exit 1

	fi

fi



if [[ "${CONFIG[NVME_CUSE]}" = "y" ]]; then

	if ! echo -e '#define FUSE_USE_VERSION 31\n#include <fuse3/cuse_lowlevel.h>\n#include <fuse3/fuse_lowlevel.h>\n#include <fuse3/fuse_opt.h>\nint main(void) { return 0; }\n' \

		| ${BUILD_CMD[@]} -lfuse3 -D_FILE_OFFSET_BITS=64 - 2>/dev/null; then

examples/bdev/fio_plugin/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ FIO_PLUGIN := spdk_bdev 


C_SRCS = fio_plugin.c



# Unable to combine the FIO plugin and the VPP socket abstraction (license incompatibility)

SPDK_LIB_LIST = $(filter-out sock_vpp,$(ALL_MODULES_LIST))

SPDK_LIB_LIST = $(ALL_MODULES_LIST)

SPDK_LIB_LIST += thread util bdev bdev_rpc conf accel rpc jsonrpc json log sock trace notify

SPDK_LIB_LIST += event $(EVENT_BDEV_SUBSYSTEM)

examples/nvme/fio_plugin/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ FIO_PLUGIN := spdk_nvme 


C_SRCS = fio_plugin.c



# Unable to combine the FIO plugin and the VPP socket abstraction (license incompatibility)

SPDK_LIB_LIST = $(filter-out sock_vpp,$(SOCK_MODULES_LIST))

SPDK_LIB_LIST = $(SOCK_MODULES_LIST)

SPDK_LIB_LIST += nvme thread util log sock vmd jsonrpc json rpc



ifeq ($(CONFIG_RDMA),y)

examples/sock/hello_world/hello_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ hello_sock_usage(void) 
{

	printf(" -H host_addr  host address\n");

	printf(" -P port       port number\n");

	printf(" -N sock_impl  socket implementation, e.g., -N posix or -N vpp\n");

	printf(" -N sock_impl  socket implementation, e.g., -N posix or -N uring\n");

	printf(" -S            start in server mode\n");

	printf(" -V            print out additional informations");

}