ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

raid: enable by default

Browse Source 
We kept this disabled by default originally because it lacked
multiple iov support needed for vhost and nvmf in-capsule data.
Now that support has been added, there is no reason to not
enable it automatically - it has no extra package dependencies,
so requiring users to specify --with-raid to configure is just
an extra unneeded step.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Ia9796370e12a6f93993e70083de36114a37851bd

Reviewed-on: https://review.gerrithub.io/426003
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Jim Harris 2018-09-18 15:55:06 -07:00 committed by Ben Walker
parent 18f80e3a51
commit 1d64773c2a
5 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -28,6 +28,9 @@ Intel QAT hardware accelerator also currently implemented with support for CBC c
may include additional ciphers as well as consideration for authentication. NOTE: this module is may include additional ciphers as well as consideration for authentication. NOTE: this module is
currently marked as experimental. Do not use in production. currently marked as experimental. Do not use in production.
The RAID virtual bdev module is now always enabled by default. The configure --with-raid and
--without-raid options are now ignored and deprecated and will be removed in the next release.
### Environment Abstraction Layer and Event Framework ### Environment Abstraction Layer and Event Framework
The size parameter of spdk_mem_map_translate is now a pointer. This allows the The size parameter of spdk_mem_map_translate is now a pointer. This allows the

3
CONFIG
View File

@ -100,9 +100,6 @@ CONFIG_VPP?=n
# Requires libiscsi development libraries. # Requires libiscsi development libraries.
CONFIG_ISCSI_INITIATOR?=n CONFIG_ISCSI_INITIATOR?=n
# Build with raid
CONFIG_RAID?=n
# Enable the dependencies for building the crypto vbdev # Enable the dependencies for building the crypto vbdev
CONFIG_CRYPTO?=n CONFIG_CRYPTO?=n

10
configure vendored
View File

@ -55,8 +55,6 @@ function usage()
echo " No path required." echo " No path required."
echo " iscsi-initiator [disabled]" echo " iscsi-initiator [disabled]"
echo " No path required." echo " No path required."
echo " raid [disabled]"
echo " No path required."
echo " vtune Required to profile I/O under Intel VTune Amplifier XE." echo " vtune Required to profile I/O under Intel VTune Amplifier XE."
echo " example: /opt/intel/vtune_amplifier_xe_version" echo " example: /opt/intel/vtune_amplifier_xe_version"
echo "" echo ""
@ -148,11 +146,10 @@ for i in "$@"; do
CONFIG_RBD=n CONFIG_RBD=n
;; ;;
--with-raid) --with-raid)
CONFIG_RAID=y echo "--with-raid option ignored and is now deprecated. RAID module is always enabled."
echo "Warning: the RAID module does not support multiple iovecs per request and will not work with vhost"
;; ;;
--without-raid) --without-raid)
CONFIG_RAID=n echo "--without-raid option ignored and is now deprecated. RAID module is always enabled."
;; ;;
--with-rdma) --with-rdma)
CONFIG_RDMA=y CONFIG_RDMA=y
@ -439,9 +436,6 @@ fi
if [ -n "$CONFIG_RBD" ]; then if [ -n "$CONFIG_RBD" ]; then
echo "CONFIG_RBD?=$CONFIG_RBD" >> CONFIG.local echo "CONFIG_RBD?=$CONFIG_RBD" >> CONFIG.local
fi fi
if [ -n "$CONFIG_RAID" ]; then
echo "CONFIG_RAID?=$CONFIG_RAID" >> CONFIG.local
fi
if [ -n "$CONFIG_VTUNE" ]; then if [ -n "$CONFIG_VTUNE" ]; then
echo "CONFIG_VTUNE?=$CONFIG_VTUNE" >> CONFIG.local echo "CONFIG_VTUNE?=$CONFIG_VTUNE" >> CONFIG.local
fi fi

3
lib/bdev/Makefile
View File

@ -42,7 +42,7 @@ C_SRCS = bdev.c part.c scsi_nvme.c
C_SRCS-$(CONFIG_VTUNE) += vtune.c C_SRCS-$(CONFIG_VTUNE) += vtune.c
LIBNAME = bdev LIBNAME = bdev
DIRS-y += error gpt lvol malloc null nvme passthru rpc split DIRS-y += error gpt lvol malloc null nvme passthru raid rpc split
ifeq ($(CONFIG_CRYPTO),y) ifeq ($(CONFIG_CRYPTO),y)
DIRS-y += crypto DIRS-y += crypto
@ -56,6 +56,5 @@ DIRS-$(CONFIG_PMDK) += pmem
endif endif
DIRS-$(CONFIG_RBD) += rbd DIRS-$(CONFIG_RBD) += rbd
DIRS-$(CONFIG_RAID) += raid
include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk

5
mk/spdk.modules.mk
View File

@ -37,6 +37,7 @@ LVOL_MODULES_LIST += blob blob_bdev lvol
BLOCKDEV_MODULES_LIST = $(LVOL_MODULES_LIST) BLOCKDEV_MODULES_LIST = $(LVOL_MODULES_LIST)
BLOCKDEV_MODULES_LIST += bdev_malloc bdev_null bdev_nvme nvme vbdev_passthru vbdev_error vbdev_gpt vbdev_split BLOCKDEV_MODULES_LIST += bdev_malloc bdev_null bdev_nvme nvme vbdev_passthru vbdev_error vbdev_gpt vbdev_split
BLOCKDEV_MODULES_LIST += vbdev_raid
ifeq ($(CONFIG_CRYPTO),y) ifeq ($(CONFIG_CRYPTO),y)
BLOCKDEV_MODULES_LIST += vbdev_crypto BLOCKDEV_MODULES_LIST += vbdev_crypto
@ -64,10 +65,6 @@ BLOCKDEV_MODULES_LIST += bdev_rbd
BLOCKDEV_MODULES_DEPS += -lrados -lrbd BLOCKDEV_MODULES_DEPS += -lrados -lrbd
endif endif
ifeq ($(CONFIG_RAID),y)
BLOCKDEV_MODULES_LIST += vbdev_raid
endif
ifeq ($(CONFIG_PMDK),y) ifeq ($(CONFIG_PMDK),y)
BLOCKDEV_MODULES_LIST += bdev_pmem BLOCKDEV_MODULES_LIST += bdev_pmem
BLOCKDEV_MODULES_DEPS += -lpmemblk BLOCKDEV_MODULES_DEPS += -lpmemblk