X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fsync.c;h=339ba9997010ac4290ac9a5699ba26f7d4926710;hb=b5f3adf9e1e40c7bdb76a9e433aa580f7eead740;hp=260ef664dd60d4f7b1aa9d21ccacc5794601398d;hpb=526c403dc9b892ae1dda6ebb2a0f2d5883795d17;p=fio.git diff --git a/engines/sync.c b/engines/sync.c index 260ef664..339ba999 100644 --- a/engines/sync.c +++ b/engines/sync.c @@ -10,15 +10,15 @@ #include #include #include -#include #include "../fio.h" #include "../optgroup.h" +#include "../lib/rand.h" /* * Sync engine uses engine_data to store last offset */ -#define LAST_POS(f) ((f)->engine_data) +#define LAST_POS(f) ((f)->engine_pos) struct syncio_data { struct iovec *iovecs; @@ -30,12 +30,17 @@ struct syncio_data { unsigned long long last_offset; struct fio_file *last_file; enum fio_ddir last_ddir; + + struct frand_state rand_state; }; -#ifdef CONFIG_PWRITEV2 +#ifdef FIO_HAVE_PWRITEV2 struct psyncv2_options { void *pad; unsigned int hipri; + unsigned int hipri_percentage; + unsigned int uncached; + unsigned int nowait; }; static struct fio_option options[] = { @@ -48,6 +53,36 @@ static struct fio_option options[] = { .category = FIO_OPT_C_ENGINE, .group = FIO_OPT_G_INVALID, }, + { + .name = "hipri_percentage", + .lname = "RWF_HIPRI_PERCENTAGE", + .type = FIO_OPT_INT, + .off1 = offsetof(struct psyncv2_options, hipri_percentage), + .minval = 0, + .maxval = 100, + .def = "100", + .help = "Probabilistically set RWF_HIPRI for pwritev2/preadv2", + .category = FIO_OPT_C_ENGINE, + .group = FIO_OPT_G_INVALID, + }, + { + .name = "uncached", + .lname = "Uncached", + .type = FIO_OPT_INT, + .off1 = offsetof(struct psyncv2_options, uncached), + .help = "Use RWF_UNCACHED for buffered read/writes", + .category = FIO_OPT_C_ENGINE, + .group = FIO_OPT_G_INVALID, + }, + { + .name = "nowait", + .lname = "RWF_NOWAIT", + .type = FIO_OPT_BOOL, + .off1 = offsetof(struct psyncv2_options, nowait), + .help = "Set RWF_NOWAIT for pwritev2/preadv2", + .category = FIO_OPT_C_ENGINE, + .group = FIO_OPT_G_INVALID, + }, { .name = NULL, }, @@ -95,9 +130,10 @@ static int fio_io_end(struct thread_data *td, struct io_u *io_u, int ret) } #ifdef CONFIG_PWRITEV -static int fio_pvsyncio_queue(struct thread_data *td, struct io_u *io_u) +static enum fio_q_status fio_pvsyncio_queue(struct thread_data *td, + struct io_u *io_u) { - struct syncio_data *sd = td->io_ops->data; + struct syncio_data *sd = td->io_ops_data; struct iovec *iov = &sd->iovecs[0]; struct fio_file *f = io_u->file; int ret; @@ -121,10 +157,11 @@ static int fio_pvsyncio_queue(struct thread_data *td, struct io_u *io_u) } #endif -#ifdef CONFIG_PWRITEV2 -static int fio_pvsyncio2_queue(struct thread_data *td, struct io_u *io_u) +#ifdef FIO_HAVE_PWRITEV2 +static enum fio_q_status fio_pvsyncio2_queue(struct thread_data *td, + struct io_u *io_u) { - struct syncio_data *sd = td->io_ops->data; + struct syncio_data *sd = td->io_ops_data; struct psyncv2_options *o = td->eo; struct iovec *iov = &sd->iovecs[0]; struct fio_file *f = io_u->file; @@ -132,8 +169,13 @@ static int fio_pvsyncio2_queue(struct thread_data *td, struct io_u *io_u) fio_ro_check(td, io_u); - if (o->hipri) + if (o->hipri && + (rand_between(&sd->rand_state, 1, 100) <= o->hipri_percentage)) flags |= RWF_HIPRI; + if (!td->o.odirect && o->uncached) + flags |= RWF_UNCACHED; + if (o->nowait) + flags |= RWF_NOWAIT; iov->iov_base = io_u->xfer_buf; iov->iov_len = io_u->xfer_buflen; @@ -152,8 +194,8 @@ static int fio_pvsyncio2_queue(struct thread_data *td, struct io_u *io_u) } #endif - -static int fio_psyncio_queue(struct thread_data *td, struct io_u *io_u) +static enum fio_q_status fio_psyncio_queue(struct thread_data *td, + struct io_u *io_u) { struct fio_file *f = io_u->file; int ret; @@ -173,7 +215,8 @@ static int fio_psyncio_queue(struct thread_data *td, struct io_u *io_u) return fio_io_end(td, io_u, ret); } -static int fio_syncio_queue(struct thread_data *td, struct io_u *io_u) +static enum fio_q_status fio_syncio_queue(struct thread_data *td, + struct io_u *io_u) { struct fio_file *f = io_u->file; int ret; @@ -197,7 +240,7 @@ static int fio_vsyncio_getevents(struct thread_data *td, unsigned int min, unsigned int max, const struct timespec fio_unused *t) { - struct syncio_data *sd = td->io_ops->data; + struct syncio_data *sd = td->io_ops_data; int ret; if (min) { @@ -212,14 +255,14 @@ static int fio_vsyncio_getevents(struct thread_data *td, unsigned int min, static struct io_u *fio_vsyncio_event(struct thread_data *td, int event) { - struct syncio_data *sd = td->io_ops->data; + struct syncio_data *sd = td->io_ops_data; return sd->io_us[event]; } static int fio_vsyncio_append(struct thread_data *td, struct io_u *io_u) { - struct syncio_data *sd = td->io_ops->data; + struct syncio_data *sd = td->io_ops_data; if (ddir_sync(io_u->ddir)) return 0; @@ -244,9 +287,10 @@ static void fio_vsyncio_set_iov(struct syncio_data *sd, struct io_u *io_u, sd->queued++; } -static int fio_vsyncio_queue(struct thread_data *td, struct io_u *io_u) +static enum fio_q_status fio_vsyncio_queue(struct thread_data *td, + struct io_u *io_u) { - struct syncio_data *sd = td->io_ops->data; + struct syncio_data *sd = td->io_ops_data; fio_ro_check(td, io_u); @@ -286,7 +330,7 @@ static int fio_vsyncio_queue(struct thread_data *td, struct io_u *io_u) */ static int fio_vsyncio_end(struct thread_data *td, ssize_t bytes) { - struct syncio_data *sd = td->io_ops->data; + struct syncio_data *sd = td->io_ops_data; struct io_u *io_u; unsigned int i; int err; @@ -326,7 +370,7 @@ static int fio_vsyncio_end(struct thread_data *td, ssize_t bytes) static int fio_vsyncio_commit(struct thread_data *td) { - struct syncio_data *sd = td->io_ops->data; + struct syncio_data *sd = td->io_ops_data; struct fio_file *f; ssize_t ret; @@ -363,14 +407,15 @@ static int fio_vsyncio_init(struct thread_data *td) sd->last_offset = -1ULL; sd->iovecs = malloc(td->o.iodepth * sizeof(struct iovec)); sd->io_us = malloc(td->o.iodepth * sizeof(struct io_u *)); + init_rand(&sd->rand_state, 0); - td->io_ops->data = sd; + td->io_ops_data = sd; return 0; } static void fio_vsyncio_cleanup(struct thread_data *td) { - struct syncio_data *sd = td->io_ops->data; + struct syncio_data *sd = td->io_ops_data; if (sd) { free(sd->iovecs); @@ -429,7 +474,7 @@ static struct ioengine_ops ioengine_pvrw = { }; #endif -#ifdef CONFIG_PWRITEV2 +#ifdef FIO_HAVE_PWRITEV2 static struct ioengine_ops ioengine_pvrw2 = { .name = "pvsync2", .version = FIO_IOOPS_VERSION, @@ -453,7 +498,7 @@ static void fio_init fio_syncio_register(void) #ifdef CONFIG_PWRITEV register_ioengine(&ioengine_pvrw); #endif -#ifdef CONFIG_PWRITEV2 +#ifdef FIO_HAVE_PWRITEV2 register_ioengine(&ioengine_pvrw2); #endif } @@ -466,7 +511,7 @@ static void fio_exit fio_syncio_unregister(void) #ifdef CONFIG_PWRITEV unregister_ioengine(&ioengine_pvrw); #endif -#ifdef CONFIG_PWRITEV2 +#ifdef FIO_HAVE_PWRITEV2 unregister_ioengine(&ioengine_pvrw2); #endif }