Recent changes (master)
The following changes since commit dede9b9fae3ab670c1ca864ac66aea5e997e1f34:
Merge branch 'free-dump-options' of https://github.com/floatious/fio (2021-03-17 09:25:46 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to e7e536b665bd6a9d3e936e0847dbbb6957101da4:
Merge branch 'unified-merge' of https://github.com/jeffreyalien/fio (2021-03-18 10:19:57 -0600)
----------------------------------------------------------------
Brandon Paupore (1):
Add functionality to the unified_rw_reporting parameter to output separate and mixed stats when set to 'both' or 2.
Jan Michalski (1):
rpma: add librpma_apm_* and librpma_gpspm_* engines
Jens Axboe (2):
Merge branch 'add-librpma-engines' of https://github.com/janekmi/fio
Merge branch 'unified-merge' of https://github.com/jeffreyalien/fio
HOWTO | 37 +- Makefile | 15 + ci/travis-install-librpma.sh | 22 + ci/travis-install-pmdk.sh | 28 + ci/travis-install.sh | 10 + configure | 52 ++ engines/librpma_apm.c | 256 +++++++++ engines/librpma_fio.c | 1051 ++++++++++++++++++++++++++++++++++++ engines/librpma_fio.h | 273 ++++++++++ engines/librpma_gpspm.c | 755 ++++++++++++++++++++++++++ engines/librpma_gpspm_flush.pb-c.c | 214 ++++++++ engines/librpma_gpspm_flush.pb-c.h | 120 ++++ engines/librpma_gpspm_flush.proto | 15 + eta.c | 4 +- examples/librpma_apm-client.fio | 24 + examples/librpma_apm-server.fio | 26 + examples/librpma_gpspm-client.fio | 23 + examples/librpma_gpspm-server.fio | 31 ++ fio.1 | 36 +- optgroup.c | 4 + optgroup.h | 2 + options.c | 41 +- stat.c | 316 ++++++++++- stat.h | 3 + 24 files changed, 3329 insertions(+), 29 deletions(-) create mode 100755 ci/travis-install-librpma.sh create mode 100755 ci/travis-install-pmdk.sh create mode 100644 engines/librpma_apm.c create mode 100644 engines/librpma_fio.c create mode 100644 engines/librpma_fio.h create mode 100644 engines/librpma_gpspm.c create mode 100644 engines/librpma_gpspm_flush.pb-c.c create mode 100644 engines/librpma_gpspm_flush.pb-c.h create mode 100644 engines/librpma_gpspm_flush.proto create mode 100644 examples/librpma_apm-client.fio create mode 100644 examples/librpma_apm-server.fio create mode 100644 examples/librpma_gpspm-client.fio create mode 100644 examples/librpma_gpspm-server.fio
---
Diff of recent changes:
HOWTO +33 -4
@@ -1146,11 +1146,31 @@ I/O type behaves in a similar fashion, except it sends the same offset 8 number of times before generating a new offset. -.. option:: unified_rw_reporting=bool +.. option:: unified_rw_reporting=str Fio normally reports statistics on a per data direction basis, meaning that - reads, writes, and trims are accounted and reported separately. If this - option is set fio sums the results and report them as "mixed" instead. + reads, writes, and trims are accounted and reported separately. This option + determines whether fio reports the results normally, summed together, or as + both options. + Accepted values are: + + **none** + Normal statistics reporting. + + **mixed** + Statistics are summed per data direction and reported together. + + **both** + Statistics are reported normally, followed by the mixed statistics. + + **0** + Backward-compatible alias for **none**. + + **1** + Backward-compatible alias for **mixed**. + + **2** + Alias for **both**. .. option:: randrepeat=bool
@@ -2192,7 +2212,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] + [rdma], [librpma_*] The port to use for RDMA-CM communication. This should be the same value on the client and the server side.
@@ -2203,6 +2223,15 @@ 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:: interface=str : [netsplice] [net] The IP address of the network interface used to send or receive UDP
Makefile +15 -0
@@ -94,6 +94,21 @@ 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 + librpma_apm_LIBS = -lrpma -lpmem + 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 + librpma_gpspm_LIBS = -lrpma -lpmem -lprotobuf-c + ENGINES += librpma_gpspm +endif +ifdef librpma_fio_SRCS + SOURCE += $(librpma_fio_SRCS) +endif ifdef CONFIG_POSIXAIO SOURCE += engines/posixaio.c endif
ci/travis-install-librpma.sh new file +22 -0
@@ -0,0 +1,22 @@ +#!/bin/bash -e + +# 11.02.2021 Merge pull request #866 from ldorau/rpma-mmap-memory-for-rpma_mr_reg-in-rpma_flush_apm_new +LIBRPMA_VERSION=fbac593917e98f3f26abf14f4fad5a832b330f5c +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/travis-install-pmdk.sh new file +28 -0
@@ -0,0 +1,28 @@ +#!/bin/bash -e + +# pmdk v1.9.1 release +PMDK_VERSION=1.9.1 + +WORKDIR=$(pwd) + +# +# The '/bin/sh' shell used by PMDK's 'make install' +# does not know the exact localization of clang +# and fails with: +# /bin/sh: 1: clang: not found +# if CC is not set to the full path of clang. +# +export CC=$(which $CC) + +# Install PMDK libraries, because PMDK's libpmem +# is a dependency of the librpma fio engine. +# Install it from a release package +# with already generated documentation, +# in order to not install 'pandoc'. +wget https://github.com/pmem/pmdk/releases/download/${PMDK_VERSION}/pmdk-${PMDK_VERSION}.tar.gz +tar -xzf pmdk-${PMDK_VERSION}.tar.gz +cd pmdk-${PMDK_VERSION} +make -j$(nproc) NDCTL_ENABLE=n +sudo make -j$(nproc) install prefix=/usr NDCTL_ENABLE=n +cd $WORKDIR +rm -rf pmdk-${PMDK_VERSION}
ci/travis-install.sh +10 -0
@@ -43,6 +43,16 @@ case "$TRAVIS_OS_NAME" in ) sudo apt-get -qq update sudo apt-get install --no-install-recommends -qq -y "${pkgs[@]}" + # librpma is supported on the amd64 (x86_64) architecture for now + if [[ $CI_TARGET_ARCH == "amd64" ]]; then + # install libprotobuf-c-dev required by librpma_gpspm + sudo apt-get install --no-install-recommends -qq -y libprotobuf-c-dev + # PMDK libraries have to be installed, because + # libpmem is a dependency of the librpma fio engine + ci/travis-install-pmdk.sh + # install librpma from sources from GitHub + ci/travis-install-librpma.sh + fi ;; "osx") brew update >/dev/null 2>&1
configure +52 -0
64 lines not on this page · raw message
engines/librpma_apm.c new file +256 -0
256 lines not on this page · raw message
engines/librpma_fio.c new file +1051 -0
1,051 lines not on this page · raw message
engines/librpma_fio.h new file +273 -0
273 lines not on this page · raw message
engines/librpma_gpspm.c new file +755 -0
755 lines not on this page · raw message
engines/librpma_gpspm_flush.pb-c.c new file +214 -0
214 lines not on this page · raw message
engines/librpma_gpspm_flush.pb-c.h new file +120 -0
120 lines not on this page · raw message
engines/librpma_gpspm_flush.proto new file +15 -0
@@ -0,0 +1,15 @@ +syntax = "proto2"; + +message GPSPM_flush_request { + /* an offset of a region to be flushed within its memory registration */ + required fixed64 offset = 1; + /* a length of a region to be flushed */ + required fixed64 length = 2; + /* a user-defined operation context */ + required fixed64 op_context = 3; +} + +message GPSPM_flush_response { + /* the operation context of a completed request */ + required fixed64 op_context = 1; +}
eta.c +2 -2
@@ -331,7 +331,7 @@ static void calc_rate(int unified_rw_rep, unsigned long mtime,else this_rate =0 ; -if (unified_rw_rep) { +if (unified_rw_rep ==UNIFIED_MIXED ) { rate[i] =0 ; rate[0 ] += this_rate; }else
@@ -356,7 +356,7 @@ static void calc_iops(int unified_rw_rep, unsigned long mtime,else this_iops =0 ; -if (unified_rw_rep) { +if (unified_rw_rep ==UNIFIED_MIXED ) { iops[i] =0 ; iops[0 ] += this_iops; }else
examples/librpma_apm-client.fio new file +24 -0
@@ -0,0 +1,24 @@ +# Example of the librpma_apm_client job + +[global] +ioengine=librpma_apm_client +create_serialize=0 # (required) forces specific initiation sequence +serverip=[serverip] #IP address the server is listening on +port=7204 # port(s) the server will listen on, <port; port + numjobs - 1> will be used +thread + +# The client will get a remote memory region description after establishing +# a connection. + +[client] +numjobs=1 # number of parallel connections +group_reporting=1 +sync=1 # 1 is the best for latency measurements, 0 for bandwidth +iodepth=2 # total number of ious +iodepth_batch_submit=1 # number of ious to be submitted at once +rw=write # read/write/randread/randwrite/readwrite/rw +rwmixread=70 # % of a mixed workload that should be reads +blocksize=4KiB +ramp_time=15s # gives some time to stabilize the workload +time_based +runtime=60s # run the workload for the specified period of time
examples/librpma_apm-server.fio new file +26 -0
@@ -0,0 +1,26 @@ +# Example of the librpma_apm_server job + +[global] +ioengine=librpma_apm_server +create_serialize=0 # (required) forces specific initiation sequence +kb_base=1000 # turn on the straight units handling (non-compatibility mode) +serverip=[serverip] # IP address to listen on +port=7204 # port(s) the server jobs will listen on, ports <port; port + numjobs - 1> will be used +thread + +# The server side spawns one thread for each expected connection from +# the client-side, opens and registers the range dedicated for this thread +# (a workspace) from the provided memory. +# Each of the server threads accepts a connection on the dedicated port +# (different for each and every working thread) and waits for it to end up, +# and closes itself. + +[server] +# set to 1 (true) ONLY when Direct Write to PMem from the remote host is possible +# (https://pmem.io/rpma/documentation/basic-direct-write-to-pmem.html) +direct_write_to_pmem=0 + +numjobs=1 # number of expected incomming connections +size=100MiB # size of workspace for a single connection +filename=malloc # device dax or an existing fsdax file or "malloc" for allocation from DRAM +# filename=/dev/dax1.0
examples/librpma_gpspm-client.fio new file +23 -0
@@ -0,0 +1,23 @@ +# Example of the librpma_gpspm_client job + +[global] +ioengine=librpma_gpspm_client +create_serialize=0 # (required) forces specific initiation sequence +serverip=[serverip] #IP address the server is listening on +port=7204 # port(s) the server will listen on, <port; port + numjobs - 1> will be used +thread + +# The client will get a remote memory region description after establishing +# a connection. + +[client] +numjobs=1 # number of parallel connections +group_reporting=1 +sync=1 # 1 is the best for latency measurements, 0 for bandwidth +iodepth=2 # total number of ious +iodepth_batch_submit=1 # number of ious to be submitted at once +rw=write # write/randwrite +blocksize=4KiB +ramp_time=15s # gives some time to stabilize the workload +time_based +runtime=60s # run the workload for the specified period of time
examples/librpma_gpspm-server.fio new file +31 -0
@@ -0,0 +1,31 @@ +# Example of the librpma_gpspm_server job + +[global] +ioengine=librpma_gpspm_server +create_serialize=0 # (required) forces specific initiation sequence +kb_base=1000 # turn on the straight units handling (non-compatibility mode) +serverip=[serverip] #IP address to listen on +port=7204 # port(s) the server jobs will listen on, ports <port; port + numjobs - 1> will be used +thread + +# The server side spawns one thread for each expected connection from +# the client-side, opens and registers the range dedicated for this thread +# (a workspace) from the provided memory. +# Each of the server threads accepts a connection on the dedicated port +# (different for each and every working thread), accepts and executes flush +# requests, and sends back a flush response for each of the requests. +# When the client is done it sends the termination notice to the server's thread. + +[server]
Lines of this file are not shown. View the raw message.
options.c +39 -2
41 lines not on this page · raw message
stat.c +299 -17
316 lines not on this page · 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.