Merge branch 'no-librpma' of https://github.com/grom72/fio

* 'no-librpma' of https://github.com/grom72/fio:
  Remove obsolete library ref.
  Fix parameter type
  rpma: remove librpma support
  Revert "rpma: add librpma_apm_* and librpma_gpspm_* engines"
  Revert "rpma: RPMA engine requires librpma>=v0.10.0 with rpma_mr_advise()"
  Revert "rpma: RPMA engines require librpma>=v0.11.0 with rpma_cq_get_wc()"
  Revert "rpma: simplify server_cmpl_process()"
  Revert "ci: build the librpma fio engine"

HOWTO.rst

@@ -2667,7 +2667,7 @@ with the caveat that when used on the command line, they must come after the
 		this will be the starting port number since fio will use a range of
 		ports.
 
-   [rdma], [librpma_*]
+   [rdma]
 
 		The port to use for RDMA-CM communication. This should be the same value
 		on the client and the server side.
@@ -2678,20 +2678,6 @@ with the caveat that when used on the command line, they must come after the
 	is a TCP listener or UDP reader, the hostname is not used and must be omitted
 	unless it is a valid UDP multicast address.
 
-.. option:: serverip=str : [librpma_*]
-
-	The IP address to be used for RDMA-CM based I/O.
-
-.. option:: direct_write_to_pmem=bool : [librpma_*]
-
-	Set to 1 only when Direct Write to PMem from the remote host is possible.
-	Otherwise, set to 0.
-
-.. option:: busy_wait_polling=bool : [librpma_*_server]
-
-	Set to 0 to wait for completion instead of busy-wait polling completion.
-	Default: 1.
-
 .. option:: interface=str : [netsplice] [net]
 
 	The IP address of the network interface used to send or receive UDP

Makefile

@@ -108,29 +108,6 @@ ifdef CONFIG_RDMA
   rdma_LIBS = -libverbs -lrdmacm
   ENGINES += rdma
 endif
-ifdef CONFIG_LIBRPMA_APM
-  librpma_apm_SRCS = engines/librpma_apm.c
-  librpma_fio_SRCS = engines/librpma_fio.c
-  ifdef CONFIG_LIBPMEM2_INSTALLED
-    librpma_apm_LIBS = -lrpma -lpmem2
-  else
-    librpma_apm_LIBS = -lrpma -lpmem
-  endif
-  ENGINES += librpma_apm
-endif
-ifdef CONFIG_LIBRPMA_GPSPM
-  librpma_gpspm_SRCS = engines/librpma_gpspm.c engines/librpma_gpspm_flush.pb-c.c
-  librpma_fio_SRCS = engines/librpma_fio.c
-  ifdef CONFIG_LIBPMEM2_INSTALLED
-    librpma_gpspm_LIBS = -lrpma -lpmem2 -lprotobuf-c
-  else
-    librpma_gpspm_LIBS = -lrpma -lpmem -lprotobuf-c
-  endif
-  ENGINES += librpma_gpspm
-endif
-ifdef librpma_fio_SRCS
-  SOURCE += $(librpma_fio_SRCS)
-endif
 ifdef CONFIG_POSIXAIO
   SOURCE += engines/posixaio.c
 endif

ci/actions-install.sh

@@ -54,8 +54,6 @@ DPKGCFG
                 libiscsi-dev
                 libnbd-dev
                 libpmem-dev
-                libpmem2-dev
-                libprotobuf-c-dev
                 librbd-dev
                 libtcmalloc-minimal4
                 libibverbs-dev
@@ -96,10 +94,6 @@ DPKGCFG
     sudo apt-get -qq update
     echo "Installing packages... ${pkgs[@]}"
     sudo apt-get install -o APT::Immediate-Configure=false --no-install-recommends -qq -y "${pkgs[@]}"
-    if [ "${CI_TARGET_ARCH}" == "x86_64" ]; then
-        # install librpma from sources
-        ci/actions-install-librpma.sh
-    fi
 }
 
 # Fedora and related distributions
@@ -151,9 +145,6 @@ install_fedora() {
             ;;
     esac
     dnf install -y "${pkgs[@]}"
-
-    # install librpma from sources
-    ci/actions-install-librpma.sh
 }
 
 install_rhel_clone() {

configure

@@ -1029,48 +1029,6 @@ if test "$disable_rdma" != "yes" && compile_prog "" "-lrdmacm" "rdma"; then
 fi
 print_config "rdmacm" "$rdmacm"
 
-##########################################
-# librpma probe
-# The librpma engines require librpma>=v0.11.0 with rpma_cq_get_wc().
-if test "$librpma" != "yes" ; then
-  librpma="no"
-fi
-cat > $TMPC << EOF
-#include <librpma.h>
-int main(void)
-{
-  void *ptr = rpma_cq_get_wc;
-  (void) ptr; /* unused */
-  return 0;
-}
-EOF
-if test "$disable_rdma" != "yes" && compile_prog "" "-lrpma" "rpma"; then
-    librpma="yes"
-fi
-print_config "librpma" "$librpma"
-
-##########################################
-# libprotobuf-c probe
-if test "$libprotobuf_c" != "yes" ; then
-  libprotobuf_c="no"
-fi
-cat > $TMPC << EOF
-#include <stdio.h>
-#include <protobuf-c/protobuf-c.h>
-#if !defined(PROTOBUF_C_VERSION_NUMBER)
-# error PROTOBUF_C_VERSION_NUMBER is not defined!
-#endif
-int main(int argc, char **argv)
-{
-  (void)protobuf_c_message_check(NULL);
-  return 0;
-}
-EOF
-if compile_prog "" "-lprotobuf-c" "protobuf_c"; then
-    libprotobuf_c="yes"
-fi
-print_config "libprotobuf_c" "$libprotobuf_c"
-
 ##########################################
 # asprintf() and vasprintf() probes
 if test "$have_asprintf" != "yes" ; then
@@ -3119,17 +3077,6 @@ fi
 if test "$libverbs" = "yes" -a "$rdmacm" = "yes" ; then
   output_sym "CONFIG_RDMA"
 fi
-# librpma is supported on the 'x86_64' architecture for now
-if test "$cpu" = "x86_64" -a "$libverbs" = "yes" -a "$rdmacm" = "yes" \
-    -a "$librpma" = "yes" \
-    && test "$libpmem" = "yes" -o "$libpmem2" = "yes" ; then
-  output_sym "CONFIG_LIBRPMA_APM"
-fi
-if test "$cpu" = "x86_64" -a "$libverbs" = "yes" -a "$rdmacm" = "yes" \
-    -a "$librpma" = "yes" -a "$libprotobuf_c" = "yes" \
-    && test "$libpmem" = "yes" -o "$libpmem2" = "yes" ; then
-  output_sym "CONFIG_LIBRPMA_GPSPM"
-fi
 if test "$clock_gettime" = "yes" ; then
   output_sym "CONFIG_CLOCK_GETTIME"
 fi