Recent changes (master)
The following changes since commit a6e474c9e896e4ba1eb40066a03402afb040710a:
Fio 3.39 (2025-02-18 08:36:57 -0700)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 43c67b9f3a8808274bc1e0a3b7b70c56bb8a007f:
Re-introduce RWF_DONTCACHE (2025-02-20 13:07:41 -0700)
----------------------------------------------------------------
Dan Dedrick (1):
t/read-to-pipe-async: fix -DNDEBUG support
Jens Axboe (2):
Merge branch 'fix-DNDEBUG' of https://github.com/dandedrick/fio
Re-introduce RWF_DONTCACHE
Makefile | 2 +- engines/io_uring.c | 11 ++++++++++- engines/sync.c | 9 ++++++++- os/os-linux.h | 4 ++++ t/read-to-pipe-async.c | 1 + tools/fiograph/fiograph.conf | 4 ++-- 6 files changed, 26 insertions(+), 5 deletions(-)
---
Diff of recent changes:
Makefile +1 -1
@@ -365,7 +365,7 @@ T_DEDUPE_PROGS = t/fio-dedupe T_VS_OBJS = t/verify-state.o t/log.o crc/crc32c.o crc/crc32c-intel.o crc/crc32c-arm64.o t/debug.o T_VS_PROGS = t/fio-verify-state -T_PIPE_ASYNC_OBJS = t/read-to-pipe-async.o +T_PIPE_ASYNC_OBJS = t/read-to-pipe-async.o t/log.o T_PIPE_ASYNC_PROGS = t/read-to-pipe-async T_IOU_RING_OBJS = t/io_uring.o lib/rand.o lib/pattern.o lib/strntol.o
engines/io_uring.c +10 -1
@@ -114,6 +114,7 @@ struct ioring_options {unsigned int sqpoll_set;unsigned int sqpoll_cpu;unsigned int nonvectored; +unsigned int uncached;unsigned int nowait;unsigned int force_async;unsigned int md_per_io_size;
@@ -271,7 +272,11 @@ static struct fio_option options[] = { { .name = "uncached", .lname = "Uncached", - .type = FIO_OPT_SOFT_DEPRECATED, + .type = FIO_OPT_INT, + .off1 = offsetof(struct ioring_options, uncached), + .help = "Use RWF_DONTCACHE for buffered read/writes", + .category = FIO_OPT_C_ENGINE, + .group = FIO_OPT_G_IOURING, }, { .name = "nowait",
@@ -432,6 +437,8 @@ static int fio_ioring_prep(struct thread_data *td, struct io_u *io_u) } } sqe->rw_flags =0 ; +if (!td->o.odirect && o->uncached) + sqe->rw_flags |=RWF_DONTCACHE ;if (o->nowait) sqe->rw_flags |=RWF_NOWAIT ;if (td->o.oatomic && io_u->ddir ==DDIR_WRITE )
@@ -513,6 +520,8 @@ static int fio_ioring_cmd_prep(struct thread_data *td, struct io_u *io_u) sqe->fd = f->fd; } sqe->rw_flags =0 ; +if (!td->o.odirect && o->uncached) + sqe->rw_flags |=RWF_DONTCACHE ;if (o->nowait) sqe->rw_flags |=RWF_NOWAIT ;
engines/sync.c +8 -1
@@ -39,6 +39,7 @@ struct psyncv2_options {void *pad;unsigned int hipri;unsigned int hipri_percentage; +unsigned int uncached;unsigned int nowait; };
@@ -67,7 +68,11 @@ static struct fio_option options[] = { { .name = "uncached", .lname = "Uncached", - .type = FIO_OPT_SOFT_DEPRECATED, + .type = FIO_OPT_INT, + .off1 = offsetof(struct psyncv2_options, uncached), + .help = "Use RWF_DONTCACHE for buffered read/writes", + .category = FIO_OPT_C_ENGINE, + .group = FIO_OPT_G_INVALID, }, { .name = "nowait",
@@ -167,6 +172,8 @@ static enum fio_q_status fio_pvsyncio2_queue(struct thread_data *td,if (o->hipri && (rand_between (&sd->rand_state,1 ,100 ) <= o->hipri_percentage)) flags |=RWF_HIPRI ; +if (!td->o.odirect && o->uncached) + flags |=RWF_DONTCACHE ;if (o->nowait) flags |=RWF_NOWAIT ;
os/os-linux.h +4 -0
@@ -333,6 +333,10 @@ static inline int fio_set_sched_idle(void)#define RWF_ATOMIC 0x00000040#endif +#ifndef RWF_DONTCACHE +#define RWF_DONTCACHE 0x00000080 +#endif +#ifndef RWF_WRITE_LIFE_SHIFT #define RWF_WRITE_LIFE_SHIFT 4#define RWF_WRITE_LIFE_SHORT (1 << RWF_WRITE_LIFE_SHIFT)
t/read-to-pipe-async.c +1 -0
@@ -35,6 +35,7 @@#include <assert.h> #include "../flist.h" +#include "../log.h" #include "compiler/compiler.h"
tools/fiograph/fiograph.conf +2 -2
@@ -51,7 +51,7 @@ 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_class cmdprio cmdprio_bssplit fixedbufs registerfiles sqthread_poll sqthread_poll_cpu nonvectored nowait force_async atomic +specific_options=hipri cmdprio_percentage cmdprio_class cmdprio cmdprio_bssplit fixedbufs registerfiles sqthread_poll sqthread_poll_cpu nonvectored nowait force_async atomic uncached [ioengine_io_uring_cmd] specific_options=hipri cmdprio_percentage cmdprio_class cmdprio cmdprio_bssplit fixedbufs registerfiles sqthread_poll sqthread_poll_cpu nonvectored nowait force_async cmd_type md_per_io_size pi_act pi_chk apptag apptag_mask
@@ -99,7 +99,7 @@ specific_options=hostname bindname port verb specific_options=hipri readfua writefua sg_write_mode stream_id [ioengine_pvsync2] -specific_options=hipri hipri_percentage nowait sync psync vsync pvsync atomic +specific_options=hipri hipri_percentage nowait sync psync vsync pvsync atomic uncached [ioengine_xnvme] specific_options=hipri sqthread_poll xnvme_be xnvme_async xnvme_sync xnvme_admin xnvme_dev_nsid xnvme_iovec