Commit 68b467b7 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

CONFIG, pkgdep: enable nvme-cuse by default 



nvme-cuse was only gated by a configure flag originally because it was
experimental. It only requires libfuse3, so since it is no longer experimental
this is reasonable to just enable by default.

nvme-cuse is also the only way to use nvme-cli with SPDK, so it is better to
just enable it by default for that reason alone.

Note, we are only enabling CONFIG_NVME_CUSE=y in this patch. CONFIG_FUSE
(for blobfs) remains disabled by default.

Signed-off-by: default avatarJim Harris <jim.harris@samsung.com>
Change-Id: Ie40f2daf60945e6329e91c8f7dd0aac8e8b7baf2
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21090


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Community-CI: Mellanox Build Bot
parent 127b5e84

CONFIG

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ CONFIG_RDMA_SET_TOS=n 
CONFIG_RDMA_PROV=verbs



# Enable NVMe Character Devices.

CONFIG_NVME_CUSE=n

CONFIG_NVME_CUSE=y



# Enable FC support for the NVMf target.

# Requires FC low level driver (from FC vendor)

configure

+3 −1
Original line number Diff line number Diff line
@@ -185,7 +185,9 @@ if [[ $sys_name != "Linux" ]]; then 
	# Vhost, rte_vhost library and virtio are only supported on Linux.

	CONFIG[VHOST]="n"

	CONFIG[VIRTIO]="n"

	echo "Notice: Vhost, rte_vhost library and virtio are only supported on Linux. Turning off default feature."

	CONFIG[NVME_CUSE]="n"

	echo "Notice: Vhost, rte_vhost library, virtio, and fuse"

	echo "are only supported on Linux. Turning off default feature."

fi



function check_dir() {

scripts/pkgdep.sh

+0 −5
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ function usage() { 
	echo "  -a --all"

	echo "  -d --developer-tools        Install tools for developers (code styling, code coverage, etc.)"

	echo "  -p --pmem                   Additional dependencies for reduce"

	echo "  -f --fuse                   Additional dependencies for FUSE and NVMe-CUSE"

	echo "  -R --rbd                    Additional dependencies for RBD"

	echo "  -r --rdma                   Additional dependencies for RDMA transport in NVMe over Fabrics"

	echo "  -b --docs                   Additional dependencies for building docs"
@@ -33,7 +32,6 @@ function usage() { 
function install_all_dependencies() {

	INSTALL_DEV_TOOLS=true

	INSTALL_PMEM=true

	INSTALL_FUSE=true

	INSTALL_RBD=true

	INSTALL_RDMA=true

	INSTALL_DOCS=true
@@ -46,7 +44,6 @@ function install_all_dependencies() { 
INSTALL_CRYPTO=false

INSTALL_DEV_TOOLS=false

INSTALL_PMEM=false

INSTALL_FUSE=false

INSTALL_RBD=false

INSTALL_RDMA=false

INSTALL_DOCS=false
@@ -63,7 +60,6 @@ while getopts 'abdfhipruADGR-:' optchar; do 
				all) install_all_dependencies ;;

				developer-tools) INSTALL_DEV_TOOLS=true ;;

				pmem) INSTALL_PMEM=true ;;

				fuse) INSTALL_FUSE=true ;;

				rbd) INSTALL_RBD=true ;;

				rdma) INSTALL_RDMA=true ;;

				docs) INSTALL_DOCS=true ;;
@@ -81,7 +77,6 @@ while getopts 'abdfhipruADGR-:' optchar; do 
		a) install_all_dependencies ;;

		d) INSTALL_DEV_TOOLS=true ;;

		p) INSTALL_PMEM=true ;;

		f) INSTALL_FUSE=true ;;

		R) INSTALL_RBD=true ;;

		r) INSTALL_RDMA=true ;;

		b) INSTALL_DOCS=true ;;

scripts/pkgdep/arch.sh

+1 −5
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#

# Install main dependencies

pacman -Sy --needed --noconfirm gcc make cunit libaio openssl \

	libutil-linux libiscsi python ncurses json-c cmocka ninja meson

	libutil-linux libiscsi python ncurses json-c cmocka ninja meson fuse3

# Additional dependencies for SPDK CLI

pacman -Sy --needed --noconfirm python-pexpect python-pip libffi

pip install configshell_fb
@@ -52,10 +52,6 @@ if [[ $INSTALL_PMEM == "true" ]]; then 
	ldconfig

	rm -rf /tmp/pmdk

fi

if [[ $INSTALL_FUSE == "true" ]]; then

	# Additional dependencies for FUSE and NVMe-CUSE

	pacman -Sy --needed --noconfirm fuse3

fi

if [[ $INSTALL_RBD == "true" ]]; then

	echo "Arch Linux does not have librados-devel and librbd-devel in mainline repositories."

	echo "You can install them manually"

scripts/pkgdep/debian.sh

+1 −5
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#



apt-get install -y gcc g++ make libcunit1-dev libaio-dev libssl-dev libjson-c-dev libcmocka-dev uuid-dev libiscsi-dev

apt-get install -y libncurses5-dev libncursesw5-dev python3 python3-pip python3-dev unzip

apt-get install -y libncurses5-dev libncursesw5-dev python3 python3-pip python3-dev unzip libfuse3-dev

pip3 install ninja

pip3 install meson

pip3 install pyelftools
@@ -36,10 +36,6 @@ if [[ $INSTALL_PMEM == "true" ]]; then 
	# Additional dependencies for building pmem based backends

	apt-get install -y libpmem-dev libpmemblk-dev libpmemobj-dev

fi

if [[ $INSTALL_FUSE == "true" ]]; then

	# Additional dependencies for FUSE and NVMe-CUSE

	apt-get install -y libfuse3-dev

fi

if [[ $INSTALL_RBD == "true" ]]; then

	# Additional dependencies for RBD bdev in NVMe over Fabrics

	apt-get install -y librados-dev librbd-dev