Recent changes (master)
The following changes since commit dfecde6a4b49bd299b2a7192c10533b9beb4820d:
Merge branch '2021-05-13/stat-fix-integer-overflow' of https://github.com/flx42/fio (2021-05-14 09:36:59 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to b54e0d80c52e626021aacd0ae4d9875940cff9aa:
Merge branch 'taras/nfs-upstream' of https://github.com/tarasglek/fio-1 (2021-05-18 17:34:38 -0600)
----------------------------------------------------------------
Jens Axboe (1):
Merge branch 'taras/nfs-upstream' of https://github.com/tarasglek/fio-1
Taras Glek (6):
NFS engine
NFS configure fixes
C-style comments
single line bodies
skip skeleton comments
clean up nfs example
HOWTO | 13 ++- Makefile | 6 ++ configure | 29 +++++ engines/nfs.c | 314 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ examples/nfs.fio | 22 ++++ fio.1 | 10 ++ optgroup.c | 4 + optgroup.h | 2 + options.c | 5 + 9 files changed, 404 insertions(+), 1 deletion(-) create mode 100644 engines/nfs.c create mode 100644 examples/nfs.fio
---
Diff of recent changes:
HOWTO +12 -1
@@ -1171,7 +1171,7 @@ I/O type **1** Backward-compatible alias for **mixed**. - + **2** Alias for **both**.
@@ -2103,6 +2103,12 @@ I/O engine I/O engine supporting asynchronous read and write operations to the DAOS File System (DFS) via libdfs. + **nfs** + I/O engine supporting asynchronous read and write operations to + NFS filesystems from userspace via libnfs. This is useful for + achieving higher concurrency and thus throughput than is possible + via kernel NFS. + I/O engine specific parameters ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2525,6 +2531,11 @@ with the caveat that when used on the command line, they must come after the Specificy a different object class for the dfs file. Use DAOS container's object class by default. +.. option:: nfs_url=str : [nfs] + + URL in libnfs format, eg nfs://<server|ipv4|ipv6>/path[?arg=val[&arg=val]*] + Refer to the libnfs README for more details. + I/O depth ~~~~~~~~~
Makefile +6 -0
@@ -79,6 +79,12 @@ ifdef CONFIG_LIBNBD ENGINES += nbd endif +ifdef CONFIG_LIBNFS + CFLAGS += $(LIBNFS_CFLAGS) + LIBS += $(LIBNFS_LIBS) + SOURCE += engines/nfs.c +endif + ifdef CONFIG_64BIT CPPFLAGS += -DBITS_PER_LONG=64 else ifdef CONFIG_32BIT
configure +29 -0
@@ -170,6 +170,7 @@ disable_native="no" march_set="no" libiscsi="no" libnbd="no" +libnfs="no" libzbc="" dfs="" dynamic_engines="no"
@@ -241,6 +242,8 @@ for opt do ;; --disable-tcmalloc) disable_tcmalloc="yes" ;; + --disable-nfs) disable_nfs="yes" + ;; --dynamic-libengines) dynamic_engines="yes" ;; --disable-dfs) dfs="no"
@@ -271,8 +274,10 @@ if test "$show_help" = "yes" ; then echo "--disable-rados Disable Rados support even if found" echo "--disable-rbd Disable Rados Block Device even if found" echo "--disable-http Disable HTTP support even if found" + echo "--disable-nfs Disable userspace NFS support even if found" echo "--disable-gfapi Disable gfapi" echo "--enable-libhdfs Enable hdfs support" + echo "--enable-libnfs Enable nfs support" echo "--disable-lex Disable use of lex/yacc for math" echo "--disable-pmem Disable pmem based engines even if found" echo "--enable-lex Enable use of lex/yacc for math"
@@ -2277,6 +2282,21 @@ EOF fi print_config "DAOS File System (dfs) Engine" "$dfs" +########################################## +# Check if we have libnfs (for userspace nfs support). +if test "$disable_nfs" != "yes"; then + if $(pkg-config libnfs); then + libnfs="yes" + libnfs_cflags=$(pkg-config --cflags libnfs) + libnfs_libs=$(pkg-config --libs libnfs) + else + if test "$libnfs" = "yes" ; then + echo "libnfs" "Install libnfs" + fi + fi +fi +print_config "NFS engine" "$libnfs" + ########################################## # Check if we have lex/yacc available yacc="no"
@@ -3101,6 +3121,9 @@ fi if test "$dfs" = "yes" ; then output_sym "CONFIG_DFS" fi +if test "$libnfs" = "yes" ; then + output_sym "CONFIG_NFS" +fi if test "$march_set" = "no" && test "$build_native" = "yes" ; then output_sym "CONFIG_BUILD_NATIVE" fi
@@ -3140,6 +3163,12 @@ if test "$libnbd" = "yes" ; then echo "LIBNBD_CFLAGS=$libnbd_cflags" >> $config_host_mak echo "LIBNBD_LIBS=$libnbd_libs" >> $config_host_mak fi +if test "$libnfs" = "yes" ; then + output_sym "CONFIG_LIBNFS" + echo "CONFIG_LIBNFS=m" >> $config_host_mak + echo "LIBNFS_CFLAGS=$libnfs_cflags" >> $config_host_mak + echo "LIBNFS_LIBS=$libnfs_libs" >> $config_host_mak +fi if test "$dynamic_engines" = "yes" ; then output_sym "CONFIG_DYNAMIC_ENGINES" fi
engines/nfs.c new file +314 -0
314 lines not on this page · raw message
examples/nfs.fio new file +22 -0
@@ -0,0 +1,22 @@ +[global] +nfs_url=nfs://127.0.0.1/nfs +blocksize=524288 +iodepth=10 +ioengine=nfs +size=104857600 +lat_percentiles=1 +group_reporting +numjobs=10 +ramp_time=5s +filename_format=myfiles.$clientuid.$jobnum.$filenum +time_based=1 + +[write] +rw=write +runtime=10s +stonewall + +[read] +wait_for=write +rw=randread +runtime=10s
fio.1 +10 -0
@@ -1901,6 +1901,12 @@ not be \fBcudamalloc\fR. This ioengine defines engine specific options. .B dfs I/O engine supporting asynchronous read and write operations to the DAOS File System (DFS) via libdfs. +.TP +.B nfs +I/O engine supporting asynchronous read and write operations to +NFS filesystems from userspace via libnfs. This is useful for +achieving higher concurrency and thus throughput than is possible +via kernel NFS. .SS "I/O engine specific parameters" In addition, there are some parameters which are only valid when a specific \fBioengine\fR is in use. These are used identically to normal parameters,
@@ -2283,6 +2289,10 @@ Use DAOS container's chunk size by default. .BI (dfs)object_class Specificy a different object class for the dfs file. Use DAOS container's object class by default. +.TP +.BI (nfs)nfs_url +URL in libnfs format, eg nfs://<server|ipv4|ipv6>/path[?arg=val[&arg=val]*] +Refer to the libnfs README for more details. .SS "I/O depth" .TP .BI iodepth \fR=\fPint
optgroup.c +4 -0
@@ -185,6 +185,10 @@ static const struct opt_group fio_opt_cat_groups[] = { .name = "DAOS File System (dfs) I/O engine", /* dfs */ .mask = FIO_OPT_G_DFS, }, + { + .name = "NFS I/O engine", /* nfs */ + .mask = FIO_OPT_G_NFS, + }, { .name = NULL, },
optgroup.h +2 -0
@@ -70,6 +70,7 @@ enum opt_category_group { __FIO_OPT_G_NR, __FIO_OPT_G_LIBCUFILE, __FIO_OPT_G_DFS, + __FIO_OPT_G_NFS,FIO_OPT_G_RATE = (1ULL << __FIO_OPT_G_RATE), FIO_OPT_G_ZONE = (1ULL << __FIO_OPT_G_ZONE),
@@ -110,6 +111,7 @@ enum opt_category_group {FIO_OPT_G_INVALID = (1ULL << __FIO_OPT_G_NR),FIO_OPT_G_ISCSI = (1ULL << __FIO_OPT_G_ISCSI),FIO_OPT_G_NBD = (1ULL << __FIO_OPT_G_NBD), +FIO_OPT_G_NFS = (1ULL << __FIO_OPT_G_NFS),FIO_OPT_G_IOURING = (1ULL << __FIO_OPT_G_IOURING),FIO_OPT_G_FILESTAT = (1ULL << __FIO_OPT_G_FILESTAT), FIO_OPT_G_LIBCUFILE = (1ULL << __FIO_OPT_G_LIBCUFILE),
options.c +5 -0
@@ -2025,6 +2025,11 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { { .ival = "dfs", .help = "DAOS File System (dfs) IO engine", }, +#endif +#ifdef CONFIG_NFS + { .ival = "nfs", + .help = "NFS IO engine", + }, #endif }, },