From 461cfcecc64dccca9e36344ce83625fee6693103 Mon Sep 17 00:00:00 2001 From: Pawel Wodkowski Date: Wed, 26 Sep 2018 13:19:28 +0200 Subject: [PATCH] CONFIG: add missing CONFIG_ options Also fix options that doesn't start with CONFIG_ prefix. Change-Id: I32a24373328bab8f513d56c0c09b5a86589f690c Signed-off-by: Pawel Wodkowski Reviewed-on: https://review.gerrithub.io/427767 Chandler-Test-Pool: SPDK Automated Test System Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto --- CONFIG | 12 +++++++++--- configure | 20 ++++++++++---------- examples/bdev/fio_plugin/Makefile | 2 +- examples/nvme/fio_plugin/Makefile | 2 +- lib/bdev/Makefile | 2 +- mk/spdk.common.mk | 2 +- test/nvme/spdk_nvme_cli.sh | 2 +- 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/CONFIG b/CONFIG index 087be7a7b..b1c508273 100644 --- a/CONFIG +++ b/CONFIG @@ -38,7 +38,7 @@ CONFIG_PREFIX?=/usr/local CONFIG_DEBUG?=n # Build with support of backtrace printing in log messages. Requires libunwind. -#CONFIG_LOG_BACKTRACE?=n +CONFIG_LOG_BACKTRACE?=n # Treat warnings as errors (fail the build on any warning). CONFIG_WERROR?=n @@ -69,17 +69,18 @@ CONFIG_ENV?=$(SPDK_ROOT_DIR)/lib/env_dpdk # installation. CONFIG_DPDK_DIR?=$(SPDK_ROOT_DIR)/dpdk/build -# Build SPDK FIO plugin. Requires FIO_SOURCE_DIR set to a valid +# Build SPDK FIO plugin. Requires CONFIG_FIO_SOURCE_DIR set to a valid # fio source code directory. CONFIG_FIO_PLUGIN?=n # This directory should contain the source code directory for fio # which is required for building the SPDK FIO plugin. -FIO_SOURCE_DIR?=/usr/src/fio +CONFIG_FIO_SOURCE_DIR?=/usr/src/fio # Enable RDMA support for the NVMf target. # Requires ibverbs development libraries. CONFIG_RDMA?=n +CONFIG_RDMA_SEND_WITH_INVAL?=n # Build Ceph RBD support in bdev modules # Requires librbd development libraries @@ -93,6 +94,7 @@ CONFIG_VIRTIO?=y # Build with PMDK backends CONFIG_PMDK?=n +CONFIG_PMDK_DIR?= # Build with VPP CONFIG_VPP?=n @@ -105,3 +107,7 @@ CONFIG_CRYPTO?=n # Build spdk shared libraries in addition to the static ones. CONFIG_SHARED?=n + +# Build with VTune suport. +CONFIG_VTUNE?=n +CONFIG_VTUNE_DIR?= diff --git a/configure b/configure index 674fa5fbb..254164ac8 100755 --- a/configure +++ b/configure @@ -220,20 +220,20 @@ for i in "$@"; do ;; --with-fio=*) check_dir "$i" - FIO_SOURCE_DIR="${i#*=}" + CONFIG_FIO_SOURCE_DIR="${i#*=}" CONFIG_FIO_PLUGIN=y ;; --without-fio) - FIO_SOURCE_DIR= + CONFIG_FIO_SOURCE_DIR= CONFIG_FIO_PLUGIN=n ;; --with-vtune=*) check_dir "$i" - VTUNE_SOURCE_DIR="${i#*=}" + CONFIG_VTUNE_DIR="${i#*=}" CONFIG_VTUNE=y ;; --without-vtune) - VTUNE_SOURCE_DIR= + CONFIG_VTUNE_DIR= CONFIG_VTUNE=n ;; --) @@ -271,14 +271,14 @@ else fi if [ "$CONFIG_FIO_PLUGIN" = "y" ]; then - if [ -z "$FIO_SOURCE_DIR" ]; then + if [ -z "$CONFIG_FIO_SOURCE_DIR" ]; then echo "When fio is enabled, you must specify the fio directory using --with-fio=path" exit 1 fi fi if [ "$CONFIG_VTUNE" = "y" ]; then - if [ -z "$VTUNE_SOURCE_DIR" ]; then + if [ -z "$CONFIG_VTUNE_DIR" ]; then echo "When VTune is enabled, you must specify the VTune directory using --with-vtune=path" exit 1 fi @@ -411,8 +411,8 @@ fi if [ -n "$CONFIG_FIO_PLUGIN" ]; then echo "CONFIG_FIO_PLUGIN?=$CONFIG_FIO_PLUGIN" >> CONFIG.local fi -if [ -n "$FIO_SOURCE_DIR" ]; then - echo "FIO_SOURCE_DIR?=$FIO_SOURCE_DIR" >> CONFIG.local +if [ -n "$CONFIG_FIO_SOURCE_DIR" ]; then + echo "CONFIG_FIO_SOURCE_DIR?=$CONFIG_FIO_SOURCE_DIR" >> CONFIG.local fi if [ -n "$CONFIG_RDMA" ]; then echo "CONFIG_RDMA?=$CONFIG_RDMA" >> CONFIG.local @@ -432,8 +432,8 @@ fi if [ -n "$CONFIG_VTUNE" ]; then echo "CONFIG_VTUNE?=$CONFIG_VTUNE" >> CONFIG.local fi -if [ -n "$VTUNE_SOURCE_DIR" ]; then - echo "VTUNE_SOURCE_DIR?=$VTUNE_SOURCE_DIR" >> CONFIG.local +if [ -n "$CONFIG_VTUNE_DIR" ]; then + echo "CONFIG_VTUNE_DIR?=$CONFIG_VTUNE_DIR" >> CONFIG.local fi # Environment variables diff --git a/examples/bdev/fio_plugin/Makefile b/examples/bdev/fio_plugin/Makefile index 5cff18e59..d571c2037 100644 --- a/examples/bdev/fio_plugin/Makefile +++ b/examples/bdev/fio_plugin/Makefile @@ -40,7 +40,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP := fio_plugin C_SRCS = fio_plugin.c -CFLAGS += -I$(FIO_SOURCE_DIR) +CFLAGS += -I$(CONFIG_FIO_SOURCE_DIR) LDFLAGS += -shared -rdynamic SPDK_LIB_LIST += thread util bdev conf copy rpc jsonrpc json log trace diff --git a/examples/nvme/fio_plugin/Makefile b/examples/nvme/fio_plugin/Makefile index 9e40b27ac..dfd7917db 100644 --- a/examples/nvme/fio_plugin/Makefile +++ b/examples/nvme/fio_plugin/Makefile @@ -38,7 +38,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP := fio_plugin -CFLAGS += -I$(FIO_SOURCE_DIR) +CFLAGS += -I$(CONFIG_FIO_SOURCE_DIR) LDFLAGS += -shared -rdynamic include $(SPDK_ROOT_DIR)/mk/nvme.libtest.mk diff --git a/lib/bdev/Makefile b/lib/bdev/Makefile index 8a8b45b57..a5d30a9c3 100644 --- a/lib/bdev/Makefile +++ b/lib/bdev/Makefile @@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk ifeq ($(CONFIG_VTUNE),y) -CFLAGS += -I$(VTUNE_SOURCE_DIR)/include -I$(VTUNE_SOURCE_DIR)/sdk/src/ittnotify +CFLAGS += -I$(CONFIG_VTUNE_DIR)/include -I$(CONFIG_VTUNE_DIR)/sdk/src/ittnotify endif C_SRCS = bdev.c part.c scsi_nvme.c diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk index b4d17d83d..5d62b19f4 100644 --- a/mk/spdk.common.mk +++ b/mk/spdk.common.mk @@ -187,7 +187,7 @@ CXXFLAGS += $(COMMON_CFLAGS) -std=c++0x SYS_LIBS += -lrt SYS_LIBS += -luuid SYS_LIBS += -lcrypto -ifneq ($(CONFIG_LOG_BACKTRACE),) +ifeq ($(CONFIG_LOG_BACKTRACE),y) SYS_LIBS += -lunwind endif diff --git a/test/nvme/spdk_nvme_cli.sh b/test/nvme/spdk_nvme_cli.sh index 001f26b68..86c63959d 100755 --- a/test/nvme/spdk_nvme_cli.sh +++ b/test/nvme/spdk_nvme_cli.sh @@ -33,7 +33,7 @@ ln -sf "$rootdir" "$spdk_nvme_cli/spdk" bdfs=$(iter_pci_class_code 01 08 02) bdf=$(echo $bdfs|awk '{ print $1 }') -if [[ -s $rootdir/CONFIG.local ]] && grep CONFIG_LOG_BACKTRACE $rootdir/CONFIG.local -q; then +if [[ -s $rootdir/CONFIG.local ]] && grep 'CONFIG_LOG_BACKTRACE\?=y' $rootdir/CONFIG.local -q; then nvme_cli_ldflags='LDFLAGS=-lunwind' fi