Commit af252044 authored by Jim Harris's avatar Jim Harris Committed by Darek Stojaczyk
Browse files

bdev/nvme: always enable FTL 



FTL doesn't have any kind of special package requirements.
It is getting pretty good traction in the community, so
let's enable it by default.

Note that we will disable FTL on FreeBSD.  FTL uses
CIRCLEQ which is not available on FreeBSD.  Let's not
spend time trying to get FTL to work on FreeBSD until
there's a demand to do so.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I15525b6c4e6ee52f49adf74d55f9484fe08a6dcc

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/452752


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent 8df1f6b2

CONFIG

+0 −3
Original line number Diff line number Diff line
@@ -126,9 +126,6 @@ CONFIG_VTUNE_DIR= 
# Build the dpdk igb_uio driver

CONFIG_IGB_UIO_DRIVER=n



# Build FTL library

CONFIG_FTL=n



# Build Intel IPSEC_MB library

CONFIG_IPSEC_MB=n

configure

+0 −8
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ function usage() 
	echo "                           example: /usr/src/ocf/"

	echo " isal                      Enabled by default on x86 architecture. Can be built without though."

	echo "                           No path required."

	echo " ftl                       Required to build FTL module."

	echo "                           No path required."

	echo " uring                     Required to support I/O uring on Linux. If no argument, searches"

	echo "                           the standard installation directory. If an argument is provided, it is"

	echo "                           considered a directory containing liburing.a and io_uring.h."
@@ -293,12 +291,6 @@ for i in "$@"; do 
		--without-igb-uio-driver)

			CONFIG[IGB_UIO_DRIVER]=n

			;;

		--with-ftl)

			CONFIG[FTL]=y

			;;

		--without-ftl)

			CONFIG[FTL]=n

			;;

		--with-ocf)

			CONFIG[OCF]=y

			CONFIG[OCF_PATH]=$(readlink -f "./ocf")

lib/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -38,13 +38,12 @@ DIRS-y += bdev blob blobfs conf copy event json jsonrpc \ 
          log lvol net rpc sock thread trace util nvme nvmf scsi ioat \

          ut_mock iscsi notify

ifeq ($(OS),Linux)

DIRS-y += nbd

DIRS-y += nbd ftl

DIRS-$(CONFIG_VHOST) += vhost

DIRS-$(CONFIG_VIRTIO) += virtio

endif



DIRS-$(CONFIG_REDUCE) += reduce

DIRS-$(CONFIG_FTL) += ftl



# If CONFIG_ENV is pointing at a directory in lib, build it.

# Out-of-tree env implementations must be built separately by the user.

lib/bdev/nvme/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -35,10 +35,9 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) 
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk



C_SRCS = bdev_nvme.c bdev_nvme_rpc.c nvme_rpc.c common.c

LIBNAME = bdev_nvme



ifeq ($(CONFIG_FTL),y)

ifeq ($(OS),Linux)

C_SRCS += bdev_ftl.c bdev_ftl_rpc.c

endif

LIBNAME = bdev_nvme



include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk

mk/spdk.modules.mk

+1 −4
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ SYS_LIBS += -libverbs -lrdmacm 
endif



ifeq ($(OS),Linux)

BLOCKDEV_MODULES_LIST += ftl

BLOCKDEV_MODULES_LIST += bdev_aio

SYS_LIBS += -laio

ifeq ($(CONFIG_VIRTIO),y)
@@ -85,10 +86,6 @@ BLOCKDEV_MODULES_LIST += bdev_pmem 
SYS_LIBS += -lpmemblk

endif



ifeq ($(CONFIG_FTL),y)

BLOCKDEV_MODULES_LIST += ftl

endif



SOCK_MODULES_LIST = sock_posix



ifeq ($(CONFIG_VPP),y)