Commit c3b5ae0c authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

build: Place fio plugins into build/fio 



This makes them easier to find. They are now named
spdk_nvme and spdk_bdev.

Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Change-Id: I1f6736d8f7f5b9669583731fb0b710ba54f0d50a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2679


Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent 6b9b448e

CHANGELOG.md

+5 −0
Original line number Diff line number Diff line
@@ -13,6 +13,11 @@ Command line parameters `-r` and `--rpc-socket` will longer accept TCP ports. RP 
must now be started on a Unix domain socket. Exposing RPC on the network, as well as providing

proper authentication (if needed) is now a responsibility of the user.



### build



The fio plugins now compile to `build/fio` and are named `spdk_bdev` and `spdk_nvme`.

Existing fio configuration files will need to be updated.



### accel



A new API was added `spdk_accel_get_capabilities` that allows applications to

Makefile

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ all: mk/cc.mk $(DIRS-y) 
clean: $(DIRS-y)

	$(Q)rm -f include/spdk/config.h

	$(Q)rm -rf build/bin

	$(Q)rm -rf build/fio



install: all

	$(Q)echo "Installed to $(DESTDIR)$(CONFIG_PREFIX)"
@@ -107,6 +108,7 @@ mk/cc.mk: 
build_dir: mk/cc.mk

	$(Q)mkdir -p build/lib

	$(Q)mkdir -p build/bin

	$(Q)mkdir -p build/fio



include/spdk/config.h: mk/config.mk scripts/genconfig.py

	$(Q)echo "#ifndef SPDK_CONFIG_H" > $@.tmp; \

examples/bdev/fio_plugin/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -36,15 +36,13 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) 
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

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



APP := fio_plugin

FIO_PLUGIN := spdk_bdev



C_SRCS = fio_plugin.c

CFLAGS += -I$(CONFIG_FIO_SOURCE_DIR)

LDFLAGS += -shared -rdynamic -Wl,-z,nodelete



# Unable to combine the FIO plugin and the VPP socket abstraction (license incompatibility)

SPDK_LIB_LIST = $(filter-out sock_vpp,$(ALL_MODULES_LIST))

SPDK_LIB_LIST += thread util bdev bdev_rpc conf accel rpc jsonrpc json log sock trace notify

SPDK_LIB_LIST += event event_bdev event_accel event_vmd



include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
include $(SPDK_ROOT_DIR)/mk/spdk.fio.mk

examples/bdev/fio_plugin/README.md

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ To use the SPDK fio plugin with fio, specify the plugin binary using LD_PRELOAD 
fio and set ioengine=spdk_bdev in the fio configuration file (see example_config.fio in the same

directory as this README).



    LD_PRELOAD=<path to spdk repo>/examples/bdev/fio_plugin/fio_plugin fio

    LD_PRELOAD=<path to spdk repo>/build/fio/spdk_bdev fio



The fio configuration file must contain one new parameter:

examples/nvme/fio_plugin/Makefile

+14 −5
Original line number Diff line number Diff line
@@ -32,11 +32,20 @@ 
#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#



SPDK_ROOT_DIR := $(CURDIR)/../../..

SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)

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

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



APP := fio_plugin

FIO_PLUGIN := spdk_nvme



CFLAGS += -I$(CONFIG_FIO_SOURCE_DIR)

LDFLAGS += -shared -rdynamic

C_SRCS = fio_plugin.c



include $(SPDK_ROOT_DIR)/mk/nvme.libtest.mk
 
# Unable to combine the FIO plugin and the VPP socket abstraction (license incompatibility)

SPDK_LIB_LIST = $(filter-out sock_vpp,$(SOCK_MODULES_LIST))

SPDK_LIB_LIST += nvme thread util log sock vmd



ifeq ($(CONFIG_RDMA),y)

SPDK_LIB_LIST += rdma

endif



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