Recent changes (master)
The following changes since commit f3463241727215e228a60dc3b9a1ba2996f149a1:
oslib: Fix blkzoned_get_max_open_zones() (2021-09-02 20:56:19 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 63176c21beb68ec54787eb2fd6be5b3c9132113b:
examples: add examples for cmdprio_* IO priority options (2021-09-03 10:12:25 -0600)
----------------------------------------------------------------
Damien Le Moal (11):
manpage: fix formatting
manpage: fix definition of prio and prioclass options
tools: fiograph: do not overwrite input script file
os: introduce ioprio_value() helper
options: make parsing functions available to ioengines libaio,io_uring: improve cmdprio_percentage option libaio,io_uring: introduce cmdprio_class and cmdprio options libaio,io_uring: introduce cmdprio_bssplit libaio,io_uring: relax cmdprio_percentage constraints
fio: Introduce the log_prio option
examples: add examples for cmdprio_* IO priority options
HOWTO | 59 ++++++++++++---- backend.c | 1 + cconv.c | 2 + client.c | 2 + engines/cmdprio.h | 144 +++++++++++++++++++++++++++++++++++++ engines/filecreate.c | 2 +- engines/filedelete.c | 2 +- engines/filestat.c | 2 +- engines/io_uring.c | 152 ++++++++++++++++++++++++++++++++-------- engines/libaio.c | 125 ++++++++++++++++++++++++++++----- eta.c | 2 +- examples/cmdprio-bssplit.fio | 17 +++++ examples/cmdprio-bssplit.png | Bin 0 -> 45606 bytes examples/cmdprio-percentage.fio | 17 +++++ examples/cmdprio-percentage.png | Bin 0 -> 46271 bytes fio.1 | 73 ++++++++++++++----- fio.h | 5 ++ init.c | 4 ++ io_u.c | 14 ++-- io_u.h | 10 ++- iolog.c | 45 +++++++++--- iolog.h | 16 ++++- options.c | 50 ++++++------- os/os-android.h | 20 ++++-- os/os-dragonfly.h | 1 + os/os-linux.h | 20 ++++-- os/os.h | 4 ++ server.h | 3 +- stat.c | 75 ++++++++++---------- stat.h | 9 ++- thread_options.h | 19 +++++ tools/fiograph/fiograph.conf | 4 +- tools/fiograph/fiograph.py | 4 +- 33 files changed, 724 insertions(+), 179 deletions(-) create mode 100644 engines/cmdprio.h create mode 100644 examples/cmdprio-bssplit.fio create mode 100644 examples/cmdprio-bssplit.png create mode 100644 examples/cmdprio-percentage.fio create mode 100644 examples/cmdprio-percentage.png
---
Diff of recent changes:
HOWTO +47 -12
@@ -2163,14 +2163,49 @@ In addition, there are some parameters which are only valid when a specific with the caveat that when used on the command line, they must come after the :option:`ioengine` that defines them is selected. -.. option:: cmdprio_percentage=int : [io_uring] [libaio] - - Set the percentage of I/O that will be issued with higher priority by setting - the priority bit. Non-read I/O is likely unaffected by ``cmdprio_percentage``. - This option cannot be used with the `prio` or `prioclass` options. For this - option to set the priority bit properly, NCQ priority must be supported and - enabled and :option:`direct`\=1 option must be used. fio must also be run as - the root user. +.. option:: cmdprio_percentage=int[,int] : [io_uring] [libaio] + + Set the percentage of I/O that will be issued with the highest priority. + Default: 0. A single value applies to reads and writes. Comma-separated + values may be specified for reads and writes. This option cannot be used + with the :option:`prio` or :option:`prioclass` options. For this option + to be effective, NCQ priority must be supported and enabled, and `direct=1' + option must be used. fio must also be run as the root user. + +.. option:: cmdprio_class=int[,int] : [io_uring] [libaio] + + Set the I/O priority class 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 the highest priority class. A single value applies + to reads and writes. Comma-separated values may be specified for + reads and writes. See :manpage:`ionice(1)`. See also the + :option:`prioclass` option. + +.. option:: cmdprio=int[,int] : [io_uring] [libaio] + + Set the I/O priority value 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. + Linux limits us to a positive value between 0 and 7, with 0 being the + highest. A single value applies to reads and writes. Comma-separated + values may be specified for reads and writes. See :manpage:`ionice(1)`. + Refer to an appropriate manpage for other operating systems since + meaning of priority may differ. See also the :option:`prio` option. + +.. option:: cmdprio_bssplit=str[,str] : [io_uring] [libaio] + To get a finer control over I/O priority, this option allows + specifying the percentage of IOs that must have a priority set + depending on the block size of the IO. This option is useful only + when used together with the :option:`bssplit` option, that is, + multiple different block sizes are used for reads and writes. + The format for this option is the same as the format of the + :option:`bssplit` option, with the exception that values for + trim IOs are ignored. This option is mutually exclusive with the + :option:`cmdprio_percentage` option. .. option:: fixedbufs : [io_uring]
@@ -2974,14 +3009,14 @@ Threads, processes and job synchronization between 0 and 7, with 0 being the highest. See man :manpage:`ionice(1)`. Refer to an appropriate manpage for other operating systems since meaning of priority may differ. For per-command priority - setting, see I/O engine specific `cmdprio_percentage` and `hipri_percentage` - options. + setting, see I/O engine specific :option:`cmdprio_percentage` and + :option:`cmdprio` options. .. option:: prioclass=int Set the I/O priority class. See man :manpage:`ionice(1)`. For per-command - priority setting, see I/O engine specific `cmdprio_percentage` and - `hipri_percentage` options. + priority setting, see I/O engine specific :option:`cmdprio_percentage` + and :option:`cmdprio_class` options. .. option:: cpus_allowed=str
backend.c +1 -0
@@ -1760,6 +1760,7 @@ static void *thread_main(void *data)td_verror (td, errno,"ioprio_set" ); goto err; } + td->ioprio =ioprio_value (o->ioprio_class, o->ioprio); }if (o->cgroup &&cgroup_setup (td, cgroup_list, &cgroup_mnt))
cconv.c +2 -0
@@ -192,6 +192,7 @@ void convert_thread_options_to_cpu(struct thread_options *o, o->log_hist_coarseness =le32_to_cpu (top->log_hist_coarseness); o->log_max =le32_to_cpu (top->log_max); o->log_offset =le32_to_cpu (top->log_offset); + o->log_prio =le32_to_cpu (top->log_prio); o->log_gz =le32_to_cpu (top->log_gz); o->log_gz_store =le32_to_cpu (top->log_gz_store); o->log_unix_epoch =le32_to_cpu (top->log_unix_epoch);
@@ -417,6 +418,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top, top->log_avg_msec =cpu_to_le32 (o->log_avg_msec); top->log_max =cpu_to_le32 (o->log_max); top->log_offset =cpu_to_le32 (o->log_offset); + top->log_prio =cpu_to_le32 (o->log_prio); top->log_gz =cpu_to_le32 (o->log_gz); top->log_gz_store =cpu_to_le32 (o->log_gz_store); top->log_unix_epoch =cpu_to_le32 (o->log_unix_epoch);
client.c +2 -0
@@ -1679,6 +1679,7 @@ static struct cmd_iolog_pdu *convert_iolog(struct fio_net_cmd *cmd, ret->log_type =le32_to_cpu (ret->log_type); ret->compressed =le32_to_cpu (ret->compressed); ret->log_offset =le32_to_cpu (ret->log_offset); + ret->log_prio =le32_to_cpu (ret->log_prio); ret->log_hist_coarseness =le32_to_cpu (ret->log_hist_coarseness);if (*store_direct)
@@ -1696,6 +1697,7 @@ static struct cmd_iolog_pdu *convert_iolog(struct fio_net_cmd *cmd, s->data.val =le64_to_cpu (s->data.val); s->__ddir =__le32_to_cpu (s->__ddir); s->bs =le64_to_cpu (s->bs); + s->priority =le16_to_cpu (s->priority);if (ret->log_offset) {struct io_sample_offset *so = (void *) s;
engines/cmdprio.h new file +144 -0
144 lines not on this page · raw message
engines/filecreate.c +1 -1
@@ -49,7 +49,7 @@ static int open_file(struct thread_data *td, struct fio_file *f)uint64_t nsec; nsec =ntime_since_now (&start); -add_clat_sample (td, data->stat_ddir, nsec,0 ,0 ,0 ); +add_clat_sample (td, data->stat_ddir, nsec,0 ,0 ,0 , false); }return 0 ;
engines/filedelete.c +1 -1
@@ -51,7 +51,7 @@ static int delete_file(struct thread_data *td, struct fio_file *f)uint64_t nsec; nsec =ntime_since_now (&start); -add_clat_sample (td, data->stat_ddir, nsec,0 ,0 ,0 ); +add_clat_sample (td, data->stat_ddir, nsec,0 ,0 ,0 , false); }return 0 ;
engines/filestat.c +1 -1
@@ -125,7 +125,7 @@ static int stat_file(struct thread_data *td, struct fio_file *f)uint64_t nsec; nsec =ntime_since_now (&start); -add_clat_sample (td, data->stat_ddir, nsec,0 ,0 ,0 ); +add_clat_sample (td, data->stat_ddir, nsec,0 ,0 ,0 , false); }return 0 ;
engines/io_uring.c +122 -30
235 lines not on this page · raw message
engines/libaio.c +107 -18
197 lines not on this page · raw message
eta.c +1 -1
@@ -509,7 +509,7 @@ bool calc_thread_status(struct jobs_eta *je, int force)memcpy (&rate_prev_time, &now,sizeof (now));regrow_agg_logs ();for_each_rw_ddir (ddir) { -add_agg_sample (sample_val (je->rate[ddir]), ddir,0 ,0 ); +add_agg_sample (sample_val (je->rate[ddir]), ddir,0 ); } }
examples/cmdprio-bssplit.fio new file +17 -0
@@ -0,0 +1,17 @@ +; Randomly read/write a block device file at queue depth 16. +; 40 % of read IOs are 64kB and 60% are 1MB. 100% of writes are 1MB. +; 100% of the 64kB reads are executed at the highest priority and +; all other IOs executed without a priority set. +[global] +filename=/dev/sda +direct=1 +write_lat_log=prio-run.log +log_prio=1 + +[randrw] +rw=randrw +bssplit=64k/40:1024k/60,1024k/100 +ioengine=libaio +iodepth=16 +cmdprio_bssplit=64k/100:1024k/0,1024k/0 +cmdprio_class=1
examples/cmdprio-bssplit.png new file binary +0 -0
examples/cmdprio-percentage.fio new file +17 -0
@@ -0,0 +1,17 @@ +; Read a block device file at queue depth 8 +; with 20 % of the IOs using the high priority RT class +; and the remaining IOs using the idle priority class +[global] +filename=/dev/sda +direct=1 +write_lat_log=prio-run.log +log_prio=1 + +[randread] +rw=randread +bs=128k +ioengine=libaio +iodepth=8 +prioclass=3 +cmdprio_percentage=20 +cmdprio_class=1
examples/cmdprio-percentage.png new file binary +0 -0
fio.1 +56 -17
116 lines not on this page · raw message
fio.h +5 -0
@@ -280,6 +280,11 @@ struct thread_data {int shm_id; +/* +* Job default IO priority set with prioclass and prio options. +*/ +unsigned int ioprio; +/* * IO engine hooks, contains everything needed to submit an io_u * to any of the available IO engines.
init.c +4 -0
@@ -1583,6 +1583,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num, .hist_coarseness = o->log_hist_coarseness, .log_type = IO_LOG_TYPE_LAT, .log_offset = o->log_offset, + .log_prio = o->log_prio, .log_gz = o->log_gz, .log_gz_store = o->log_gz_store, };
@@ -1616,6 +1617,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num, .hist_coarseness = o->log_hist_coarseness, .log_type = IO_LOG_TYPE_HIST, .log_offset = o->log_offset, + .log_prio = o->log_prio, .log_gz = o->log_gz, .log_gz_store = o->log_gz_store, };
@@ -1647,6 +1649,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num, .hist_coarseness = o->log_hist_coarseness, .log_type = IO_LOG_TYPE_BW, .log_offset = o->log_offset, + .log_prio = o->log_prio, .log_gz = o->log_gz, .log_gz_store = o->log_gz_store, };
@@ -1678,6 +1681,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num, .hist_coarseness = o->log_hist_coarseness, .log_type = IO_LOG_TYPE_IOPS, .log_offset = o->log_offset, + .log_prio = o->log_prio, .log_gz = o->log_gz, .log_gz_store = o->log_gz_store, };
io_u.c +10 -4
@@ -1595,7 +1595,7 @@ again:assert (io_u->flags &IO_U_F_FREE );io_u_clear (td, io_u,IO_U_F_FREE |IO_U_F_NO_FILE_PUT |IO_U_F_TRIMMED |IO_U_F_BARRIER | -IO_U_F_VER_LIST |IO_U_F_PRIORITY ); +IO_U_F_VER_LIST |IO_U_F_HIGH_PRIO ); io_u->error =0 ; io_u->acct_ddir =-1 ;
@@ -1799,6 +1799,10 @@ struct io_u *get_io_u(struct thread_data *td) io_u->xfer_buf = io_u->buf; io_u->xfer_buflen = io_u->buflen; +/* +* Remember the issuing context priority. The IO engine may change this. +*/ + io_u->ioprio = td->ioprio; out:assert (io_u->file);if (!td_io_prep (td, io_u)) {
@@ -1884,7 +1888,8 @@ static void account_io_completion(struct thread_data *td, struct io_u *io_u,unsigned long long tnsec; tnsec =ntime_since (&io_u->start_time, &icd->time); -add_lat_sample (td, idx, tnsec, bytes, io_u->offset,io_u_is_prio (io_u)); +add_lat_sample (td, idx, tnsec, bytes, io_u->offset, + io_u->ioprio,io_u_is_high_prio (io_u));if (td->flags &TD_F_PROFILE_OPS ) {struct prof_io_ops *ops = &td->prof_io_ops;
@@ -1905,7 +1910,8 @@ static void account_io_completion(struct thread_data *td, struct io_u *io_u,if (ddir_rw (idx)) {if (!td->o.disable_clat) { -add_clat_sample (td, idx, llnsec, bytes, io_u->offset,io_u_is_prio (io_u)); +add_clat_sample (td, idx, llnsec, bytes, io_u->offset, + io_u->ioprio,io_u_is_high_prio (io_u));io_u_mark_latency (td, llnsec); }
@@ -2162,7 +2168,7 @@ void io_u_queued(struct thread_data *td, struct io_u *io_u) td = td->parent;add_slat_sample (td, io_u->ddir, slat_time, io_u->xfer_buflen, - io_u->offset,io_u_is_prio (io_u)); + io_u->offset, io_u->ioprio); } }
io_u.h +7 -3
@@ -21,7 +21,7 @@ enum {IO_U_F_TRIMMED =1 <<5 ,IO_U_F_BARRIER =1 <<6 ,IO_U_F_VER_LIST =1 <<7 , - IO_U_F_PRIORITY = 1 << 8, + IO_U_F_HIGH_PRIO = 1 << 8, };/*
@@ -46,6 +46,11 @@ struct io_u {*/ unsigned short numberio; +/* +* IO priority. +*/ +unsigned short ioprio; +/* * Allocated/set buffer and length */
@@ -188,7 +193,6 @@ static inline enum fio_ddir acct_ddir(struct io_u *io_u) td_flags_clear((td), &(io_u->flags), (val))#define io_u_set (td, io_u, val) \ td_flags_set((td), &(io_u)->flags, (val)) -#define io_u_is_prio (io_u) \ - (io_u->flags & (unsigned int) IO_U_F_PRIORITY) != 0 +#define io_u_is_high_prio (io_u) (io_u->flags & IO_U_F_HIGH_PRIO)#endif
iolog.c +35 -10
80 lines not on this page · raw message
iolog.h +14 -2
@@ -42,7 +42,7 @@ struct io_sample {uint64_t time;union io_sample_data data;uint32_t __ddir; -uint8_t priority_bit; +uint16_t priority;uint64_t bs; };
@@ -104,6 +104,11 @@ struct io_log {*/ unsigned int log_offset; +/* +* Log I/O priorities +*/ +unsigned int log_prio; +/* * Max size of log entries before a chunk is compressed */
@@ -145,7 +150,13 @@ struct io_log {* If the upper bit is set, then we have the offset as well */ #define LOG_OFFSET_SAMPLE_BIT 0x80000000U -#define io_sample_ddir (io) ((io)->__ddir & ~LOG_OFFSET_SAMPLE_BIT) +/* +* If the bit following the upper bit is set, then we have the priority +*/ +#define LOG_PRIO_SAMPLE_BIT 0x40000000U + +#define LOG_SAMPLE_BITS (LOG_OFFSET_SAMPLE_BIT | LOG_PRIO_SAMPLE_BIT) +#define io_sample_ddir (io) ((io)->__ddir & ~LOG_SAMPLE_BITS) static inline void io_sample_set_ddir(struct io_log *log, struct io_sample *io,
@@ -262,6 +273,7 @@ struct log_params {int hist_coarseness;int log_type;int log_offset; +int log_prio;int log_gz;int log_gz_store;int log_compress;
options.c +26 -24
122 lines not on this page · raw message
os/os-android.h +15 -5
@@ -173,16 +173,26 @@ enum {#define IOPRIO_MIN_PRIO_CLASS 0#define IOPRIO_MAX_PRIO_CLASS 3 -static inline int ioprio_set (int which,int who,int ioprio_class,int ioprio) +static inline int ioprio_value (int ioprio_class,int ioprio) {/* * If no class is set, assume BE */ -if (!ioprio_class) - ioprio_class =IOPRIO_CLASS_BE ; +if (!ioprio_class) + ioprio_class =IOPRIO_CLASS_BE ; + +return (ioprio_class <<IOPRIO_CLASS_SHIFT ) | ioprio; +} + +static inline bool ioprio_value_is_class_rt (unsigned int priority) +{ +return (priority >>IOPRIO_CLASS_SHIFT ) ==IOPRIO_CLASS_RT ; +} - ioprio |= ioprio_class <<IOPRIO_CLASS_SHIFT ; -return syscall (__NR_ioprio_set, which, who, ioprio); +static inline int ioprio_set (int which,int who,int ioprio_class,int ioprio) +{ +return syscall (__NR_ioprio_set, which, who, +ioprio_value (ioprio_class, ioprio)); }#ifndef BLKGETSIZE64
os/os-dragonfly.h +1 -0
@@ -171,6 +171,7 @@ 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) \ ioprio_set(which, who, ioprio)
os/os-linux.h +15 -5
@@ -118,16 +118,26 @@ enum {#define IOPRIO_MIN_PRIO_CLASS 0#define IOPRIO_MAX_PRIO_CLASS 3 -static inline int ioprio_set (int which,int who,int ioprio_class,int ioprio) +static inline int ioprio_value (int ioprio_class,int ioprio) {/* * If no class is set, assume BE */ -if (!ioprio_class) - ioprio_class =IOPRIO_CLASS_BE ; +if (!ioprio_class) + ioprio_class =IOPRIO_CLASS_BE ; + +return (ioprio_class <<IOPRIO_CLASS_SHIFT ) | ioprio; +} + +static inline bool ioprio_value_is_class_rt (unsigned int priority) +{ +return (priority >>IOPRIO_CLASS_SHIFT ) ==IOPRIO_CLASS_RT ; +} - ioprio |= ioprio_class <<IOPRIO_CLASS_SHIFT ; -return syscall (__NR_ioprio_set, which, who, ioprio); +static inline int ioprio_set (int which,int who,int ioprio_class,int ioprio) +{ +return syscall (__NR_ioprio_set, which, who, +ioprio_value (ioprio_class, ioprio)); }#ifndef CONFIG_HAVE_GETTID
os/os.h +4 -0
@@ -117,7 +117,11 @@ static inline int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu_index)extern int fio_cpus_split (os_cpu_mask_t *mask,unsigned int cpu);#endif +#ifndef FIO_HAVE_IOPRIO_CLASS +#define ioprio_value_is_class_rt (prio) (false) +#endif #ifndef FIO_HAVE_IOPRIO +#define ioprio_value (prioclass, prio) (0)#define ioprio_set (which, who, prioclass, prio) (0)#endif
server.h +2 -1
@@ -48,7 +48,7 @@ struct fio_net_cmd_reply { };enum { -FIO_SERVER_VER =92 , +FIO_SERVER_VER =93 ,FIO_SERVER_MAX_FRAGMENT_PDU =1024 ,FIO_SERVER_MAX_CMD_MB =2048 ,
@@ -193,6 +193,7 @@ struct cmd_iolog_pdu {uint32_t log_type;uint32_t compressed;uint32_t log_offset; +uint32_t log_prio;uint32_t log_hist_coarseness;uint8_t name[FIO_NET_NAME_MAX ];struct io_sample samples[0 ];
stat.c +39 -36
229 lines not on this page · raw message
stat.h +4 -5
@@ -341,13 +341,12 @@ extern void update_rusage_stat(struct thread_data *);extern void clear_rusage_stat (struct thread_data *);extern void add_lat_sample (struct thread_data *,enum fio_ddir ,unsigned long long , -unsigned long long ,uint64_t ,uint8_t ); +unsigned long long ,uint64_t ,unsigned int ,bool );extern void add_clat_sample (struct thread_data *,enum fio_ddir ,unsigned long long , -unsigned long long ,uint64_t ,uint8_t ); +unsigned long long ,uint64_t ,unsigned int ,bool );extern void add_slat_sample (struct thread_data *,enum fio_ddir ,unsigned long long , -unsigned long long ,uint64_t ,uint8_t ); -extern void add_agg_sample (union io_sample_data ,enum fio_ddir ,unsigned long long bs, -uint8_t priority_bit); +unsigned long long ,uint64_t ,unsigned int ); +extern void add_agg_sample (union io_sample_data ,enum fio_ddir ,unsigned long long );extern void add_iops_sample (struct thread_data *,struct io_u *,unsigned int ); extern void add_bw_sample(struct thread_data *, struct io_u *,
thread_options.h +19 -0
@@ -44,6 +44,12 @@ enum dedupe_mode {#define BSSPLIT_MAX 64#define ZONESPLIT_MAX 256 +struct split { +unsigned int nr; +unsigned long long val1[ZONESPLIT_MAX ]; +unsigned long long val2[ZONESPLIT_MAX ]; +}; +struct bssplit {uint64_t bs;uint32_t perc;
@@ -368,6 +374,8 @@ struct thread_options {unsigned int ignore_zone_limits;fio_fp64_t zrt;fio_fp64_t zrf; + +unsigned int log_prio; };#define FIO_TOP_STR_MAX 256
@@ -671,6 +679,8 @@ struct thread_options_pack {uint32_t zone_mode;int32_t max_open_zones;uint32_t ignore_zone_limits; + +uint32_t log_prio; } __attribute__((packed));extern void convert_thread_options_to_cpu (struct thread_options *o,struct thread_options_pack *top);
@@ -678,4 +688,13 @@ extern void convert_thread_options_to_net(struct thread_options_pack *top, strucextern int fio_test_cconv (struct thread_options *);extern void options_default_fill (struct thread_options *o); +typedef int (split_parse_fn )(struct thread_options *,void *, +enum fio_ddir ,char *,bool ); + +extern int str_split_parse (struct thread_data *td,char *str, +split_parse_fn *fn,void *eo,bool data); + +extern int split_parse_ddir (struct thread_options *o,struct split *split, +char *str,bool absolute,unsigned int max_splits); +#endif
tools/fiograph/fiograph.conf +2 -2
@@ -51,10 +51,10 @@ specific_options=https http_host http_user http_pass http_s3_key http_s3_ke specific_options=ime_psync ime_psyncv [ioengine_io_uring] -specific_options=hipri cmdprio_percentage cmdprio_percentage fixedbufs registerfiles sqthread_poll sqthread_poll_cpu nonvectored uncached nowait force_async +specific_options=hipri cmdprio_percentage cmdprio_class cmdprio cmdprio_bssplit fixedbufs registerfiles sqthread_poll sqthread_poll_cpu nonvectored uncached nowait force_async [ioengine_libaio] -specific_options=userspace_reap cmdprio_percentage cmdprio_percentage nowait +specific_options=userspace_reap cmdprio_percentage cmdprio_class cmdprio cmdprio_bssplit nowait [ioengine_libcufile] specific_options=gpu_dev_ids cuda_io
tools/fiograph/fiograph.py +3 -1
@@ -292,9 +292,11 @@ def setup_commandline(): def main(): global config_file args = setup_commandline() - output_file = args.file if args.output is None: + output_file = args.file output_file = output_file.replace('.fio', '') + else: + output_file = args.output config_file = configparser.RawConfigParser(allow_no_value=True) config_file.read(args.config) fio_to_graphviz(args.file, args.format).render(output_file, view=args.view)