Recent changes (master)
The following changes since commit 6112c0f5a86c6b437e7158ab40a6e9384ce95e85:
doc: build manpage from fio_doc.rst instead of fio_man.rst (2022-09-27 11:58:25 -0400)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to c16dc793a3c45780f67ce65244b6e91323dee014:
Add randtrimwrite data direction (2022-09-28 10:06:40 -0600)
----------------------------------------------------------------
Jens Axboe (2):
t/io_uring: get rid of useless read barriers Add randtrimwrite data direction
HOWTO.rst | 3 +++ fio.1 | 5 +++++ io_ddir.h | 4 +++- options.c | 4 ++++ t/io_uring.c | 10 ++++++---- 5 files changed, 21 insertions(+), 5 deletions(-)
---
Diff of recent changes:
HOWTO.rst +3 -0
@@ -1134,6 +1134,9 @@ I/O type write 64K bytes on the same trimmed blocks. This behaviour will be consistent with ``number_ios`` or other Fio options limiting the total bytes or number of I/O's. + **randtrimwrite** + Like trimwrite, but uses random offsets rather + than sequential writes. Fio defaults to read if the option is not specified. For the mixed I/O types, the default is to split them 50/50. For certain types of I/O the
fio.1 +5 -0
@@ -904,6 +904,11 @@ then the same blocks will be written to. So if `io_size=64K' is specified, Fio will trim a total of 64K bytes and also write 64K bytes on the same trimmed blocks. This behaviour will be consistent with `number_ios' or other Fio options limiting the total bytes or number of I/O's. +.TP +.B randtrimwrite +Like +.B trimwrite , +but uses random offsets rather than sequential writes. .RE .P Fio defaults to read if the option is not specified. For the mixed I/O
io_ddir.h +3 -1
@@ -41,6 +41,7 @@ enum td_ddir {TD_DDIR_RANDRW =TD_DDIR_RW |TD_DDIR_RAND ,TD_DDIR_RANDTRIM =TD_DDIR_TRIM |TD_DDIR_RAND ,TD_DDIR_TRIMWRITE =TD_DDIR_TRIM |TD_DDIR_WRITE , + TD_DDIR_RANDTRIMWRITE = TD_DDIR_RANDTRIM | TD_DDIR_WRITE, };#define td_read (td) ((td)->o.td_ddir & TD_DDIR_READ)
@@ -67,7 +68,8 @@ static inline const char *ddir_str(enum td_ddir ddir) {static const char *__str[] = {NULL ,"read" ,"write" ,"rw" ,"rand" ,"randread" ,"randwrite" ,"randrw" , -"trim" ,NULL ,"trimwrite" ,NULL ,"randtrim" }; +"trim" ,NULL ,"trimwrite" ,NULL ,"randtrim" , +NULL ,"randtrimwrite" };return __str[ddir]; }
options.c +4 -0
@@ -1947,6 +1947,10 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { .oval = TD_DDIR_TRIMWRITE, .help = "Trim and write mix, trims preceding writes" }, + { .ival = "randtrimwrite", + .oval = TD_DDIR_RANDTRIMWRITE, + .help ="Randomly trim and write mix, trims preceding writes" + }, }, }, {
t/io_uring.c +6 -4
@@ -661,8 +661,12 @@ static void init_io_pt(struct submitter *s, unsigned index)static int prep_more_ios_uring (struct submitter *s,int max_ios) {struct io_sq_ring *ring = &s->sq_ring; -unsigned index, tail, next_tail, prepped =0 ; -unsigned int head =atomic_load_acquire (ring->head); +unsigned head, index, tail, next_tail, prepped =0 ; + +if (sq_thread_poll) + head =atomic_load_acquire (ring->head); +else + head = *ring->head; next_tail = tail = *ring->tail; do {
@@ -741,7 +745,6 @@ static int reap_events_uring(struct submitter *s) do { struct file *f; - read_barrier(); if (head == atomic_load_acquire(ring->tail)) break; cqe = &ring->cqes[head & cq_ring_mask];
@@ -796,7 +799,6 @@ static int reap_events_uring_pt(struct submitter *s) do { struct file *f; - read_barrier(); if (head == atomic_load_acquire(ring->tail)) break; index = head & cq_ring_mask;