Recent changes (master)
The following changes since commit 60c19edf22e4a81fe0320370c2386c5b42127dc0:
Merge branch 'fix/io_uring-cq-reap' of https://github.com/calebsander/fio (2025-07-18 12:38:12 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 258e96aa863a48c86439a1dac54da7703252ee70:
Merge branch 'filetype-option' of https://github.com/struschev/fio (2025-07-22 09:47:31 -0400)
----------------------------------------------------------------
Sergey Truschev (1):
fio: add filetype option
Vincent Fu (1):
Merge branch 'filetype-option' of https://github.com/struschev/fio
HOWTO.rst | 16 ++++++++++++++++ cconv.c | 2 ++ filesetup.c | 5 ++++- fio.1 | 22 ++++++++++++++++++++++ options.c | 16 ++++++++++++++++ server.h | 2 +- thread_options.h | 3 ++- 7 files changed, 63 insertions(+), 3 deletions(-)
---
Diff of recent changes:
HOWTO.rst +16 -0
@@ -854,6 +854,22 @@ Target file/device generated filenames (with a directory specified) with the source of the client connecting. To disable this behavior, set this option to 0. +.. option:: filetype=str + + Assume that all files defined in a job are of this type. By default fio + will do :manpage:`stat(2)` for each file to know its file type. For huge + filesets it might be a bottleneck, so the option can be used to skip the + huge number of syscalls. The file types are: + + **none** + Unset. The default. + **file** + Regular file. + **block** + Block device file. + **char** + Char device file. + .. option:: opendir=str Recursively open any files below directory `str`. This accepts only a
cconv.c +2 -0
@@ -172,6 +172,7 @@ int convert_thread_options_to_cpu(struct thread_options *o, o->create_fsync =le32_to_cpu (top->create_fsync); o->create_on_open =le32_to_cpu (top->create_on_open); o->create_only =le32_to_cpu (top->create_only); + o->filetype =le32_to_cpu (top->filetype); o->end_fsync =le32_to_cpu (top->end_fsync); o->pre_read =le32_to_cpu (top->pre_read); o->sync_io =le32_to_cpu (top->sync_io);
@@ -436,6 +437,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top, top->create_fsync =cpu_to_le32 (o->create_fsync); top->create_on_open =cpu_to_le32 (o->create_on_open); top->create_only =cpu_to_le32 (o->create_only); + top->filetype =cpu_to_le32 (o->filetype); top->end_fsync =cpu_to_le32 (o->end_fsync); top->pre_read =cpu_to_le32 (o->pre_read); top->sync_io =cpu_to_le32 (o->sync_io);
filesetup.c +4 -1
@@ -1833,7 +1833,10 @@ int add_file(struct thread_data *td, const char *fname, int numjob, int inc)/* can't handle smalloc failure from here */ assert (f->file_name); -get_file_type (f); +if (td->o.filetype) + f->filetype = td->o.filetype; +else +get_file_type (f);switch (td->o.file_lock_mode) {case FILE_LOCK_NONE :
fio.1 +22 -0
@@ -635,6 +635,28 @@ To avoid collisions between networked clients, fio defaults to prefixing any generated filenames (with a directory specified) with the source of the client connecting. To disable this behavior, set this option to 0. .TP +.BI filetype \fR=\fPstr +Assume that all files defined in a job are of this type. By default fio will do +\fBstat\fR\|(2) for each file to know its file type. For huge filesets it might +be a bottleneck, so the option can be used to skip the huge number of syscalls. +The file types are: +.RS +.RS +.TP +.B none +Unset. The default. +.TP +.B file +Regular file. +.TP +.B block +Block device file. +.TP +.B char +Char device file. +.RE +.RE +.TP .BI opendir \fR=\fPstr Recursively open any files below directory \fIstr\fR. This accepts only a single directory and unlike related options, colons appearing in the path must
options.c +16 -0
@@ -1954,6 +1954,22 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { .category = FIO_OPT_C_FILE, .group = FIO_OPT_G_FILENAME, }, + { + .name = "filetype", + .lname = "file_type", + .type = FIO_OPT_STR, + .off1 = offsetof(struct thread_options, filetype), + .help = "Assume all files defined in a job are of this type", + .def = "none", + .group = FIO_OPT_G_IO_BASIC, + .category = FIO_OPT_C_FILE, + .posval = { + { .ival = "none", .oval = 0 }, + { .ival = "file", .oval = FIO_TYPE_FILE }, + { .ival = "block", .oval = FIO_TYPE_BLOCK }, + { .ival = "char", .oval = FIO_TYPE_CHAR }, + }, + }, { .name = "directory", .lname = "Directory",
server.h +1 -1
@@ -51,7 +51,7 @@ struct fio_net_cmd_reply { };enum { -FIO_SERVER_VER =111 , +FIO_SERVER_VER =112 ,FIO_SERVER_MAX_FRAGMENT_PDU =1024 ,FIO_SERVER_MAX_CMD_MB =2048 ,
thread_options.h +2 -1
@@ -127,6 +127,7 @@ struct thread_options {unsigned int nr_files;unsigned int open_files; +unsigned int filetype;enum file_lock_mode file_lock_mode;unsigned int odirect;
@@ -461,6 +462,7 @@ struct thread_options_pack {uint32_t nr_files;uint32_t open_files; +uint32_t filetype;uint32_t file_lock_mode;uint32_t odirect;
@@ -519,7 +521,6 @@ struct thread_options_pack {struct zone_split zone_split[DDIR_RWDIR_CNT ][ZONESPLIT_MAX ];uint32_t zone_split_nr[DDIR_RWDIR_CNT ]; -uint32_t pad2;fio_fp64_t zipf_theta;fio_fp64_t pareto_h;