Commit 87757389 authored by Simon A. F. Lund's avatar Simon A. F. Lund Committed by Tomasz Zawadzki
Browse files

xnvme: update submodule to v0.5.0



This updates the xNVMe submodule to v0.5.0 and adjusts the Makefile,
disabling a backend (libvfn) introduced in v0.5.0 which is not of
interest.

With xNVMe v0.5.0 two things important for the bdev_xnvme has changed:

* The 'libaio' backend implementation responds to 'opts.poll_io'. It
  does so by 'xnvme_queue_poke()' returning immediatly instead of
  waiting for at least one outstanding IO to complete or for a timeout
  to occur. This dramatically improves the IO-rate and reduces latency.

* Prior to xNVMe v0.5.0, the liburing library was vendored and "bundled"
  into the xNVMe library. This library-bundling can cause linker issue
  and is thus replaced by linking "properly" with liburing on the system
  via pkg-config discovery.

  To make sure linker can properly link libxnvme.a's content we need to
  make sure we point at system's -luring during the build. Effectively,
  this can now work together with --with-uring[=/uring].

This change is made in preparation to adding the 'conserve_cpu' option
which makes use of 'opts.poll_io' for 'io_mechanism=libaio'.

Signed-off-by: default avatarSimon A. F. Lund <simon.lund@samsung.com>
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Change-Id: Ibd6e620679a3991a4a8642bb39390a61284aac74
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14677


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
parent fecffda6
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1077,7 +1077,7 @@ elif [[ "${CONFIG[PGO_USE]}" = "y" ]]; then
	fi
fi

if [[ "${CONFIG[URING]}" = "y" ]]; then
if [[ "${CONFIG[URING]}" = "y" || "${CONFIG[XNVME]}" = "y" ]]; then
	if [[ -n "${CONFIG[URING_PATH]}" ]]; then
		check_dir "${CONFIG[URING_PATH]}"
	elif ! echo -e '#include <liburing.h>\nint main(void) { return 0; }\n' \
+3 −0
Original line number Diff line number Diff line
@@ -220,6 +220,9 @@ 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)
Compare e507f2d1 to 59cca28a
Original line number Diff line number Diff line
Subproject commit e507f2d1791163d0c2757f1b973cd2cf6dfcb573
Subproject commit 59cca28a61ae3154ba1731ca2ee7daa402ec5e2e
+5 −1
Original line number Diff line number Diff line
@@ -11,7 +11,11 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
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 -Dshared_library=false && \
		meson setup builddir \
		-Dwith-spdk=false \
		-Dwith-fio=false \
		-Dwith-libvfn=false \
		-Dshared_library=false && \
		meson compile -C builddir && \
		cd -)