Recent changes (master)
The following changes since commit 7f250f7514bacef1a3cea24a22ecce8bd30378bd:
ci: resolve GitHub Actions Node.js warnings (2024-01-24 19:45:33 +0000)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 90a0fbc83c59ddfacc3e90dcb7721ff322bfe26f:
Merge branch 'coverity-fix' of https://github.com/ankit-sam/fio (2024-01-25 10:20:10 -0700)
----------------------------------------------------------------
Ankit Kumar (3):
stat: log out both average and max over the window
docs: update fio man page for log_window_value
iolog: fix reported defect from coverity scan
Jens Axboe (2):
t/io_uring: remove dma map option
Merge branch 'coverity-fix' of https://github.com/ankit-sam/fio
Vincent Fu (1):
docs: change listed type for log_window_value to str
HOWTO.rst | 45 ++++++++++++++++++++++++++-------- client.c | 6 +++-- fio.1 | 47 ++++++++++++++++++++++++++++-------- iolog.c | 79 +++++++++++++++++++++++++++++++++++++++++++++--------------- iolog.h | 21 +++++++++++++--- options.c | 34 ++++++++++++++++++++++---- server.c | 6 +++-- stat.c | 32 ++++++++++++++---------- t/io_uring.c | 46 ++--------------------------------- 9 files changed, 207 insertions(+), 109 deletions(-)
---
Diff of recent changes:
HOWTO.rst +35 -10
@@ -4067,7 +4067,7 @@ Measurements and reporting I/O that completes. When writing to the disk log, that can quickly grow to a very large size. Setting this option makes fio average the each log entry over the specified period of time, reducing the resolution of the log. See - :option:`log_max_value` as well. Defaults to 0, logging all entries. + :option:`log_window_value` as well. Defaults to 0, logging all entries. Also see `Log File Formats`_. .. option:: log_hist_msec=int
@@ -4088,11 +4088,28 @@ Measurements and reporting histogram logs contain 1216 latency bins. See :option:`write_hist_log` and `Log File Formats`_. -.. option:: log_max_value=bool +.. option:: log_window_value=str, log_max_value=str - If :option:`log_avg_msec` is set, fio logs the average over that window. If - you instead want to log the maximum value, set this option to 1. Defaults to - 0, meaning that averaged values are logged. + If :option:`log_avg_msec` is set, fio by default logs the average over that + window. This option determines whether fio logs the average, maximum or + both the values over the window. This only affects the latency logging, + as both average and maximum values for iops or bw log will be same. + Accepted values are: + + **avg** + Log average value over the window. The default. + + **max** + Log maximum value in the window. + + **both** + Log both average and maximum value over the window. + + **0** + Backward-compatible alias for **avg**. + + **1** + Backward-compatible alias for **max**. .. option:: log_offset=bool
@@ -5061,11 +5078,19 @@ toggled with :option:`log_offset`. by the ioengine specific :option:`cmdprio_percentage`. Fio defaults to logging every individual I/O but when windowed logging is set -through :option:`log_avg_msec`, either the average (by default) or the maximum -(:option:`log_max_value` is set) *value* seen over the specified period of time -is recorded. Each *data direction* seen within the window period will aggregate -its values in a separate row. Further, when using windowed logging the *block -size* and *offset* entries will always contain 0. +through :option:`log_avg_msec`, either the average (by default), the maximum +(:option:`log_window_value` is set to max) *value* seen over the specified period +of time, or both the average *value* and maximum *value1* (:option:`log_window_value` +is set to both) is recorded. The log file format when both the values are reported +takes this form: + + *time* (`msec`), *value*, *value1*, *data direction*, *block size* (`bytes`), + *offset* (`bytes`), *command priority* + + +Each *data direction* seen within the window period will aggregate its values in a +separate row. Further, when using windowed logging the *block size* and *offset* +entries will always contain 0. Client/Server
client.c +4 -2
@@ -1718,8 +1718,10 @@ static struct cmd_iolog_pdu *convert_iolog(struct fio_net_cmd *cmd, s = (struct io_sample *)((char *)s +sizeof (struct io_u_plat_entry ) * i); s->time =le64_to_cpu (s->time); -if (ret->log_type !=IO_LOG_TYPE_HIST ) - s->data.val =le64_to_cpu (s->data.val); +if (ret->log_type !=IO_LOG_TYPE_HIST ) { + s->data.val.val0 =le64_to_cpu (s->data.val.val0); + s->data.val.val1 =le64_to_cpu (s->data.val.val1); + } s->__ddir =__le32_to_cpu (s->__ddir); s->bs =le64_to_cpu (s->bs); s->priority =le16_to_cpu (s->priority);
fio.1 +37 -10
65 lines not on this page · raw message
iolog.c +59 -20
109 lines not on this page · raw message
iolog.h +18 -3
@@ -26,13 +26,23 @@ struct io_hist {struct flist_head list; }; +enum { +IO_LOG_SAMPLE_AVG =0 , +IO_LOG_SAMPLE_MAX , +IO_LOG_SAMPLE_BOTH , +}; + +struct io_sample_value { +uint64_t val0; +uint64_t val1; +};union io_sample_data { -uint64_t val; +struct io_sample_value val;struct io_u_plat_entry *plat_entry; }; -#define sample_val (value) ((union io_sample_data) { .val = value }) +#define sample_val (value) ((union io_sample_data) { .val.val0 = value })#define sample_plat (plat) ((union io_sample_data) { .plat_entry = plat })/*
@@ -154,8 +164,13 @@ struct io_log {* If the bit following the upper bit is set, then we have the priority */ #define LOG_PRIO_SAMPLE_BIT 0x40000000U +/* +* If the bit following prioity sample vit is set, we report both avg and max +*/ +#define LOG_AVG_MAX_SAMPLE_BIT 0x20000000U -#define LOG_SAMPLE_BITS (LOG_OFFSET_SAMPLE_BIT | LOG_PRIO_SAMPLE_BIT) +#define LOG_SAMPLE_BITS (LOG_OFFSET_SAMPLE_BIT | LOG_PRIO_SAMPLE_BIT |\ + LOG_AVG_MAX_SAMPLE_BIT)#define io_sample_ddir (io) ((io)->__ddir & ~LOG_SAMPLE_BITS) static inline void io_sample_set_ddir(struct io_log *log,
options.c +29 -5
@@ -4540,14 +4540,38 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { .group = FIO_OPT_G_INVALID, }, { - .name = "log_max_value", - .lname = "Log maximum instead of average", - .type = FIO_OPT_BOOL, + .name = "log_window_value", + .alias = "log_max_value", + .lname = "Log maximum, average or both values", + .type = FIO_OPT_STR, .off1 = offsetof(struct thread_options, log_max), - .help = "Log max sample in a window instead of average", - .def = "0", + .help = "Log max, average or both sample in a window", + .def = "avg", .category = FIO_OPT_C_LOG, .group = FIO_OPT_G_INVALID, + .posval = { + { .ival = "avg", + .oval = IO_LOG_SAMPLE_AVG, + .help ="Log average value over the window" , + }, + { .ival = "max", + .oval = IO_LOG_SAMPLE_MAX, + .help = "Log maximum value in the window", + }, + { .ival = "both", + .oval = IO_LOG_SAMPLE_BOTH, + .help = "Log both average and maximum values over the window" + }, + /* Compatibility with former boolean values */ + { .ival = "0", + .oval = IO_LOG_SAMPLE_AVG, + .help = "Alias for 'avg'", + }, + { .ival = "1", + .oval = IO_LOG_SAMPLE_MAX, + .help = "Alias for 'max'", + }, + }, }, { .name = "log_offset",
server.c +4 -2
@@ -2288,8 +2288,10 @@ int fio_send_iolog(struct thread_data *td, struct io_log *log, const char *name)struct io_sample *s =get_sample (log, cur_log, i); s->time =cpu_to_le64 (s->time); -if (log->log_type !=IO_LOG_TYPE_HIST ) - s->data.val =cpu_to_le64 (s->data.val); +if (log->log_type !=IO_LOG_TYPE_HIST ) { + s->data.val.val0 =cpu_to_le64 (s->data.val.val0); + s->data.val.val1 =cpu_to_le64 (s->data.val.val1); + } s->__ddir =__cpu_to_le32 (s->__ddir); s->bs =cpu_to_le64 (s->bs);
stat.c +19 -13
@@ -3149,7 +3149,7 @@ void reset_io_stats(struct thread_data *td) }static void __add_stat_to_log (struct io_log *iolog,enum fio_ddir ddir, -unsigned long elapsed,bool log_max) +unsigned long elapsed,int log_max) {/* * Note an entry in the log. Use the mean from the logged samples,
@@ -3159,10 +3159,16 @@ static void __add_stat_to_log(struct io_log *iolog, enum fio_ddir ddir,if (iolog->avg_window[ddir].samples) {union io_sample_data data; -if (log_max) - data.val = iolog->avg_window[ddir].max_val; -else - data.val = iolog->avg_window[ddir].mean.u.f +0.50 ; +if (log_max ==IO_LOG_SAMPLE_AVG ) { + data.val.val0 = iolog->avg_window[ddir].mean.u.f +0.50 ; + data.val.val1 =0 ; + }else if (log_max ==IO_LOG_SAMPLE_MAX ) { + data.val.val0 = iolog->avg_window[ddir].max_val; + data.val.val1 =0 ; + }else { + data.val.val0 = iolog->avg_window[ddir].mean.u.f +0.50 ; + data.val.val1 = iolog->avg_window[ddir].max_val; + }__add_log_sample (iolog, data, ddir,0 , elapsed,0 ,0 ); }
@@ -3171,7 +3177,7 @@ static void __add_stat_to_log(struct io_log *iolog, enum fio_ddir ddir, }static void _add_stat_to_log (struct io_log *iolog,unsigned long elapsed, -bool log_max) +int log_max) {enum fio_ddir ddir;
@@ -3205,7 +3211,7 @@ static unsigned long add_log_sample(struct thread_data *td,* Add the sample. If the time period has passed, then * add that entry to the log and clear. */ -add_stat_sample (&iolog->avg_window[ddir], data.val); +add_stat_sample (&iolog->avg_window[ddir], data.val.val0);/* * If period hasn't passed, adding the above sample is all we
@@ -3221,7 +3227,7 @@ static unsigned long add_log_sample(struct thread_data *td,return diff; } -__add_stat_to_log (iolog, ddir, elapsed, td->o.log_max !=0 ); +__add_stat_to_log (iolog, ddir, elapsed, td->o.log_max); iolog->avg_last[ddir] = elapsed - (elapsed % iolog->avg_msec);
@@ -3235,15 +3241,15 @@ void finalize_logs(struct thread_data *td, bool unit_logs) elapsed =mtime_since_now (&td->epoch);if (td->clat_log && unit_logs) -_add_stat_to_log (td->clat_log, elapsed, td->o.log_max !=0 ); +_add_stat_to_log (td->clat_log, elapsed, td->o.log_max);if (td->slat_log && unit_logs) -_add_stat_to_log (td->slat_log, elapsed, td->o.log_max !=0 ); +_add_stat_to_log (td->slat_log, elapsed, td->o.log_max);if (td->lat_log && unit_logs) -_add_stat_to_log (td->lat_log, elapsed, td->o.log_max !=0 ); +_add_stat_to_log (td->lat_log, elapsed, td->o.log_max);if (td->bw_log && (unit_logs ==per_unit_log (td->bw_log))) -_add_stat_to_log (td->bw_log, elapsed, td->o.log_max !=0 ); +_add_stat_to_log (td->bw_log, elapsed, td->o.log_max);if (td->iops_log && (unit_logs ==per_unit_log (td->iops_log))) -_add_stat_to_log (td->iops_log, elapsed, td->o.log_max !=0 ); +_add_stat_to_log (td->iops_log, elapsed, td->o.log_max); } void add_agg_sample(union io_sample_data data, enum fio_ddir ddir,
t/io_uring.c +2 -44
100 lines not on this page · raw message