Commit f8abbede authored by Karl Bonde Torp's avatar Karl Bonde Torp Committed by Tomasz Zawadzki
Browse files

xnvme: bump to 0.7.3 



This includes significant performance improvements in the AIO and URING
backends.

For this to work I have also needed to:
* Fix Meson args in xnvmebuild
  - The Meson arguments for xNVMe have been changed since 0.5.0.
* Fix double declaration in headers in bdev_xnvme
  - Since xNVMe 0.7.0 libxnvme.h includes everything needed for using the xNVMe library.
* Support shared and static linking in mk/xnvme
  - Since 0.7.0 xNVMe always creates a shared and static library,
with this change SPDK can support using either.
  - Additionally, the linker flags have been moved out of spdk.common.mk,
CFLAGS are no longer added twice, and LDFLAGS have been removed, since
we are now specifiying the full path to the xNVMe libs.

Change-Id: I86760655ae9898a82f0a83ab4c33122854c0384f
Signed-off-by: default avatarKarl Bonde Torp <k.torp@samsung.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/20605


Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarBen Walker <ben@nvidia.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 5aa32878

mk/spdk.common.mk

+0 −13
Original line number Diff line number Diff line
@@ -214,19 +214,6 @@ LDFLAGS += -L$(VFIO_USER_LIBRARY_DIR) 
SYS_LIBS += -lvfio-user -ljson-c

endif



ifeq ($(CONFIG_XNVME), y)

XNVME_DIR=$(SPDK_ROOT_DIR)/xnvme

XNVME_INSTALL_DIR=$(XNVME_DIR)/builddir/lib

XNVME_INCLUDE_DIR=$(XNVME_DIR)/include



CFLAGS += -I$(XNVME_INCLUDE_DIR)

LDFLAGS += -L$(XNVME_INSTALL_DIR)

SYS_LIBS += -lxnvme

ifneq ($(CONFIG_URING), y)

SYS_LIBS += -luring

endif

endif



ifeq ($(CONFIG_DAOS),y)

ifneq ($(CONFIG_DAOS_DIR),)

CFLAGS += -I$(CONFIG_DAOS_DIR)/include

mk/spdk.modules.mk

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,13 @@ INTR_BLOCKDEV_MODULES_LIST += bdev_lvol blobfs blobfs_bdev blob_bdev blob lvol 


ifeq ($(CONFIG_XNVME),y)

BLOCKDEV_MODULES_LIST += bdev_xnvme

XNVME_LIB_DIR=$(SPDK_ROOT_DIR)/xnvme/builddir/lib



ifeq ($(CONFIG_SHARED),y)

BLOCKDEV_MODULES_PRIVATE_LIBS += $(XNVME_LIB_DIR)/libxnvme.so -Wl,-rpath=$(XNVME_LIB_DIR)

else

BLOCKDEV_MODULES_PRIVATE_LIBS +=  $(XNVME_LIB_DIR)/libxnvme.a -luring -laio -pthread -lrt

endif

endif



ifeq ($(CONFIG_VFIO_USER),y)

module/bdev/xnvme/bdev_xnvme.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
 */



#include "libxnvme.h"

#include "libxnvme_pp.h"



#include "bdev_xnvme.h"

xnvme @ 3834fd86

Compare 59cca28a to 3834fd86
Original line number Diff line number Diff line 
Subproject commit 59cca28a61ae3154ba1731ca2ee7daa402ec5e2e
 
Subproject commit 3834fd860d40b6a3608aae11f9ceb017a0c93b29

xnvmebuild/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ all: 
	(cd $(SPDK_ROOT_DIR)/xnvme && \

		export PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:/usr/lib/pkgconfig:/usr/lib64/pkgconfig && \

		meson setup builddir \

		-Dwith-spdk=false \

		-Dwith-fio=false \

		-Dwith-libvfn=false \

		-Dshared_library=false && \

		-Dwith-libaio=enabled \

		-Dwith-liburing=enabled \

		-Dwith-libvfn=disabled \

		-Dwith-spdk=false && \

		meson compile -C builddir && \

		cd -)