Recent changes (master)
The following changes since commit 8324e5d5ffbe87080eebec1cd0c3c8a0751257de:
Merge branch 'patch-1' of https://github.com/felixonmars/fio (2020-03-03 08:11:08 -0700)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to f75248a9d9554b668484b089713e7c2b0a154ad6:
Fio 3.19 (2020-03-12 11:12:50 -0600)
----------------------------------------------------------------
Jens Axboe (1):
Fio 3.19
Xiaoguang Wang (1):
engines/io_uring: delete fio_option_is_set() calls when submitting sqes
FIO-VERSION-GEN | 2 +- engines/io_uring.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-)
---
Diff of recent changes:
FIO-VERSION-GEN +1 -1
@@ -1,7 +1,7 @@ #!/bin/sh GVF=FIO-VERSION-FILE -DEF_VER=fio-3.18 +DEF_VER=fio-3.19 LF=' '
engines/io_uring.c +10 -2
@@ -63,6 +63,8 @@ struct ioring_data {int queued;int cq_ring_off;unsigned iodepth; +bool ioprio_class_set; +bool ioprio_set;struct ioring_mmap mmap[3 ]; };
@@ -233,9 +235,9 @@ static int fio_ioring_prep(struct thread_data *td, struct io_u *io_u) }if (!td->o.odirect && o->uncached) sqe->rw_flags =RWF_UNCACHED ; -if (fio_option_is_set (&td->o, ioprio_class)) +if (ld->ioprio_class_set) sqe->ioprio = td->o.ioprio_class <<13 ; -if (fio_option_is_set (&td->o, ioprio)) +if (ld->ioprio_set) sqe->ioprio |= td->o.ioprio; sqe->off = io_u->offset; }else if (ddir_sync (io_u->ddir)) {
@@ -685,6 +687,12 @@ static int fio_ioring_init(struct thread_data *td)td_verror (td,EINVAL ,"fio_io_uring_init" );return 1 ; } + +if (fio_option_is_set (&td->o, ioprio_class)) + ld->ioprio_class_set = true; +if (fio_option_is_set (&td->o, ioprio)) + ld->ioprio_set = true; +return 0 ; }