Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Jan 27, 2022 Kbuild

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit 2f0b54419a6ab039c677e41008391b8c53ae2e6b:

Merge branch 'master' of https://github.com/ben-ihelputech/fio (2022-01-21 10:46:26 -0700)

are available in the Git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to 2b3d4a6a924e0aa82654d3b96fb134085af7a98a:

fio: use LDFLAGS when linking dynamic engines (2022-01-26 13:12:14 -0700)

----------------------------------------------------------------
Eric Sandeen (2):
t/io_uring: link with libaio when necessary
fio: use LDFLAGS when linking dynamic engines

Jens Axboe (1):
Merge branch 'rpma-add-support-for-File-System-DAX' of https://github.com/ldorau/fio

Lukasz Dorau (1):
rpma: RPMA engine requires librpma>=v0.10.0 with rpma_mr_advise()

Wang, Long (1):
rpma: add support for File System DAX

 Makefile              |  3 ++-
 configure             |  9 ++++-----
 engines/librpma_fio.c | 44 +++++++++++++++++++++++++++++++++-----------
 engines/librpma_fio.h |  2 +-
 4 files changed, 40 insertions(+), 18 deletions(-)

---

Diff of recent changes:

Makefile +2 -1
index 5d17bcab..00e79539 100644
@@ -99,6 +99,7 @@ endif
 ifdef CONFIG_LIBAIO
   libaio_SRCS = engines/libaio.c
   cmdprio_SRCS = engines/cmdprio.c
+  LIBS += -laio
   libaio_LIBS = -laio
   ENGINES += libaio
 endif
@@ -294,7 +295,7 @@ define engine_template =
 $(1)_OBJS := $$($(1)_SRCS:.c=.o)
 $$($(1)_OBJS): CFLAGS := -fPIC $$($(1)_CFLAGS) $(CFLAGS)
 engines/fio-$(1).so: $$($(1)_OBJS)
-	$$(QUIET_LINK)$(CC) -shared -rdynamic -fPIC -Wl,-soname,fio-$(1).so.1 -o $$@ $$< $$($(1)_LIBS)
+	$$(QUIET_LINK)$(CC) $(DYNAMIC) -shared -rdynamic -fPIC -Wl,-soname,fio-$(1).so.1 -o $$@ $$< $$($(1)_LIBS)
 ENGS_OBJS += engines/fio-$(1).so
 endef
 else # !CONFIG_DYNAMIC_ENGINES
configure +4 -5
index 84ccce04..0efde7d6 100755
@@ -955,17 +955,16 @@ print_config "rdmacm" "$rdmacm"
 
 ##########################################
 # librpma probe
+# The librpma engine requires librpma>=v0.10.0 with rpma_mr_advise().
 if test "$librpma" != "yes" ; then
   librpma="no"
 fi
 cat > $TMPC << EOF
-#include <stdio.h>
 #include <librpma.h>
-int main(int argc, char **argv)
+int main(void)
 {
-  enum rpma_conn_event event = RPMA_CONN_REJECTED;
-  (void) event; /* unused */
-  rpma_log_set_threshold(RPMA_LOG_THRESHOLD, RPMA_LOG_LEVEL_INFO);
+  void *ptr = rpma_mr_advise;
+  (void) ptr; /* unused */
   return 0;
 }
 EOF
engines/librpma_fio.c +33 -11

103 lines not on this page · raw message

engines/librpma_fio.h +1 -1
index fb89d99d..2c507e9c 100644
@@ -77,7 +77,7 @@ struct librpma_fio_mem {
 char *librpma_fio_allocate_dram(struct thread_data *td, size_t size,
 		struct librpma_fio_mem *mem);
 
-char *librpma_fio_allocate_pmem(struct thread_data *td, const char *filename,
+char *librpma_fio_allocate_pmem(struct thread_data *td, struct fio_file *f,
 		size_t size, struct librpma_fio_mem *mem);
 
 void librpma_fio_free(struct librpma_fio_mem *mem);