Recent changes (master)
The following changes since commit c16dc793a3c45780f67ce65244b6e91323dee014:
Add randtrimwrite data direction (2022-09-28 10:06:40 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 793b868671d14f9a3e4fa76ac129545987084a8d:
randtrimwrite: fix corner case with variable block sizes (2022-10-03 17:36:57 -0400)
----------------------------------------------------------------
Anuj Gupta (1):
engines/io_uring: add fixedbufs support for io_uring_cmd
Vincent Fu (4):
randtrimwrite: write at same offset as trim
test: test job for randtrimwrite
randtrimwrite: fix offsets for corner case
randtrimwrite: fix corner case with variable block sizes
engines/io_uring.c | 4 +++ io_ddir.h | 2 ++ io_u.c | 34 +++++++++++++++++++++++-- t/jobs/t0023.fio | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ t/run-fio-tests.py | 64 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 177 insertions(+), 2 deletions(-) create mode 100644 t/jobs/t0023.fio
---
Diff of recent changes:
engines/io_uring.c +4 -0
@@ -433,6 +433,10 @@ static int fio_ioring_cmd_prep(struct thread_data *td, struct io_u *io_u) ld->prepped =0 ; sqe->flags |=IOSQE_ASYNC ; } +if (o->fixedbufs) { + sqe->uring_cmd_flags =IORING_URING_CMD_FIXED ; + sqe->buf_index = io_u->index; + } cmd = (struct nvme_uring_cmd *)sqe->cmd; return fio_nvme_uring_cmd_prep(cmd, io_u,
io_ddir.h +2 -0
@@ -52,6 +52,8 @@ enum td_ddir {#define file_randommap (td, f) (!(td)->o.norandommap && fio_file_axmap((f)))#define td_trimwrite (td) (((td)->o.td_ddir & TD_DDIR_TRIMWRITE) \ == TD_DDIR_TRIMWRITE) +#define td_randtrimwrite (td) (((td)->o.td_ddir & TD_DDIR_RANDTRIMWRITE) \ + == TD_DDIR_RANDTRIMWRITE)static inline int ddir_sync (enum fio_ddir ddir) {
io_u.c +32 -2
@@ -417,7 +417,13 @@ static int get_next_block(struct thread_data *td, struct io_u *io_u, b = offset =-1ULL ; -if (rw_seq) { +if (td_randtrimwrite (td) && ddir ==DDIR_WRITE ) { +/* don't mark randommap for these writes */ +io_u_set (td, io_u,IO_U_F_BUSY_OK ); + offset = f->last_start[DDIR_TRIM ]; + *is_random = true; + ret =0 ; + }else if (rw_seq) {if (td_random (td)) {if (should_do_random (td, ddir)) { ret =get_next_rand_block (td, f, ddir, &b);
@@ -507,6 +513,24 @@ static int get_next_offset(struct thread_data *td, struct io_u *io_u,return 1 ; } +/* +* For randtrimwrite, we decide whether to issue a trim or a write +* based on whether the offsets for the most recent trim and write +* operations match. If they don't match that means we just issued a +* new trim and the next operation should be a write. If they *do* +* match that means we just completed a trim+write pair and the next +* command should be a trim. +* +* This works fine for sequential workloads but for random workloads +* it's possible to complete a trim+write pair and then have the next +* randomly generated offset match the previous offset. If that happens +* we need to alter the offset for the last write operation in order +* to ensure that we issue a write operation the next time through. +*/ +if (td_randtrimwrite (td) && ddir ==DDIR_TRIM && + f->last_start[DDIR_TRIM ] == io_u->offset) + f->last_start[DDIR_WRITE ]--; + io_u->verify_offset = io_u->offset;return 0 ; }
@@ -530,6 +554,12 @@ static unsigned long long get_next_buflen(struct thread_data *td, struct io_u *iassert (ddir_rw (ddir)); +if (td_randtrimwrite (td) && ddir ==DDIR_WRITE ) { +struct fio_file *f = io_u->file; + +return f->last_pos[DDIR_TRIM ] - f->last_start[DDIR_TRIM ]; + } +if (td->o.bs_is_seq_rand) ddir = is_random ?DDIR_WRITE :DDIR_READ ;
@@ -768,7 +798,7 @@ static void set_rw_ddir(struct thread_data *td, struct io_u *io_u)if (td_trimwrite (td)) {struct fio_file *f = io_u->file; -if (f->last_pos[DDIR_WRITE ] == f->last_pos[DDIR_TRIM ]) +if (f->last_start[DDIR_WRITE ] == f->last_start[DDIR_TRIM ]) ddir =DDIR_TRIM ;else ddir =DDIR_WRITE ;
t/jobs/t0023.fio new file +75 -0
75 lines not on this page · raw message
t/run-fio-tests.py +64 -0
76 lines not on this page · raw message