Recent changes (master)
The following changes since commit caf7ac7ef000097765b1c56404adb5e68b227977:
t/zbd: add max_active configs to run-tests-against-nullb (2023-07-20 09:52:37 -0400)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 0b47b2cf3dab1d26d72f52ed8c19f782a8277d3a:
Merge branch 'prio-hints' (2023-07-21 15:23:40 -0600)
----------------------------------------------------------------
Damien Le Moal (6):
os-linux: Cleanup IO priority class and value macros
cmdprio: Introduce generic option definitions
os-linux: add initial support for IO priority hints
options: add priohint option
cmdprio: Add support for per I/O priority hint
stats: Add hint information to per priority level stats
Jens Axboe (1):
Merge branch 'prio-hints'
Shin'ichiro Kawasaki (1):
backend: clear IO_U_F_FLIGHT flag in zero byte read path
HOWTO.rst | 37 +++++++++++++++++-- backend.c | 11 ++++-- cconv.c | 2 + engines/cmdprio.c | 9 +++-- engines/cmdprio.h | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++ engines/io_uring.c | 86 ++----------------------------------------- engines/libaio.c | 82 +---------------------------------------- fio.1 | 33 +++++++++++++++-- options.c | 31 ++++++++++++++-- os/os-dragonfly.h | 4 +- os/os-linux.h | 27 ++++++++++---- os/os.h | 7 +++- server.h | 2 +- stat.c | 10 +++-- thread_options.h | 3 +- 15 files changed, 252 insertions(+), 198 deletions(-)
---
Diff of recent changes:
HOWTO.rst +33 -4
@@ -2287,6 +2287,16 @@ with the caveat that when used on the command line, they must come after the reads and writes. See :manpage:`ionice(1)`. See also the :option:`prioclass` option. +.. option:: cmdprio_hint=int[,int] : [io_uring] [libaio] + + Set the I/O priority hint to use for I/Os that must be issued with + a priority when :option:`cmdprio_percentage` or + :option:`cmdprio_bssplit` is set. If not specified when + :option:`cmdprio_percentage` or :option:`cmdprio_bssplit` is set, + this defaults to 0 (no hint). A single value applies to reads and + writes. Comma-separated values may be specified for reads and writes. + See also the :option:`priohint` option. + .. option:: cmdprio=int[,int] : [io_uring] [libaio] Set the I/O priority value to use for I/Os that must be issued with
@@ -2313,9 +2323,9 @@ with the caveat that when used on the command line, they must come after the cmdprio_bssplit=blocksize/percentage:blocksize/percentage - In this case, each entry will use the priority class and priority - level defined by the options :option:`cmdprio_class` and - :option:`cmdprio` respectively. + In this case, each entry will use the priority class, priority hint + and priority level defined by the options :option:`cmdprio_class`, + :option:`cmdprio` and :option:`cmdprio_hint` respectively. The second accepted format for this option is:
@@ -2326,7 +2336,14 @@ with the caveat that when used on the command line, they must come after the accepted format does not restrict all entries to have the same priority class and priority level. - For both formats, only the read and write data directions are supported, + The third accepted format for this option is: + + cmdprio_bssplit=blocksize/percentage/class/level/hint:... + + This is an extension of the second accepted format that allows to also + specify a priority hint. + + For all formats, only the read and write data directions are supported, values for trim IOs are ignored. This option is mutually exclusive with the :option:`cmdprio_percentage` option.
@@ -3436,6 +3453,18 @@ Threads, processes and job synchronization priority setting, see I/O engine specific :option:`cmdprio_percentage` and :option:`cmdprio_class` options. +.. option:: priohint=int + + Set the I/O priority hint. This is only applicable to platforms that + support I/O priority classes and to devices with features controlled + through priority hints, e.g. block devices supporting command duration + limits, or CDL. CDL is a way to indicate the desired maximum latency + of I/Os so that the device can optimize its internal command scheduling + according to the latency limits indicated by the user. + + For per-I/O priority hint setting, see the I/O engine specific + :option:`cmdprio_hint` option. + .. option:: cpus_allowed=str Controls the same options as :option:`cpumask`, but accepts a textual
backend.c +7 -4
@@ -466,7 +466,7 @@ int io_queue_event(struct thread_data *td, struct io_u *io_u, int *ret,if (!from_verify)unlog_io_piece (td, io_u);td_verror (td,EIO ,"full resid" ); -put_io_u (td, io_u); +clear_io_u (td, io_u);break ; }
@@ -1799,13 +1799,16 @@ static void *thread_main(void *data)/* ioprio_set() has to be done before td_io_init() */ if (fio_option_is_set (o, ioprio) || -fio_option_is_set (o, ioprio_class)) { - ret =ioprio_set (IOPRIO_WHO_PROCESS ,0 , o->ioprio_class, o->ioprio); +fio_option_is_set (o, ioprio_class) || +fio_option_is_set (o, ioprio_hint)) { + ret =ioprio_set (IOPRIO_WHO_PROCESS ,0 , o->ioprio_class, + o->ioprio, o->ioprio_hint);if (ret ==-1 ) {td_verror (td, errno,"ioprio_set" ); goto err; } - td->ioprio =ioprio_value (o->ioprio_class, o->ioprio); + td->ioprio =ioprio_value (o->ioprio_class, o->ioprio, + o->ioprio_hint); td->ts.ioprio = td->ioprio; }
cconv.c +2 -0
@@ -281,6 +281,7 @@ int convert_thread_options_to_cpu(struct thread_options *o, o->nice =le32_to_cpu (top->nice); o->ioprio =le32_to_cpu (top->ioprio); o->ioprio_class =le32_to_cpu (top->ioprio_class); + o->ioprio_hint =le32_to_cpu (top->ioprio_hint); o->file_service_type =le32_to_cpu (top->file_service_type); o->group_reporting =le32_to_cpu (top->group_reporting); o->stats =le32_to_cpu (top->stats);
@@ -496,6 +497,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top, top->nice =cpu_to_le32 (o->nice); top->ioprio =cpu_to_le32 (o->ioprio); top->ioprio_class =cpu_to_le32 (o->ioprio_class); + top->ioprio_hint =cpu_to_le32 (o->ioprio_hint); top->file_service_type =cpu_to_le32 (o->file_service_type); top->group_reporting =cpu_to_le32 (o->group_reporting); top->stats =cpu_to_le32 (o->stats);
engines/cmdprio.c +6 -3
@@ -267,7 +267,8 @@ static int fio_cmdprio_percentage(struct cmdprio *cmdprio, struct io_u *io_u,* to be set. If the random percentage value is within the user specified * percentage of I/Os that should use a cmdprio priority value (rather than * the default priority), then this function updates the io_u with an ioprio -* value as defined by the cmdprio/cmdprio_class or cmdprio_bssplit options. +* value as defined by the cmdprio/cmdprio_hint/cmdprio_class or +* cmdprio_bssplit options. * * Return true if the io_u ioprio was changed and false otherwise. */
@@ -342,7 +343,8 @@ static int fio_cmdprio_gen_perc(struct thread_data *td, struct cmdprio *cmdprio) prio = &cmdprio->perc_entry[ddir]; prio->perc = options->percentage[ddir]; prio->prio =ioprio_value (options->class[ddir], - options->level[ddir]); + options->level[ddir], + options->hint[ddir]);assign_clat_prio_index (prio, &values[ddir]); ret =init_ts_clat_prio (ts, ddir, &values[ddir]);
@@ -400,7 +402,8 @@ static int fio_cmdprio_parse_and_gen_bssplit(struct thread_data *td, goto err; implicit_cmdprio =ioprio_value (options->class[ddir], - options->level[ddir]); + options->level[ddir], + options->hint[ddir]); ret = fio_cmdprio_generate_bsprio_desc(&cmdprio->bsprio_desc[ddir], &parse_res[ddir],
engines/cmdprio.h +106 -0
121 lines not on this page · raw message
engines/io_uring.c +3 -83
104 lines not on this page · raw message
engines/libaio.c +1 -81
94 lines not on this page · raw message
fio.1 +30 -3
@@ -2084,6 +2084,14 @@ is set, this defaults to the highest priority class. A single value applies to reads and writes. Comma-separated values may be specified for reads and writes. See man \fBionice\fR\|(1). See also the \fBprioclass\fR option. .TP +.BI (io_uring,libaio)cmdprio_hint \fR=\fPint[,int] +Set the I/O priority hint to use for I/Os that must be issued with a +priority when \fBcmdprio_percentage\fR or \fBcmdprio_bssplit\fR is set. +If not specified when \fBcmdprio_percentage\fR or \fBcmdprio_bssplit\fR +is set, this defaults to 0 (no hint). A single value applies to reads and +writes. Comma-separated values may be specified for reads and writes. +See also the \fBpriohint\fR option. +.TP .BI (io_uring,libaio)cmdprio \fR=\fPint[,int] Set the I/O priority value to use for I/Os that must be issued with a priority when \fBcmdprio_percentage\fR or \fBcmdprio_bssplit\fR is set.
@@ -2109,8 +2117,9 @@ The first accepted format for this option is the same as the format of the cmdprio_bssplit=blocksize/percentage:blocksize/percentage .RE .P -In this case, each entry will use the priority class and priority level defined -by the options \fBcmdprio_class\fR and \fBcmdprio\fR respectively. +In this case, each entry will use the priority class, priority hint and +priority level defined by the options \fBcmdprio_class\fR, \fBcmdprio\fR +and \fBcmdprio_hint\fR respectively. .P The second accepted format for this option is: .RS
@@ -2123,7 +2132,16 @@ entry. In comparison with the first accepted format, the second accepted format does not restrict all entries to have the same priority class and priority level. .P -For both formats, only the read and write data directions are supported, values +The third accepted format for this option is: +.RS +.P +cmdprio_bssplit=blocksize/percentage/class/level/hint:... +.RE +.P +This is an extension of the second accepted format that allows to also +specify a priority hint. +.P +For all formats, only the read and write data directions are supported, values for trim IOs are ignored. This option is mutually exclusive with the \fBcmdprio_percentage\fR option. .RE
@@ -3144,6 +3162,15 @@ Set the I/O priority class. See man \fBionice\fR\|(1). For per-command priority setting, see the I/O engine specific `cmdprio_percentage` and `cmdprio_class` options. .TP +.BI priohint \fR=\fPint +Set the I/O priority hint. This is only applicable to platforms that support +I/O priority classes and to devices with features controlled through priority +hints, e.g. block devices supporting command duration limits, or CDL. CDL is a +way to indicate the desired maximum latency of I/Os so that the device can +optimize its internal command scheduling according to the latency limits +indicated by the user. For per-I/O priority hint setting, see the I/O engine +specific \fBcmdprio_hint\fB option. +.TP .BI cpus_allowed \fR=\fPstr Controls the same options as \fBcpumask\fR, but accepts a textual specification of the permitted CPUs instead and CPUs are indexed from 0. So
options.c +28 -3
@@ -313,15 +313,17 @@ static int parse_cmdprio_bssplit_entry(struct thread_options *o,int matches =0 ;char *bs_str =NULL ;long long bs_val; -unsigned int perc =0 , class, level; +unsigned int perc =0 , class, level, hint;/* * valid entry formats: * bs/ - %s/ - set perc to 0, prio to -1. * bs/perc - %s/%u - set prio to -1. * bs/perc/class/level - %s/%u/%u/%u +* bs/perc/class/level/hint - %s/%u/%u/%u/%u */ - matches =sscanf (str,"%m[^/]/%u/%u/%u" , &bs_str, &perc, &class, &level); + matches =sscanf (str,"%m[^/]/%u/%u/%u/%u" , + &bs_str, &perc, &class, &level, &hint);if (matches <1 ) {log_err ("fio: invalid cmdprio_bssplit format\n" );return 1 ;
@@ -342,9 +344,14 @@ static int parse_cmdprio_bssplit_entry(struct thread_options *o,case 2 :/* bs/perc case */ break ;case 4 :/* bs/perc/class/level case */ +case 5 :/* bs/perc/class/level/hint case */ class =min (class, (unsigned int )IOPRIO_MAX_PRIO_CLASS ); level =min (level, (unsigned int )IOPRIO_MAX_PRIO ); - entry->prio =ioprio_value (class, level); +if (matches ==5 ) + hint =min (hint, (unsigned int )IOPRIO_MAX_PRIO_HINT ); +else + hint =0 ; + entry->prio =ioprio_value (class, level, hint);break ;default :log_err ("fio: invalid cmdprio_bssplit format\n" );
@@ -3806,6 +3813,18 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { .category = FIO_OPT_C_GENERAL, .group = FIO_OPT_G_CRED, }, + { + .name = "priohint", + .lname = "I/O nice priority hint", + .type = FIO_OPT_INT, + .off1 = offsetof(struct thread_options, ioprio_hint), + .help = "Set job IO priority hint", + .minval = IOPRIO_MIN_PRIO_HINT, + .maxval = IOPRIO_MAX_PRIO_HINT, + .interval = 1, + .category = FIO_OPT_C_GENERAL, + .group = FIO_OPT_G_CRED, + }, #else { .name = "prioclass",
@@ -3813,6 +3832,12 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { .type = FIO_OPT_UNSUPPORTED, .help = "Your platform does not support IO priority classes", }, + { + .name = "priohint", + .lname = "I/O nice priority hint", + .type = FIO_OPT_UNSUPPORTED, + .help = "Your platform does not support IO priority hints", + },#endif { .name = "thinktime",
os/os-dragonfly.h +2 -2
@@ -171,8 +171,8 @@ static inline int fio_getaffinity(int pid, os_cpu_mask_t *mask)* ioprio_set() with 4 arguments, so define fio's ioprio_set() as a macro. * Note that there is no idea of class within ioprio_set(2) unlike Linux. */ -#define ioprio_value (ioprio_class, ioprio) (ioprio) -#define ioprio_set (which, who, ioprio_class, ioprio) \ +#define ioprio_value (ioprio_class, ioprio, ioprio_hint) (ioprio) +#define ioprio_set (which, who, ioprio_class, ioprio, ioprio_hint) \ ioprio_set(which, who, ioprio)#define ioprio (ioprio) (ioprio)
os/os-linux.h +19 -8
@@ -125,13 +125,24 @@ enum {#define IOPRIO_BITS 16#define IOPRIO_CLASS_SHIFT 13 +#define IOPRIO_HINT_BITS 10 +#define IOPRIO_HINT_SHIFT 3 +#define IOPRIO_MIN_PRIO 0/* highest priority */ #define IOPRIO_MAX_PRIO 7/* lowest priority */ #define IOPRIO_MIN_PRIO_CLASS 0#define IOPRIO_MAX_PRIO_CLASS 3 -static inline int ioprio_value (int ioprio_class,int ioprio) +#define IOPRIO_MIN_PRIO_HINT 0 +#define IOPRIO_MAX_PRIO_HINT ((1 << IOPRIO_HINT_BITS) - 1) + +#define ioprio_class (ioprio) ((ioprio) >> IOPRIO_CLASS_SHIFT) +#define ioprio (ioprio) ((ioprio) & IOPRIO_MAX_PRIO) +#define ioprio_hint (ioprio) \ + (((ioprio) >> IOPRIO_HINT_SHIFT) & IOPRIO_MAX_PRIO_HINT) + +static inline int ioprio_value (int ioprio_class,int ioprio,int ioprio_hint) {/* * If no class is set, assume BE
@@ -139,23 +150,23 @@ static inline int ioprio_value(int ioprio_class, int ioprio)if (!ioprio_class) ioprio_class =IOPRIO_CLASS_BE ; -return (ioprio_class <<IOPRIO_CLASS_SHIFT ) | ioprio; +return (ioprio_class <<IOPRIO_CLASS_SHIFT ) | + (ioprio_hint <<IOPRIO_HINT_SHIFT ) | + ioprio; }static inline bool ioprio_value_is_class_rt (unsigned int priority) { -return (priority >>IOPRIO_CLASS_SHIFT ) ==IOPRIO_CLASS_RT ; +return ioprio_class (priority) ==IOPRIO_CLASS_RT ; } -static inline int ioprio_set (int which,int who,int ioprio_class,int ioprio) +static inline int ioprio_set (int which,int who,int ioprio_class,int ioprio, +int ioprio_hint) {return syscall (__NR_ioprio_set, which, who, -ioprio_value (ioprio_class, ioprio)); +ioprio_value (ioprio_class, ioprio, ioprio_hint)); } -#define ioprio_class (ioprio) ((ioprio) >> IOPRIO_CLASS_SHIFT) -#define ioprio (ioprio) ((ioprio) & 7) -#ifndef CONFIG_HAVE_GETTID static inline int gettid (void ) {
os/os.h +5 -2
@@ -120,11 +120,14 @@ extern int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu);#define ioprio_value_is_class_rt (prio) (false)#define IOPRIO_MIN_PRIO_CLASS 0#define IOPRIO_MAX_PRIO_CLASS 0 +#define ioprio_hint (prio) 0 +#define IOPRIO_MIN_PRIO_HINT 0 +#define IOPRIO_MAX_PRIO_HINT 0#endif #ifndef FIO_HAVE_IOPRIO -#define ioprio_value (prioclass, prio) (0) +#define ioprio_value (prioclass, prio, priohint) (0)#define ioprio (ioprio) 0 -#define ioprio_set (which, who, prioclass, prio) (0) +#define ioprio_set (which, who, prioclass, prio, priohint) (0)#define IOPRIO_MIN_PRIO 0#define IOPRIO_MAX_PRIO 0#endif
server.h +1 -1
@@ -51,7 +51,7 @@ struct fio_net_cmd_reply { };enum { -FIO_SERVER_VER =100 , +FIO_SERVER_VER =101 ,FIO_SERVER_MAX_FRAGMENT_PDU =1024 ,FIO_SERVER_MAX_CMD_MB =2048 ,
stat.c +7 -3
@@ -597,10 +597,11 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,continue ;snprintf (buf,sizeof (buf), -"%s prio %u/%u" , +"%s prio %u/%u/%u" , clat_type,ioprio_class (ts->clat_prio[ddir][i].ioprio), -ioprio (ts->clat_prio[ddir][i].ioprio)); +ioprio (ts->clat_prio[ddir][i].ioprio), +ioprio_hint (ts->clat_prio[ddir][i].ioprio));display_lat (buf, min, max, mean, dev, out); } }
@@ -640,10 +641,11 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,continue ;snprintf (prio_name,sizeof (prio_name), -"%s prio %u/%u (%.2f%% of IOs)" , +"%s prio %u/%u/%u (%.2f%% of IOs)" , clat_type,ioprio_class (ts->clat_prio[ddir][i].ioprio),ioprio (ts->clat_prio[ddir][i].ioprio), +ioprio_hint (ts->clat_prio[ddir][i].ioprio),100. * (double ) prio_samples / (double ) samples); show_clat_percentiles(ts->clat_prio[ddir][i].io_u_plat, prio_samples, ts->percentile_list,
@@ -1533,6 +1535,8 @@ static void add_ddir_status_json(struct thread_stat *ts, ioprio_class(ts->clat_prio[ddir][i].ioprio));json_object_add_value_int (obj,"prio" ,ioprio (ts->clat_prio[ddir][i].ioprio)); +json_object_add_value_int (obj,"priohint" , +ioprio_hint (ts->clat_prio[ddir][i].ioprio)); tmp_object = add_ddir_lat_json(ts, ts->clat_percentiles | ts->lat_percentiles,
thread_options.h +2 -1
@@ -248,6 +248,7 @@ struct thread_options {unsigned int nice;unsigned int ioprio;unsigned int ioprio_class; +unsigned int ioprio_hint;unsigned int file_service_type;unsigned int group_reporting;unsigned int stats;
@@ -568,6 +569,7 @@ struct thread_options_pack {uint32_t nice;uint32_t ioprio;uint32_t ioprio_class; +uint32_t ioprio_hint;uint32_t file_service_type;uint32_t group_reporting;uint32_t stats;
@@ -601,7 +603,6 @@ struct thread_options_pack {uint32_t lat_percentiles;uint32_t slat_percentiles;uint32_t percentile_precision; -uint32_t pad5;fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN ];uint8_t read_iolog_file[FIO_TOP_STR_MAX ];