Commit 9dbea09a authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

bdev/compress: remove this deprecated module



Signed-off-by: default avatarJim Harris <jim.harris@nvidia.com>
Change-Id: Ice17e964c3716eabd339eb1359f489e5f1045dc1
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26447


Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarKonrad Sztyber <ksztyber@nvidia.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarChangpeng Liu <changpeliu@tencent.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
parent e9a42847
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -135,12 +135,6 @@ CONFIG_XNVME=n
# Enable the dependencies for building the DPDK accel compress module
CONFIG_DPDK_COMPRESSDEV=n

# Enable the dependencies for building the compress vbdev, includes the reduce library
CONFIG_VBDEV_COMPRESS=n

# Enable mlx5_pci dpdk compress PMD, enabled automatically if CONFIG_VBDEV_COMPRESS=y and libmlx5 exists
CONFIG_VBDEV_COMPRESS_MLX5=n

# Enable mlx5_pci dpdk crypto PMD, enabled automatically if CONFIG_CRYPTO=y and libmlx5 exists
CONFIG_CRYPTO_MLX5=n

+0 −1
Original line number Diff line number Diff line
@@ -355,7 +355,6 @@ S: Supported

REDUCE COMPRESSION LIBRARY
F:	lib/reduce/
F:	module/bdev/compress/
S:	Obsolete

SCHEDULERS
+1 −6
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ if [ $SPDK_TEST_UNITTEST -eq 1 ]; then
fi

if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then
	if [[ $SPDK_TEST_CRYPTO -eq 1 || $SPDK_TEST_VBDEV_COMPRESS -eq 1 ]]; then
	if [[ $SPDK_TEST_CRYPTO -eq 1 ]]; then
		if [[ $SPDK_TEST_USE_IGB_UIO -eq 1 ]]; then
			$rootdir/scripts/qat_setup.sh igb_uio
		else
@@ -348,11 +348,6 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then
		run_test "vmd" $rootdir/test/vmd/vmd.sh
	fi

	if [ $SPDK_TEST_VBDEV_COMPRESS -eq 1 ]; then
		run_test "compress_compdev" $rootdir/test/compress/compress.sh "compdev"
		run_test "compress_isal" $rootdir/test/compress/compress.sh "isal"
	fi

	if [ $SPDK_TEST_OPAL -eq 1 ]; then
		run_test "nvme_opal" $rootdir/test/nvme/nvme_opal.sh
	fi
+0 −49
Original line number Diff line number Diff line
@@ -76,8 +76,6 @@ function usage() {
	echo "                           vfio-user initiator is always built-in in Linux."
	echo "                           example: /usr/src/libvfio-user"
	echo " --without-vfio-user       No path required."
	echo " --with-vbdev-compress     Build vbdev compression module and dependencies."
	echo " --without-vbdev-compress  No path required."
	echo " --with-dpdk-compressdev   Build accel DPDK compression module and dependencies."
	echo " --without-dpdk-compressdev No path required."
	echo " --with-rbd                Build Ceph RBD bdev module."
@@ -556,12 +554,6 @@ for i in "$@"; do
		--without-vfio-user)
			CONFIG[VFIO_USER]=n
			;;
		--with-vbdev-compress)
			CONFIG[VBDEV_COMPRESS]=y
			;;
		--without-vbdev-compress)
			CONFIG[VBDEV_COMPRESS]=n
			;;
		--with-dpdk-compressdev)
			CONFIG[DPDK_COMPRESSDEV]=y
			;;
@@ -984,46 +976,6 @@ function mlx5_build() {
	return 0
}

if [[ "${CONFIG[VBDEV_COMPRESS]}" = "y" ]]; then
	if ! echo -e '#include <libpmem.h>\nint main(void) { return 0; }\n' \
		| "${BUILD_CMD[@]}" -lpmem - 2> /dev/null; then
		echo "--with-vbdev-compress requires libpmem."
		echo "Please install then re-run this script."
		exit 1
	fi
	# Try to enable mlx5 compress
	CONFIG[VBDEV_COMPRESS_MLX5]="y"

	# Check if libmlx5 exists to enable mlx5_pci compress PMD
	if ! mlx5_build; then
		echo "libmlx5 is not found, so disabling DPDK mlx5_pci compress PMD"
		CONFIG[VBDEV_COMPRESS_MLX5]="n"
	else
		if [[ "${CONFIG[DPDK_PKG_CONFIG]}" = "y" ]]; then
			# Check if librte_compress_mlx5 exists in DPDK package
			if [ ! -f "${CONFIG[DPDK_LIB_DIR]}"/librte_compress_mlx5.so ]; then
				echo "librte_compress_mlx5 is not found, so disabling DPDK mlx5_pci compress PMD"
				CONFIG[VBDEV_COMPRESS_MLX5]="n"
			fi
		else
			# Check DPDK version to determine if mlx5_pci driver is supported
			dpdk_ver=$(dpdk_version)
			if [[ $dpdk_ver = "none" ]]; then
				echo "Cannot get DPDK version, so disabling DPDK mlx5_pci compress PMD"
				CONFIG[VBDEV_COMPRESS_MLX5]="n"
			elif [[ -n $dpdk_ver ]] && lt "$dpdk_ver" 21.02.0; then
				# mlx5_pci for compress is supported by DPDK >- 21.02.0
				echo "DPDK version ${dpdk_ver} doesn't support mlx5_pci compress PMD"
				CONFIG[VBDEV_COMPRESS_MLX5]="n"
			elif [[ -n ${CONFIG[DPDK_LIB_DIR]} ]] && [ ! -f "${CONFIG[DPDK_LIB_DIR]}"/librte_compress_mlx5.so ]; then
				# This is only checked when --with-dpdk or --with-dpdk=* is used
				echo "librte_compress_mlx5 is not found, so disabling DPDK mlx5_pci compress PMD"
				CONFIG[VBDEV_COMPRESS_MLX5]="n"
			fi
		fi
	fi
fi

if [[ "${CONFIG[CRYPTO]}" = "y" ]]; then
	# Try to enable mlx5 crypto
	CONFIG[CRYPTO_MLX5]="y"
@@ -1322,7 +1274,6 @@ else
	echo "Without ISA-L, there is no software support for crypto or compression,"
	echo "so these features will be disabled."
	CONFIG[CRYPTO]=n
	CONFIG[VBDEV_COMPRESS]=n
	CONFIG[DPDK_COMPRESSDEV]=n
fi

+0 −8
Original line number Diff line number Diff line
@@ -63,14 +63,6 @@ The entire reduce library is deprecated and will be removed in 25.09 release.
All functions in this library are effectively deprecated, but only these two
are officially marked as such to ensure the library's deprecation is noticed.

### bdev_compress

#### 'bdev_compress_create', 'bdev_compress_delete', 'bdev_compress_get_orphans' RPCs

The entire bdev compress module is deprecated and will be removed in 25.09
release. The C module exports no public APIs, so none are listed here, but
the module will emit deprecation warnings when usage is detected.

### blobfs

#### 'spdk_fs_init', 'spdk_fs_load', 'blobfs_\*' RPCs
Loading