fio: option to make engines load dynamically
v2 cover fio: option to make engines load dynamically
The following patchset provides a configuration option that converts a select set of engines into external engines that are loaded dynamically on demand. The purpose of this option is to provide distribution packagers the ability to separate the core fio functionality from the additional optional engines. Some of the optional engines have multiple dependencies that increase the footprint of fio considerably even when the user requires only the basic 'sync' engine.
For example, without the patchset, on a Fedora 31 system, installing fio brings a total of 38 package dependencies, the installed size is 57MB. With the patchset, installing fio brings a single dependency (numactl-libs) and the installed size is 2.1MB.
These numbers are relatively small but when one needs to bring fio to an offline server, collecting these dependencies is a hassle. Also, bundling fio into a container where the base image is small (Fedora 31 is ~200MB), the install size becomes more prominent.
I've tried to keep the changes as small and unobtrusive as possible. The only significant change is the way an engine is defined in the Makefile (variables are now prefixed with engine name). If the option is provided, the Makefile will build the engines as external libraries and install them in /usr/lib/fio by default. Fio will then search for the engines in that location if the engine is not compiled in. The last patch should help with the migration to the new scheme by suggesting that an additional package is required if the engine is not found.
Future work to consider:
* Move the engine help text from fio to the engines themselves. Create
* a whitelist of engines so that only engines that are part of the main
* codebase are searched and loaded automatically. Convert more engines
* to this scheme. The current set of engines was selected based on
* simplicity and external dependencies. Engines with multiple exported
* flavors (i.e. glusterfs) are not converted yet.
Branch is also available on github, at
https://github.com/ykorman/fio/tree/dynamic-libengines.
A sample of how to package fio with this new mode for RPM-based distributions is available here:
https://src.fedoraproject.org/fork/ykorman/rpms/fio/tree/dynamic-libengines
A sample of the packages for Fedora can be found here:
https://copr.fedorainfracloud.org/coprs/ykorman/fio/
Changes since v1:
- updated the description above with a concise example instead of a big blob of mess below the pull summary.
- added a patch that fixes meaningless retry of engine loading when engine is not found.
updated the info message of the last patch based on a suggestion by Jens.
Yigal Korman (4):
fio: don't retry engine search on failure configure/Makefile: engine LIBS consistency
configure: new --dynamic-libengines build option
fio: better info when engine not found
.gitignore | 1 + Makefile | 86 +++++++++++++++++++++++++++++++++++++--------- configure | 20 +++++------ engines/dev-dax.c | 2 +- engines/guasi.c | 2 +- engines/http.c | 2 +- engines/libaio.c | 2 +- engines/libhdfs.c | 6 ++-- engines/libiscsi.c | 6 ++-- engines/libpmem.c | 2 +- engines/libzbc.c | 2 +- engines/nbd.c | 2 +- engines/pmemblk.c | 2 +- engines/rados.c | 2 +- engines/rbd.c | 2 +- engines/rdma.c | 9 ++--- init.c | 14 +++++--- ioengines.c | 26 ++++++++++++-- ioengines.h | 6 ++++ os/os-linux.h | 2 ++ 20 files changed, 141 insertions(+), 55 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/4 fio: don't retry engine search on failure
ioengine_load will try to load a given engine and if it doesn't match the current one (default is always psync), it will remove the current one and try again.
This makes sense when the engine is loaded successfully, but if it's not, we try to load it twice for no reason.
Fix by failing if we were unable to load requested engine and not retrying.
--- init.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
init.c +10 -4
@@ -1099,6 +1099,9 @@ int ioengine_load(struct thread_data *td)*/ dlhandle = td->io_ops_dlhandle; ops =load_ioengine (td); +if (!ops) + goto fail; +if (ops == td->io_ops && dlhandle == td->io_ops_dlhandle) {if (dlhandle)dlclose (dlhandle);
@@ -1113,10 +1116,8 @@ int ioengine_load(struct thread_data *td) } td->io_ops =load_ioengine (td); -if (!td->io_ops) { -log_err ("fio: failed to load engine\n" ); -return 1 ; - } +if (!td->io_ops) + goto fail;if (td->io_ops->option_struct_size && td->io_ops->options) {/*
@@ -1155,6 +1156,11 @@ int ioengine_load(struct thread_data *td)td_set_ioengine_flags (td);return 0 ; + +fail: +log_err ("fio: failed to load engine\n" ); +return 1 ; + }static void init_flags (struct thread_data *td)
Signature · 1 line
2.17.1
PATCH v2 2/4 configure/Makefile: engine LIBS consistency
In reply to Yigal KormanSome engines were adding their LIBS in the Makefile and some were declaring them in the configure script.
This is inconsistent and confusing and prevents easy bulk changes to the engines.
--- Makefile | 14 ++++++++++++++ configure | 12 ------------ 2 files changed, 14 insertions(+), 12 deletions(-)
Makefile +14 -0
@@ -79,9 +79,15 @@ ifdef CONFIG_32BIT endif ifdef CONFIG_LIBAIO SOURCE += engines/libaio.c + ifdef CONFIG_LIBAIO_URING + LIBS += -luring + else + LIBS += -laio + endif endif ifdef CONFIG_RDMA SOURCE += engines/rdma.c + LIBS += -libverbs -lrdmacm endif ifdef CONFIG_POSIXAIO SOURCE += engines/posixaio.c
@@ -106,12 +112,15 @@ ifdef CONFIG_WINDOWSAIO endif ifdef CONFIG_RADOS SOURCE += engines/rados.c + LIBS += -lrados endif ifdef CONFIG_RBD SOURCE += engines/rbd.c + LIBS += -lrbd -lrados endif ifdef CONFIG_HTTP SOURCE += engines/http.c + LIBS += -lcurl -lssl -lcrypto endif SOURCE += oslib/asprintf.c ifndef CONFIG_STRSEP
@@ -139,6 +148,7 @@ ifdef CONFIG_GFAPI SOURCE += engines/glusterfs.c SOURCE += engines/glusterfs_sync.c SOURCE += engines/glusterfs_async.c + LIBS += -lgfapi -lglusterfs ifdef CONFIG_GF_FADVISE CFLAGS := "-DGFAPI_USE_FADVISE" $(CFLAGS) endif
@@ -150,18 +160,22 @@ ifdef CONFIG_MTD endif ifdef CONFIG_PMEMBLK SOURCE += engines/pmemblk.c + LIBS += -lpmemblk endif ifdef CONFIG_LINUX_DEVDAX SOURCE += engines/dev-dax.c + LIBS += -lpmem endif ifdef CONFIG_LIBPMEM SOURCE += engines/libpmem.c + LIBS += -lpmem endif ifdef CONFIG_IME SOURCE += engines/ime.c endif ifdef CONFIG_LIBZBC SOURCE += engines/libzbc.c + LIBS += -lzbc endif ifeq ($(CONFIG_TARGET_OS), Linux)
configure +0 -12
@@ -605,11 +605,9 @@ int main(void) EOF if test "$libaio_uring" = "yes" && compile_prog "" "-luring" "libaio io_uring" ; then libaio=yes - LIBS="-luring $LIBS" elif compile_prog "" "-laio" "libaio" ; then libaio=yes libaio_uring=no - LIBS="-laio $LIBS" else if test "$libaio" = "yes" ; then feature_not_found "linux AIO" "libaio-dev or libaio-devel"
@@ -859,7 +857,6 @@ int main(int argc, char **argv) EOF if test "$disable_rdma" != "yes" && compile_prog "" "-libverbs" "libverbs" ; then libverbs="yes" - LIBS="-libverbs $LIBS" fi print_config "libverbs" "$libverbs"
@@ -879,7 +876,6 @@ int main(int argc, char **argv) EOF if test "$disable_rdma" != "yes" && compile_prog "" "-lrdmacm" "rdma"; then rdmacm="yes" - LIBS="-lrdmacm $LIBS" fi print_config "rdmacm" "$rdmacm"
@@ -1770,10 +1766,8 @@ if test "$disable_http" != "yes"; then if compile_prog "" "$HTTP_LIBS" "curl-new-ssl"; then output_sym "CONFIG_HAVE_OPAQUE_HMAC_CTX" http="yes" - LIBS="$HTTP_LIBS $LIBS" elif mv $TMPC2 $TMPC && compile_prog "" "$HTTP_LIBS" "curl-old-ssl"; then http="yes" - LIBS="$HTTP_LIBS $LIBS" fi fi print_config "http engine" "$http"
@@ -1802,7 +1796,6 @@ int main(int argc, char **argv) } EOF if test "$disable_rados" != "yes" && compile_prog "" "-lrados" "rados"; then - LIBS="-lrados $LIBS" rados="yes" fi print_config "Rados engine" "$rados"
@@ -1833,7 +1826,6 @@ int main(int argc, char **argv) } EOF if test "$disable_rbd" != "yes" && compile_prog "" "-lrbd -lrados" "rbd"; then - LIBS="-lrbd -lrados $LIBS" rbd="yes" fi print_config "Rados Block Device engine" "$rbd"
@@ -1924,7 +1916,6 @@ int main(int argc, char **argv) } EOF if test "$disable_gfapi" != "yes" && compile_prog "" "-lgfapi -lglusterfs" "gfapi"; then - LIBS="-lgfapi -lglusterfs $LIBS" gfapi="yes" fi print_config "Gluster API engine" "$gfapi"
@@ -2086,7 +2077,6 @@ int main(int argc, char **argv) EOF if compile_prog "" "-lpmem" "libpmem"; then libpmem="yes" - LIBS="-lpmem $LIBS" fi print_config "libpmem" "$libpmem"
@@ -2108,7 +2098,6 @@ int main(int argc, char **argv) EOF if compile_prog "" "-lpmemblk" "libpmemblk"; then libpmemblk="yes" - LIBS="-lpmemblk $LIBS" fi fi print_config "libpmemblk" "$libpmemblk"
@@ -2432,7 +2421,6 @@ if compile_prog "" "-lzbc" "libzbc"; then libzbcvermaj=$(pkg-config --modversion libzbc | sed 's/\.[0-9]*\.[0-9]*//') if test "$libzbcvermaj" -ge "5" ; then libzbc="yes" - LIBS="-lzbc $LIBS" else print_config "libzbc engine" "Unsupported libzbc version (version 5 or above required)" libzbc="no"
Signature · 1 line
2.17.1
PATCH v2 3/4 configure: new --dynamic-libengines build option
In reply to Yigal KormanWhen enabled, some of the more dependency-heavy internal engines are converted to "plugin" engines, i.e. they are built into separate object files and are loaded by fio on demand.
This helps downstream distros package these engines separately and not force a long list of package dependencies from the base fio package.
--- .gitignore | 1 + Makefile | 92 ++++++++++++++++++++++++++++++++-------------- configure | 8 ++++ engines/dev-dax.c | 2 +- engines/guasi.c | 2 +- engines/http.c | 2 +- engines/libaio.c | 2 +- engines/libhdfs.c | 6 +-- engines/libiscsi.c | 6 +-- engines/libpmem.c | 2 +- engines/libzbc.c | 2 +- engines/nbd.c | 2 +- engines/pmemblk.c | 2 +- engines/rados.c | 2 +- engines/rbd.c | 2 +- engines/rdma.c | 9 +++-- ioengines.c | 20 +++++++++- ioengines.h | 6 +++ os/os-linux.h | 2 + 19 files changed, 121 insertions(+), 49 deletions(-)
.gitignore +1 -0
@@ -1,5 +1,6 @@ *.d *.o +*.so *.exe /.depend /FIO-VERSION-FILE
Makefile +65 -27
167 lines not on this page · raw message
configure +8 -0
@@ -151,6 +151,7 @@ march_set="no" libiscsi="no" libnbd="no" libaio_uring="no" +dynamic_engines="no" prefix=/usr/local # parse options
@@ -215,6 +216,8 @@ for opt do ;; --enable-libaio-uring) libaio_uring="yes" ;; + --dynamic-libengines) dynamic_engines="yes" + ;; --help) show_help="yes" ;;
@@ -254,6 +257,7 @@ if test "$show_help" = "yes" ; then echo "--enable-libnbd Enable libnbd (NBD engine) support" echo "--disable-tcmalloc Disable tcmalloc support" echo "--enable-libaio-uring Enable libaio emulated over io_uring" + echo "--dynamic-libengines Lib-based ioengines as dynamic libraries" exit $exit_val fi
@@ -2954,6 +2958,10 @@ if test "$libnbd" = "yes" ; then echo "LIBNBD_CFLAGS=$libnbd_cflags" >> $config_host_mak echo "LIBNBD_LIBS=$libnbd_libs" >> $config_host_mak fi +if test "$dynamic_engines" = "yes" ; then + output_sym "CONFIG_DYNAMIC_ENGINES" +fi +print_config "Lib-based ioengines dynamic" "$dynamic_engines" cat > $TMPC << EOF int main(int argc, char **argv) {
engines/dev-dax.c +1 -1
@@ -328,7 +328,7 @@ fio_devdax_get_file_size(struct thread_data *td, struct fio_file *f)return 0 ; } -static struct ioengine_ops ioengine = { +FIO_STATIC struct ioengine_ops ioengine = { .name ="dev-dax" , .version =FIO_IOOPS_VERSION , .init = fio_devdax_init,
engines/guasi.c +1 -1
@@ -242,7 +242,7 @@ static int fio_guasi_init(struct thread_data *td)return 0 ; } -static struct ioengine_ops ioengine = { +FIO_STATIC struct ioengine_ops ioengine = { .name ="guasi" , .version =FIO_IOOPS_VERSION , .init = fio_guasi_init,
engines/http.c +1 -1
@@ -639,7 +639,7 @@ static int fio_http_invalidate(struct thread_data *td, struct fio_file *f)return 0 ; } -static struct ioengine_ops ioengine = { +FIO_STATIC struct ioengine_ops ioengine = { .name ="http" , .version =FIO_IOOPS_VERSION , .flags =FIO_DISKLESSIO |FIO_SYNCIO ,
engines/libaio.c +1 -1
@@ -445,7 +445,7 @@ static int fio_libaio_init(struct thread_data *td)return 0 ; } -static struct ioengine_ops ioengine = { +FIO_STATIC struct ioengine_ops ioengine = { .name ="libaio" , .version =FIO_IOOPS_VERSION , .flags =FIO_ASYNCIO_SYNC_TRIM ,
engines/libhdfs.c +3 -3
@@ -393,7 +393,7 @@ static void fio_hdfsio_io_u_free(struct thread_data *td, struct io_u *io_u) } } -static struct ioengine_ops ioengine_hdfs = { +FIO_STATIC struct ioengine_ops ioengine = { .name ="libhdfs" , .version =FIO_IOOPS_VERSION , .flags =FIO_SYNCIO |FIO_DISKLESSIO |FIO_NODISKUTIL ,
@@ -412,10 +412,10 @@ static struct ioengine_ops ioengine_hdfs = { static void fio_init fio_hdfsio_register(void) { -register_ioengine (&ioengine_hdfs); +register_ioengine (&ioengine); } static void fio_exit fio_hdfsio_unregister(void) { -unregister_ioengine (&ioengine_hdfs); +unregister_ioengine (&ioengine); }
engines/libiscsi.c +3 -3
@@ -383,7 +383,7 @@ static struct io_u *fio_iscsi_event(struct thread_data *td, int event)return io_u; } -static struct ioengine_ops ioengine_iscsi = { +FIO_STATIC struct ioengine_ops ioengine = { .name ="libiscsi" , .version =FIO_IOOPS_VERSION , .flags =FIO_SYNCIO |FIO_DISKLESSIO |FIO_NODISKUTIL ,
@@ -402,10 +402,10 @@ static struct ioengine_ops ioengine_iscsi = { static void fio_init fio_iscsi_register(void) { -register_ioengine (&ioengine_iscsi); +register_ioengine (&ioengine); } static void fio_exit fio_iscsi_unregister(void) { -unregister_ioengine (&ioengine_iscsi); +unregister_ioengine (&ioengine); }
engines/libpmem.c +1 -1
@@ -558,7 +558,7 @@ static int fio_libpmem_close_file(struct thread_data *td, struct fio_file *f)return generic_close_file (td, f); } -static struct ioengine_ops ioengine = { +FIO_STATIC struct ioengine_ops ioengine = { .name ="libpmem" , .version =FIO_IOOPS_VERSION , .init = fio_libpmem_init,
engines/libzbc.c +1 -1
@@ -397,7 +397,7 @@ static enum fio_q_status libzbc_queue(struct thread_data *td, struct io_u *io_u)return FIO_Q_COMPLETED ; } -static struct ioengine_ops ioengine = { +FIO_STATIC struct ioengine_ops ioengine = { .name ="libzbc" , .version =FIO_IOOPS_VERSION , .open_file = libzbc_open_file,
engines/nbd.c +1 -1
@@ -328,7 +328,7 @@ static int nbd_invalidate(struct thread_data *td, struct fio_file *f)return 0 ; } -static struct ioengine_ops ioengine = { +FIO_STATIC struct ioengine_ops ioengine = { .name ="nbd" , .version =FIO_IOOPS_VERSION , .options = options,
engines/pmemblk.c +1 -1
@@ -426,7 +426,7 @@ static int fio_pmemblk_unlink_file(struct thread_data *td, struct fio_file *f)return 0 ; } -static struct ioengine_ops ioengine = { +FIO_STATIC struct ioengine_ops ioengine = { .name ="pmemblk" , .version =FIO_IOOPS_VERSION , .queue = fio_pmemblk_queue,
engines/rados.c +1 -1
@@ -444,7 +444,7 @@ static int fio_rados_io_u_init(struct thread_data *td, struct io_u *io_u) }/* ioengine_ops for get_ioengine() */ -static struct ioengine_ops ioengine = { +FIO_STATIC struct ioengine_ops ioengine = { .name ="rados" , .version =FIO_IOOPS_VERSION , .flags =FIO_DISKLESSIO ,
engines/rbd.c +1 -1
@@ -668,7 +668,7 @@ static int fio_rbd_io_u_init(struct thread_data *td, struct io_u *io_u)return 0 ; } -static struct ioengine_ops ioengine = { +FIO_STATIC struct ioengine_ops ioengine = { .name ="rbd" , .version =FIO_IOOPS_VERSION , .setup = fio_rbd_setup,
engines/rdma.c +5 -4
@@ -226,7 +226,8 @@ static int client_recv(struct thread_data *td, struct ibv_wc *wc) rd->rmt_nr =ntohl (rd->recv_buf.nr);for (i =0 ; i < rd->rmt_nr; i++) { - rd->rmt_us[i].buf =be64_to_cpu (rd->recv_buf.rmt_us[i].buf); + rd->rmt_us[i].buf =__be64_to_cpu ( + rd->recv_buf.rmt_us[i].buf); rd->rmt_us[i].rkey =ntohl (rd->recv_buf.rmt_us[i].rkey); rd->rmt_us[i].size =ntohl (rd->recv_buf.rmt_us[i].size);
@@ -1389,7 +1390,7 @@ static int fio_rdmaio_setup(struct thread_data *td)return 0 ; } -static struct ioengine_ops ioengine_rw = { +FIO_STATIC struct ioengine_ops ioengine = { .name ="rdma" , .version =FIO_IOOPS_VERSION , .setup = fio_rdmaio_setup,
@@ -1410,10 +1411,10 @@ static struct ioengine_ops ioengine_rw = { static void fio_init fio_rdmaio_register(void) { -register_ioengine (&ioengine_rw); +register_ioengine (&ioengine); } static void fio_exit fio_rdmaio_unregister(void) { -unregister_ioengine (&ioengine_rw); +unregister_ioengine (&ioengine); }
ioengines.c +18 -2
@@ -75,6 +75,19 @@ static struct ioengine_ops *find_ioengine(const char *name)return NULL ; } +#ifdef CONFIG_DYNAMIC_ENGINES +static void *dlopen_external (struct thread_data *td,const char *engine) +{ +char engine_path[PATH_MAX ]; + +sprintf (engine_path,"%s/lib%s.so" ,FIO_EXT_ENG_DIR , engine); + +return dlopen (engine_path,RTLD_LAZY ); +} +#else +#define dlopen_external (td, engine) (NULL) +#endif +static struct ioengine_ops *dlopen_ioengine (struct thread_data *td,const char *engine_lib) {
@@ -86,8 +99,11 @@ static struct ioengine_ops *dlopen_ioengine(struct thread_data *td,dlerror (); dlhandle =dlopen (engine_lib,RTLD_LAZY );if (!dlhandle) { -td_vmsg (td,-1 ,dlerror (),"dlopen" ); -return NULL ; + dlhandle =dlopen_external (td, engine_lib); +if (!dlhandle) { +td_vmsg (td,-1 ,dlerror (),"dlopen" ); +return NULL ; + } }/*
ioengines.h +6 -0
@@ -10,6 +10,12 @@#define FIO_IOOPS_VERSION 26 +#ifndef CONFIG_DYNAMIC_ENGINES +#define FIO_STATIC static +#else +#define FIO_STATIC +#endif +/* * io_ops->queue() return values */
os/os-linux.h +2 -0
@@ -58,6 +58,8 @@#define OS_MAP_ANON MAP_ANONYMOUS +#define FIO_EXT_ENG_DIR "/usr/lib/fio" +typedef cpu_set_t os_cpu_mask_t ;#ifdef CONFIG_3ARG_AFFINITY
Signature · 1 line
2.17.1
PATCH v2 4/4 fio: better info when engine not found
In reply to Yigal KormanJans suggested we provide the user with the likely reasons why we failed to load the given engine.
This should help better resolve these issues.
--- ioengines.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
ioengines.c +7 -1
@@ -79,10 +79,16 @@ static struct ioengine_ops *find_ioengine(const char *name)static void *dlopen_external (struct thread_data *td,const char *engine) {char engine_path[PATH_MAX ]; +void *dlhandle;sprintf (engine_path,"%s/lib%s.so" ,FIO_EXT_ENG_DIR , engine); -return dlopen (engine_path,RTLD_LAZY ); + dlhandle =dlopen (engine_path,RTLD_LAZY ); +if (!dlhandle) +log_info ("Engine %s not found; Either name is invalid, was not built, or fio-engine-%s package is missing.\n" , + engine, engine); + +return dlhandle; }#else #define dlopen_external (td, engine) (NULL)
Signature · 1 line
2.17.1
Quoted 27 lines · Yigal Korman
The following patchset provides a configuration option that converts a select set of engines into external engines that are loaded dynamically on demand. The purpose of this option is to provide distribution packagers the ability to separate the core fio functionality from the additional optional engines. Some of the optional engines have multiple dependencies that increase the footprint of fio considerably even when the user requires only the basic 'sync' engine.
For example, without the patchset, on a Fedora 31 system, installing fio brings a total of 38 package dependencies, the installed size is 57MB. With the patchset, installing fio brings a single dependency (numactl-libs) and the installed size is 2.1MB.
These numbers are relatively small but when one needs to bring fio to an offline server, collecting these dependencies is a hassle. Also, bundling fio into a container where the base image is small (Fedora 31 is ~200MB), the install size becomes more prominent.
I've tried to keep the changes as small and unobtrusive as possible. The only significant change is the way an engine is defined in the
Makefile(variables are now prefixed with engine name). If the option is provided, theMakefilewill build the engines as external libraries and install them in/usr/lib/fioby default. Fio will then search for the engines in that location if the engine is not compiled in. The last patch should help with the migration to the new scheme by suggesting that an additional package is required if the engine is not found.
Quoted 7 lines
Future work to consider:
* Move the engine help text from fio to the engines themselves. Create
* a whitelist of engines so that only engines that are part of the main
* codebase are searched and loaded automatically. Convert more engines
* to this scheme. The current set of engines was selected based on
* simplicity and external dependencies. Engines with multiple exported
* flavors (i.e. glusterfs) are not converted yet.
Looks good to me, I've applied it. Thanks!
Signature · 1 line
Jens Axboe