Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Sep 4, 2024 Kbuild

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit 00dc75d2f80fc130d2627ed4bb25548ba77e5fbc:

Remove 'uncached' support (2024-08-29 07:22:17 -0600)

are available in the Git repository at:

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

for you to fetch changes up to 5d789274bd8979d881ad793faba9f885f3b80113:

Merge branch 'no-librpma' of https://github.com/grom72/fio (2024-09-03 14:44:57 -0400)

----------------------------------------------------------------
Tomasz Gromadzki (8):
Revert "ci: build the librpma fio engine"
Revert "rpma: simplify server_cmpl_process()"
Revert "rpma: RPMA engines require librpma>=v0.11.0 with rpma_cq_get_wc()" Revert "rpma: RPMA engine requires librpma>=v0.10.0 with rpma_mr_advise()" Revert "rpma: add librpma_apm_* and librpma_gpspm_* engines"
rpma: remove librpma support
Fix parameter type
Remove obsolete library ref.

Vincent Fu (1):
Merge branch 'no-librpma' of https://github.com/grom72/fio

 HOWTO.rst                          |   16 +-
 Makefile                           |   23 -
 ci/actions-install-librpma.sh      |   21 -
 ci/actions-install.sh              |    9 -
 configure                          |   53 --
 engines/librpma_apm.c              |  254 ---------
 engines/librpma_fio.c              | 1079 ------------------------------------
 engines/librpma_fio.h              |  282 ----------
 engines/librpma_fio_pmem.h         |   67 ---
 engines/librpma_fio_pmem2.h        |   91 ---
 engines/librpma_gpspm.c            |  784 --------------------------
 engines/librpma_gpspm_flush.pb-c.c |  214 -------
 engines/librpma_gpspm_flush.pb-c.h |  120 ----
 engines/librpma_gpspm_flush.proto  |   15 -
 examples/librpma_apm-client.fio    |   24 -
 examples/librpma_apm-client.png    |  Bin 53792 -> 0 bytes
 examples/librpma_apm-server.fio    |   26 -
 examples/librpma_apm-server.png    |  Bin 42611 -> 0 bytes
 examples/librpma_gpspm-client.fio  |   23 -
 examples/librpma_gpspm-client.png  |  Bin 56398 -> 0 bytes
 examples/librpma_gpspm-server.fio  |   33 --
 examples/librpma_gpspm-server.png  |  Bin 53793 -> 0 bytes
 fio.1                              |   12 +-
 optgroup.c                         |    4 -
 optgroup.h                         |    2 -
 options.c                          |   10 -
 tools/fiograph/fiograph.conf       |    9 -
 27 files changed, 2 insertions(+), 3169 deletions(-)
 delete mode 100755 ci/actions-install-librpma.sh
 delete mode 100644 engines/librpma_apm.c
 delete mode 100644 engines/librpma_fio.c
 delete mode 100644 engines/librpma_fio.h
 delete mode 100644 engines/librpma_fio_pmem.h
 delete mode 100644 engines/librpma_fio_pmem2.h
 delete mode 100644 engines/librpma_gpspm.c
 delete mode 100644 engines/librpma_gpspm_flush.pb-c.c
 delete mode 100644 engines/librpma_gpspm_flush.pb-c.h
 delete mode 100644 engines/librpma_gpspm_flush.proto
 delete mode 100644 examples/librpma_apm-client.fio
 delete mode 100644 examples/librpma_apm-client.png
 delete mode 100644 examples/librpma_apm-server.fio
 delete mode 100644 examples/librpma_apm-server.png
 delete mode 100644 examples/librpma_gpspm-client.fio
 delete mode 100644 examples/librpma_gpspm-client.png
 delete mode 100644 examples/librpma_gpspm-server.fio
 delete mode 100644 examples/librpma_gpspm-server.png

---

Diff of recent changes:

HOWTO.rst +1 -15
index 11b1c669..4ef7a41d 100644
@@ -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 +0 -23
index be57e296..746a27d4 100644
@@ -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-librpma.sh deleted +0 -21
deleted file mode 100755
index 31f9f712..00000000
@@ -1,21 +0,0 @@
-#!/bin/bash -e
-
-LIBRPMA_VERSION="1.0.0"
-ZIP_FILE=rpma.zip
-
-WORKDIR=$(pwd)
-
-# install librpma
-wget -O $ZIP_FILE https://github.com/pmem/rpma/archive/${LIBRPMA_VERSION}.zip
-unzip $ZIP_FILE
-mkdir -p rpma-${LIBRPMA_VERSION}/build
-cd rpma-${LIBRPMA_VERSION}/build
-cmake .. -DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DBUILD_DOC=OFF \
-	-DBUILD_EXAMPLES=OFF \
-	-DBUILD_TESTS=OFF
-make -j"$(nproc)"
-sudo make -j"$(nproc)" install
-cd "$WORKDIR"
-rm -rf $ZIP_FILE rpma-${LIBRPMA_VERSION}
ci/actions-install.sh +0 -9
index 77c511af..7a87fbe3 100755
@@ -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 +0 -53

65 lines not on this page · raw message

engines/librpma_apm.c deleted +0 -254

254 lines not on this page · raw message

engines/librpma_fio.c deleted +0 -1079

1,079 lines not on this page · raw message

engines/librpma_fio.h deleted +0 -282

282 lines not on this page · raw message

engines/librpma_fio_pmem.h deleted +0 -67

67 lines not on this page · raw message

engines/librpma_fio_pmem2.h deleted +0 -91

91 lines not on this page · raw message

engines/librpma_gpspm.c deleted +0 -784

784 lines not on this page · raw message

engines/librpma_gpspm_flush.pb-c.c deleted +0 -214

214 lines not on this page · raw message

engines/librpma_gpspm_flush.pb-c.h deleted +0 -120

59 lines not on this page · raw message

engines/librpma_gpspm_flush.proto deleted +0 -15
deleted file mode 100644
index 91765a7f..00000000

Lines of this file are not shown. View the raw message.

examples/librpma_apm-client.fio deleted +0 -24
deleted file mode 100644
index 82a5d20c..00000000

Lines of this file are not shown. View the raw message.

examples/librpma_apm-client.png deleted binary +0 -0
deleted file mode 100644
index 2fe02cdf..00000000
Binary files a/examples/librpma_apm-client.png and /dev/null differ
examples/librpma_apm-server.fio deleted +0 -26
deleted file mode 100644
index dc1ddba2..00000000

Lines of this file are not shown. View the raw message.

examples/librpma_apm-server.png deleted binary +0 -0
deleted file mode 100644
index f78ae02e..00000000
Binary files a/examples/librpma_apm-server.png and /dev/null differ
examples/librpma_gpspm-client.fio deleted +0 -23
deleted file mode 100644
index 843382df..00000000

Lines of this file are not shown. View the raw message.

examples/librpma_gpspm-client.png deleted binary +0 -0
deleted file mode 100644
index 0c975a27..00000000
Binary files a/examples/librpma_gpspm-client.png and /dev/null differ
examples/librpma_gpspm-server.fio deleted +0 -33
deleted file mode 100644
index 4555314f..00000000

Lines of this file are not shown. View the raw message.

examples/librpma_gpspm-server.png deleted binary +0 -0
deleted file mode 100644
index 56124533..00000000
Binary files a/examples/librpma_gpspm-server.png and /dev/null differ
fio.1 +1 -11
index 6db76b2c..1953aea1 100644

Lines of this file are not shown. View the raw message.

optgroup.c +0 -4
index bebb4a51..f6acf88f 100644

Lines of this file are not shown. View the raw message.

optgroup.h +0 -2
index 024b902f..eb5e6f35 100644

Lines of this file are not shown. View the raw message.

options.c +0 -10
index ab650bb7..df986196 100644

Lines of this file are not shown. View the raw message.

tools/fiograph/fiograph.conf +0 -9
index 4621215c..122f2baf 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.