X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=9718dc56cb0d42871be7c3cc1a52b4b73ff0af27;hp=994f2a19567f5818a4223d4690cc8b025f13569f;hb=2084d7b2369254e2026315caea702089198b754b;hpb=7de870993035f855e1d1299a2b5c2c90b792c238 diff --git a/options.c b/options.c index 994f2a19..9718dc56 100644 --- a/options.c +++ b/options.c @@ -3,7 +3,6 @@ #include #include #include -#include #include #include #include @@ -16,6 +15,8 @@ #include "lib/fls.h" #include "options.h" +#include "crc/crc32c.h" + /* * Check if mmap/mmaphuge has a :/foo/bar/file at the end. If so, return that. */ @@ -201,9 +202,9 @@ static int str_rw_cb(void *data, const char *str) struct thread_data *td = data; char *nr = get_opt_postfix(str); - td->o.ddir_nr = 1; + td->o.ddir_seq_nr = 1; if (nr) { - td->o.ddir_nr = atoi(nr); + td->o.ddir_seq_nr = atoi(nr); free(nr); } @@ -225,6 +226,21 @@ static int str_mem_cb(void *data, const char *mem) return 0; } +static int str_verify_cb(void *data, const char *mem) +{ + struct thread_data *td = data; + + if (td->o.verify != VERIFY_CRC32C_INTEL) + return 0; + + if (!crc32c_intel_works()) { + log_info("fio: System does not support hw accelerated crc32c. Falling back to sw crc32c.\n"); + td->o.verify = VERIFY_CRC32C; + } + + return 0; +} + static int fio_clock_source_cb(void *data, const char *str) { struct thread_data *td = data; @@ -234,13 +250,13 @@ static int fio_clock_source_cb(void *data, const char *str) return 0; } -static int str_lockmem_cb(void fio_unused *data, unsigned long *val) +static int str_lockmem_cb(void fio_unused *data, unsigned long long *val) { mlock_size = *val; return 0; } -static int str_rwmix_read_cb(void *data, unsigned int *val) +static int str_rwmix_read_cb(void *data, unsigned long long *val) { struct thread_data *td = data; @@ -249,7 +265,7 @@ static int str_rwmix_read_cb(void *data, unsigned int *val) return 0; } -static int str_rwmix_write_cb(void *data, unsigned int *val) +static int str_rwmix_write_cb(void *data, unsigned long long *val) { struct thread_data *td = data; @@ -259,7 +275,7 @@ static int str_rwmix_write_cb(void *data, unsigned int *val) } #ifdef FIO_HAVE_IOPRIO -static int str_prioclass_cb(void *data, unsigned int *val) +static int str_prioclass_cb(void *data, unsigned long long *val) { struct thread_data *td = data; unsigned short mask; @@ -275,7 +291,7 @@ static int str_prioclass_cb(void *data, unsigned int *val) return 0; } -static int str_prio_cb(void *data, unsigned int *val) +static int str_prio_cb(void *data, unsigned long long *val) { struct thread_data *td = data; @@ -299,7 +315,7 @@ static int str_exitall_cb(void) } #ifdef FIO_HAVE_CPU_AFFINITY -static int str_cpumask_cb(void *data, unsigned int *val) +static int str_cpumask_cb(void *data, unsigned long long *val) { struct thread_data *td = data; unsigned int i; @@ -597,7 +613,7 @@ static int str_opendir_cb(void *data, const char fio_unused *str) return add_dir_files(td, td->o.opendir); } -static int str_verify_offset_cb(void *data, unsigned int *off) +static int str_verify_offset_cb(void *data, unsigned long long *off) { struct thread_data *td = data; @@ -693,6 +709,7 @@ static int str_gtod_reduce_cb(void *data, int *il) struct thread_data *td = data; int val = *il; + td->o.disable_lat = !!val; td->o.disable_clat = !!val; td->o.disable_slat = !!val; td->o.disable_bw = !!val; @@ -702,7 +719,7 @@ static int str_gtod_reduce_cb(void *data, int *il) return 0; } -static int str_gtod_cpu_cb(void *data, int *il) +static int str_gtod_cpu_cb(void *data, long long *il) { struct thread_data *td = data; int val = *il; @@ -863,6 +880,24 @@ static struct fio_option options[FIO_MAX_OPTS] = { }, }, }, + { + .name = "rw_sequencer", + .type = FIO_OPT_STR, + .off1 = td_var_offset(rw_seq), + .help = "IO offset generator modifier", + .def = "sequential", + .posval = { + { .ival = "sequential", + .oval = RW_SEQ_SEQ, + .help = "Generate sequential offsets", + }, + { .ival = "identical", + .oval = RW_SEQ_IDENT, + .help = "Generate identical offsets", + }, + }, + }, + { .name = "ioengine", .type = FIO_OPT_STR_STORE, @@ -1200,7 +1235,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { }, { .name = "startdelay", - .type = FIO_OPT_INT, + .type = FIO_OPT_STR_VAL_TIME, .off1 = td_var_offset(start_delay), .help = "Only start job when this period has passed", .def = "0", @@ -1298,6 +1333,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .type = FIO_OPT_STR, .off1 = td_var_offset(verify), .help = "Verify data written", + .cb = str_verify_cb, .def = "0", .posval = { { .ival = "0", @@ -1410,6 +1446,20 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Number of async verifier threads to use", .parent = "verify", }, + { + .name = "verify_backlog", + .type = FIO_OPT_STR_VAL, + .off1 = td_var_offset(verify_backlog), + .help = "Verify after this number of blocks are written", + .parent = "verify", + }, + { + .name = "verify_backlog_batch", + .type = FIO_OPT_INT, + .off1 = td_var_offset(verify_batch), + .help = "Verify this number of IO blocks", + .parent = "verify_backlog", + }, #ifdef FIO_HAVE_CPU_AFFINITY { .name = "verify_async_cpus", @@ -1431,6 +1481,14 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(read_iolog_file), .help = "Playback IO pattern from file", }, + { + .name = "replay_no_stall", + .type = FIO_OPT_INT, + .off1 = td_var_offset(no_stall), + .def = "0", + .parent = "read_iolog", + .help = "Playback IO pattern file as fast as possible without stalls", + }, { .name = "exec_prerun", .type = FIO_OPT_STR_STORE, @@ -1759,6 +1817,14 @@ static struct fio_option options[FIO_MAX_OPTS] = { .cb = str_gtod_reduce_cb, .def = "0", }, + { + .name = "disable_lat", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(disable_lat), + .help = "Disable latency numbers", + .parent = "gtod_reduce", + .def = "0", + }, { .name = "disable_clat", .type = FIO_OPT_BOOL, @@ -1841,9 +1907,10 @@ static struct fio_option options[FIO_MAX_OPTS] = { }, }; -static void add_to_lopt(struct option *lopt, struct fio_option *o) +static void add_to_lopt(struct option *lopt, struct fio_option *o, + const char *name) { - lopt->name = (char *) o->name; + lopt->name = (char *) name; lopt->val = FIO_GETOPT_JOB; if (o->type == FIO_OPT_STR_SET) lopt->has_arg = no_argument; @@ -1864,7 +1931,11 @@ void fio_options_dup_and_init(struct option *long_options) o = &options[0]; while (o->name) { - add_to_lopt(&long_options[i], o); + add_to_lopt(&long_options[i], o, o->name); + if (o->alias) { + i++; + add_to_lopt(&long_options[i], o, o->alias); + } i++; o++;