X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=6cd899753cc133c3c2fd83abbc7f36d9c939173e;hp=6dd74ed42732aff997a41ecdeee08d5e09cfac33;hb=c9c63318734feb94eae3013fa1b606d6da744655;hpb=85bc833bed3fa58c177df65f1d6cf40af85cb10b diff --git a/options.c b/options.c index 6dd74ed4..6cd89975 100644 --- a/options.c +++ b/options.c @@ -3,7 +3,6 @@ #include #include #include -#include #include #include #include @@ -161,7 +160,6 @@ static int bssplit_ddir(struct thread_data *td, int ddir, char *str) qsort(bssplit, td->o.bssplit_nr[ddir], sizeof(struct bssplit), bs_cmp); td->o.bssplit[ddir] = bssplit; return 0; - } static int str_bssplit_cb(void *data, const char *input) @@ -204,11 +202,26 @@ static int str_rw_cb(void *data, const char *str) char *nr = get_opt_postfix(str); td->o.ddir_seq_nr = 1; - if (nr) { + td->o.ddir_seq_add = 0; + + if (!nr) + return 0; + + if (td_random(td)) td->o.ddir_seq_nr = atoi(nr); - free(nr); + else { + long long val; + + if (str_to_decimal(nr, &val, 1, td)) { + log_err("fio: rw postfix parsing failed\n"); + free(nr); + return 1; + } + + td->o.ddir_seq_add = val; } + free(nr); return 0; } @@ -231,12 +244,9 @@ 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; + if (td->o.verify == VERIFY_CRC32C_INTEL || + td->o.verify == VERIFY_CRC32C) { + crc32c_intel_probe(); } return 0; @@ -330,7 +340,7 @@ static int str_cpumask_cb(void *data, unsigned long long *val) return 1; } - max_cpu = sysconf(_SC_NPROCESSORS_ONLN); + max_cpu = cpus_online(); for (i = 0; i < sizeof(int) * 8; i++) { if ((1 << i) & *val) { @@ -367,7 +377,7 @@ static int set_cpus_allowed(struct thread_data *td, os_cpu_mask_t *mask, strip_blank_front(&str); strip_blank_end(str); - max_cpu = sysconf(_SC_NPROCESSORS_ONLN); + max_cpu = cpus_online(); while ((cpu = strsep(&str, ",")) != NULL) { char *str2, *cpu2; @@ -441,6 +451,16 @@ static int str_verify_cpus_allowed_cb(void *data, const char *input) } #endif +#ifdef FIO_HAVE_TRIM +static int str_verify_trim_cb(void *data, unsigned long long *val) +{ + struct thread_data *td = data; + + td->o.trim_percentage = *val; + return 0; +} +#endif + static int str_fst_cb(void *data, const char *str) { struct thread_data *td = data; @@ -473,6 +493,7 @@ static int str_sfr_cb(void *data, const char *str) static int check_dir(struct thread_data *td, char *fname) { +#if 0 char file[PATH_MAX], *dir; int elen = 0; @@ -485,7 +506,6 @@ static int check_dir(struct thread_data *td, char *fname) sprintf(file + elen, "%s", fname); dir = dirname(file); -#if 0 { struct stat sb; /* @@ -665,7 +685,32 @@ static int str_verify_pattern_cb(void *data, const char *input) } } } + + /* + * Fill the pattern all the way to the end. This greatly reduces + * the number of memcpy's we have to do when verifying the IO. + */ + while (i > 1 && i * 2 <= MAX_PATTERN_SIZE) { + memcpy(&td->o.verify_pattern[i], &td->o.verify_pattern[0], i); + i *= 2; + } + if (i == 1) { + /* + * The code in verify_io_u_pattern assumes a single byte pattern + * fills the whole verify pattern buffer. + */ + memset(td->o.verify_pattern, td->o.verify_pattern[0], + MAX_PATTERN_SIZE); + } + td->o.verify_pattern_bytes = i; + + /* + * VERIFY_META could already be set + */ + if (td->o.verify == VERIFY_NONE) + td->o.verify = VERIFY_PATTERN; + return 0; } @@ -705,6 +750,17 @@ static int str_write_lat_log_cb(void *data, const char *str) return 0; } +static int str_write_iops_log_cb(void *data, const char *str) +{ + struct thread_data *td = data; + + if (str) + td->o.iops_log_file = strdup(str); + + td->o.write_iops_log = 1; + return 0; +} + static int str_gtod_reduce_cb(void *data, int *il) { struct thread_data *td = data; @@ -714,6 +770,7 @@ static int str_gtod_reduce_cb(void *data, int *il) td->o.disable_clat = !!val; td->o.disable_slat = !!val; td->o.disable_bw = !!val; + td->o.clat_percentiles = !val; if (val) td->tv_cache_mask = 63; @@ -730,6 +787,20 @@ static int str_gtod_cpu_cb(void *data, long long *il) return 0; } +static int str_size_cb(void *data, unsigned long long *__val) +{ + struct thread_data *td = data; + unsigned long long v = *__val; + + if (parse_is_percent(v)) { + td->o.size = 0; + td->o.size_percent = -1ULL - v; + } else + td->o.size = v; + + return 0; +} + static int rw_verify(struct fio_option *o, void *data) { struct thread_data *td = data; @@ -771,9 +842,6 @@ static int kb_base_verify(struct fio_option *o, void *data) return 0; } -#define __stringify_1(x) #x -#define __stringify(x) __stringify_1(x) - /* * Map of job/command line options */ @@ -783,12 +851,14 @@ static struct fio_option options[FIO_MAX_OPTS] = { .type = FIO_OPT_STR_STORE, .off1 = td_var_offset(description), .help = "Text job description", + .category = FIO_OPT_G_DESC, }, { .name = "name", .type = FIO_OPT_STR_STORE, .off1 = td_var_offset(name), .help = "Name of this job", + .category = FIO_OPT_G_DESC, }, { .name = "directory", @@ -796,6 +866,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(directory), .cb = str_directory_cb, .help = "Directory to store files in", + .category = FIO_OPT_G_FILE, }, { .name = "filename", @@ -804,6 +875,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .cb = str_filename_cb, .prio = -1, /* must come after "directory" */ .help = "File(s) to use for the workload", + .category = FIO_OPT_G_FILE, }, { .name = "kb_base", @@ -813,6 +885,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .prio = 1, .def = "1024", .help = "How many bytes per KB for reporting (1000 or 1024)", + .category = FIO_OPT_G_MISC, }, { .name = "lockfile", @@ -822,6 +895,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Lock file when doing IO to it", .parent = "filename", .def = "none", + .category = FIO_OPT_G_FILE, .posval = { { .ival = "none", .oval = FILE_LOCK_NONE, @@ -844,6 +918,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(opendir), .cb = str_opendir_cb, .help = "Recursively add files from this directory and down", + .category = FIO_OPT_G_FILE, }, { .name = "rw", @@ -854,6 +929,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "IO direction", .def = "read", .verify = rw_verify, + .category = FIO_OPT_G_IO_DDIR, .posval = { { .ival = "read", .oval = TD_DDIR_READ, @@ -887,6 +963,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(rw_seq), .help = "IO offset generator modifier", .def = "sequential", + .category = FIO_OPT_G_IO_DDIR, .posval = { { .ival = "sequential", .oval = RW_SEQ_SEQ, @@ -904,7 +981,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .type = FIO_OPT_STR_STORE, .off1 = td_var_offset(ioengine), .help = "IO engine to use", - .def = "sync", + .def = FIO_PREFERRED_ENGINE, + .category = FIO_OPT_G_IO, .posval = { { .ival = "sync", .help = "Use read/write", @@ -913,7 +991,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Use pread/pwrite", }, { .ival = "vsync", - .help = "Use readv/writev", + .help = "Use readv/writev", }, #ifdef FIO_HAVE_LIBAIO { .ival = "libaio", @@ -929,9 +1007,14 @@ static struct fio_option options[FIO_MAX_OPTS] = { { .ival = "solarisaio", .help = "Solaris native asynchronous IO", }, +#endif +#ifdef FIO_HAVE_WINDOWSAIO + { .ival = "windowsaio", + .help = "Windows native asynchronous IO" + }, #endif { .ival = "mmap", - .help = "Memory mapped IO", + .help = "Memory mapped IO" }, #ifdef FIO_HAVE_SPLICE { .ival = "splice", @@ -958,12 +1041,22 @@ static struct fio_option options[FIO_MAX_OPTS] = { }, #endif { .ival = "cpuio", - .help = "CPU cycler burner engine", + .help = "CPU cycle burner engine", }, #ifdef FIO_HAVE_GUASI { .ival = "guasi", .help = "GUASI IO engine", }, +#endif +#ifdef FIO_HAVE_BINJECT + { .ival = "binject", + .help = "binject direct inject block engine", + }, +#endif +#ifdef FIO_HAVE_RDMA + { .ival = "rdma", + .help = "RDMA IO engine", + }, #endif { .ival = "external", .help = "Load external engine (append name)", @@ -974,9 +1067,10 @@ static struct fio_option options[FIO_MAX_OPTS] = { .name = "iodepth", .type = FIO_OPT_INT, .off1 = td_var_offset(iodepth), - .help = "Amount of IO buffers to keep in flight", + .help = "Number of IO buffers to keep in flight", .minval = 1, .def = "1", + .category = FIO_OPT_G_IO, }, { .name = "iodepth_batch", @@ -987,6 +1081,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .parent = "iodepth", .minval = 1, .def = "1", + .category = FIO_OPT_G_IO, }, { .name = "iodepth_batch_complete", @@ -996,6 +1091,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .parent = "iodepth", .minval = 0, .def = "1", + .category = FIO_OPT_G_IO, }, { .name = "iodepth_low", @@ -1003,20 +1099,23 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(iodepth_low), .help = "Low water mark for queuing depth", .parent = "iodepth", + .category = FIO_OPT_G_IO, }, { .name = "size", .type = FIO_OPT_STR_VAL, - .off1 = td_var_offset(size), - .minval = 1, + .cb = str_size_cb, .help = "Total size of device or files", + .category = FIO_OPT_G_IO, }, { .name = "fill_device", + .alias = "fill_fs", .type = FIO_OPT_BOOL, .off1 = td_var_offset(fill_device), .help = "Write until an ENOSPC error occurs", .def = "0", + .category = FIO_OPT_G_IO, }, { .name = "filesize", @@ -1025,6 +1124,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off2 = td_var_offset(file_size_high), .minval = 1, .help = "Size of individual files", + .category = FIO_OPT_G_IO | FIO_OPT_G_FILE, }, { .name = "offset", @@ -1033,6 +1133,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(start_offset), .help = "Start IO from this offset", .def = "0", + .category = FIO_OPT_G_IO, }, { .name = "bs", @@ -1044,6 +1145,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Block size unit", .def = "4k", .parent = "rw", + .category = FIO_OPT_G_IO, }, { .name = "ba", @@ -1054,6 +1156,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .minval = 1, .help = "IO block offset alignment", .parent = "rw", + .category = FIO_OPT_G_IO | FIO_OPT_G_IO_BUF, }, { .name = "bsrange", @@ -1066,6 +1169,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .minval = 1, .help = "Set block size range (in more detail than bs)", .parent = "rw", + .category = FIO_OPT_G_IO, }, { .name = "bssplit", @@ -1073,6 +1177,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .cb = str_bssplit_cb, .help = "Set a specific mix of block sizes", .parent = "rw", + .category = FIO_OPT_G_IO, }, { .name = "bs_unaligned", @@ -1081,6 +1186,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(bs_unaligned), .help = "Don't sector align IO buffer sizes", .parent = "rw", + .category = FIO_OPT_G_IO, }, { .name = "randrepeat", @@ -1089,6 +1195,16 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Use repeatable random IO pattern", .def = "1", .parent = "rw", + .category = FIO_OPT_G_IO | FIO_OPT_G_RAND, + }, + { + .name = "use_os_rand", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(use_os_rand), + .help = "Set to use OS random generator", + .def = "0", + .parent = "rw", + .category = FIO_OPT_G_RAND, }, { .name = "norandommap", @@ -1096,6 +1212,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(norandommap), .help = "Accept potential duplicate random blocks", .parent = "rw", + .category = FIO_OPT_G_RAND, }, { .name = "softrandommap", @@ -1104,19 +1221,23 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Set norandommap if randommap allocation fails", .parent = "norandommap", .def = "0", + .category = FIO_OPT_G_RAND, }, { .name = "nrfiles", + .alias = "nr_files", .type = FIO_OPT_INT, .off1 = td_var_offset(nr_files), .help = "Split job workload between this number of files", .def = "1", + .category = FIO_OPT_G_FILE, }, { .name = "openfiles", .type = FIO_OPT_INT, .off1 = td_var_offset(open_files), .help = "Number of files to keep open at the same time", + .category = FIO_OPT_G_FILE, }, { .name = "file_service_type", @@ -1125,6 +1246,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(file_service_type), .help = "How to select which file to service next", .def = "roundrobin", + .category = FIO_OPT_G_FILE, .posval = { { .ival = "random", .oval = FIO_FSERVICE_RANDOM, @@ -1144,18 +1266,45 @@ static struct fio_option options[FIO_MAX_OPTS] = { #ifdef FIO_HAVE_FALLOCATE { .name = "fallocate", - .type = FIO_OPT_BOOL, - .off1 = td_var_offset(fallocate), - .help = "Use fallocate() when laying out files", - .def = "1", - }, + .type = FIO_OPT_STR, + .off1 = td_var_offset(fallocate_mode), + .help = "Whether pre-allocation is performed when laying out files", + .def = "posix", + .category = FIO_OPT_G_FILE, + .posval = { + { .ival = "none", + .oval = FIO_FALLOCATE_NONE, + .help = "Do not pre-allocate space", + }, + { .ival = "posix", + .oval = FIO_FALLOCATE_POSIX, + .help = "Use posix_fallocate()", + }, +#ifdef FIO_HAVE_LINUX_FALLOCATE + { .ival = "keep", + .oval = FIO_FALLOCATE_KEEP_SIZE, + .help = "Use fallocate(..., FALLOC_FL_KEEP_SIZE, ...)", + }, #endif + /* Compatibility with former boolean values */ + { .ival = "0", + .oval = FIO_FALLOCATE_NONE, + .help = "Alias for 'none'", + }, + { .ival = "1", + .oval = FIO_FALLOCATE_POSIX, + .help = "Alias for 'posix'", + }, + }, + }, +#endif /* FIO_HAVE_FALLOCATE */ { .name = "fadvise_hint", .type = FIO_OPT_BOOL, .off1 = td_var_offset(fadvise_hint), .help = "Use fadvise() to advise the kernel on IO pattern", .def = "1", + .category = FIO_OPT_G_FILE, }, { .name = "fsync", @@ -1163,6 +1312,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(fsync_blocks), .help = "Issue fsync for writes every given number of blocks", .def = "0", + .category = FIO_OPT_G_FILE, }, { .name = "fdatasync", @@ -1170,6 +1320,15 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(fdatasync_blocks), .help = "Issue fdatasync for writes every given number of blocks", .def = "0", + .category = FIO_OPT_G_FILE, + }, + { + .name = "write_barrier", + .type = FIO_OPT_INT, + .off1 = td_var_offset(barrier_blocks), + .help = "Make every Nth write a barrier write", + .def = "0", + .category = FIO_OPT_G_IO, }, #ifdef FIO_HAVE_SYNC_FILE_RANGE { @@ -1196,6 +1355,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .cb = str_sfr_cb, .off1 = td_var_offset(sync_file_range), .help = "Use sync_file_range()", + .category = FIO_OPT_G_FILE, }, #endif { @@ -1204,6 +1364,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(odirect), .help = "Use O_DIRECT IO (negates buffered)", .def = "0", + .category = FIO_OPT_G_IO, }, { .name = "buffered", @@ -1212,6 +1373,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .neg = 1, .help = "Use buffered IO (negates direct)", .def = "1", + .category = FIO_OPT_G_IO, }, { .name = "overwrite", @@ -1219,6 +1381,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(overwrite), .help = "When writing, set whether to overwrite current data", .def = "0", + .category = FIO_OPT_G_IO | FIO_OPT_G_FILE, }, { .name = "loops", @@ -1226,6 +1389,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(loops), .help = "Number of times to run the job", .def = "1", + .category = FIO_OPT_G_MISC, }, { .name = "numjobs", @@ -1233,6 +1397,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(numjobs), .help = "Duplicate this job this many times", .def = "1", + .category = FIO_OPT_G_MISC, }, { .name = "startdelay", @@ -1240,6 +1405,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(start_delay), .help = "Only start job when this period has passed", .def = "0", + .category = FIO_OPT_G_MISC, }, { .name = "runtime", @@ -1248,18 +1414,21 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(timeout), .help = "Stop workload when this amount of time has passed", .def = "0", + .category = FIO_OPT_G_MISC, }, { .name = "time_based", .type = FIO_OPT_STR_SET, .off1 = td_var_offset(time_based), .help = "Keep running until runtime/timeout is met", + .category = FIO_OPT_G_MISC, }, { .name = "ramp_time", .type = FIO_OPT_STR_VAL_TIME, .off1 = td_var_offset(ramp_time), .help = "Ramp up time before measuring performance", + .category = FIO_OPT_G_MISC, }, { .name = "clocksource", @@ -1267,6 +1436,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .cb = fio_clock_source_cb, .off1 = td_var_offset(clocksource), .help = "What type of timing source to use", + .category = FIO_OPT_G_OS, .posval = { { .ival = "gettimeofday", .oval = CS_GTOD, @@ -1292,6 +1462,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(mem_type), .help = "Backing type for IO buffers", .def = "malloc", + .category = FIO_OPT_G_IO_BUF | FIO_OPT_G_MEM, .posval = { { .ival = "malloc", .oval = MEM_MALLOC, @@ -1328,6 +1499,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "IO memory buffer offset alignment", .def = "0", .parent = "iomem", + .category = FIO_OPT_G_IO_BUF | FIO_OPT_G_MEM, }, { .name = "verify", @@ -1336,6 +1508,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Verify data written", .cb = str_verify_cb, .def = "0", + .category = FIO_OPT_G_IO | FIO_OPT_G_VERIFY, .posval = { { .ival = "0", .oval = VERIFY_NONE, @@ -1354,12 +1527,12 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Use crc32 checksums for verification", }, { .ival = "crc32c-intel", - .oval = VERIFY_CRC32C_INTEL, - .help = "Use hw crc32c checksums for verification", + .oval = VERIFY_CRC32C, + .help = "Use crc32c checksums for verification (hw assisted, if available)", }, { .ival = "crc32c", .oval = VERIFY_CRC32C, - .help = "Use crc32c checksums for verification", + .help = "Use crc32c checksums for verification (hw assisted, if available)", }, { .ival = "crc16", .oval = VERIFY_CRC16, @@ -1399,6 +1572,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Run verification stage after write", .def = "1", .parent = "verify", + .category = FIO_OPT_G_IO | FIO_OPT_G_VERIFY, }, { .name = "verifysort", @@ -1407,6 +1581,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Sort written verify blocks for read back", .def = "1", .parent = "verify", + .category = FIO_OPT_G_IO | FIO_OPT_G_VERIFY, }, { .name = "verify_interval", @@ -1415,6 +1590,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .minval = 2 * sizeof(struct verify_header), .help = "Store verify buffer header every N bytes", .parent = "verify", + .category = FIO_OPT_G_IO | FIO_OPT_G_VERIFY, }, { .name = "verify_offset", @@ -1423,6 +1599,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .def = "0", .cb = str_verify_offset_cb, .parent = "verify", + .category = FIO_OPT_G_IO | FIO_OPT_G_VERIFY, }, { .name = "verify_pattern", @@ -1430,6 +1607,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .cb = str_verify_pattern_cb, .help = "Fill pattern for IO buffers", .parent = "verify", + .category = FIO_OPT_G_IO | FIO_OPT_G_VERIFY, }, { .name = "verify_fatal", @@ -1438,6 +1616,16 @@ static struct fio_option options[FIO_MAX_OPTS] = { .def = "0", .help = "Exit on a single verify failure, don't continue", .parent = "verify", + .category = FIO_OPT_G_IO | FIO_OPT_G_VERIFY | FIO_OPT_G_ERR, + }, + { + .name = "verify_dump", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(verify_dump), + .def = "0", + .help = "Dump contents of good and bad blocks on failure", + .parent = "verify", + .category = FIO_OPT_G_IO | FIO_OPT_G_VERIFY | FIO_OPT_G_ERR, }, { .name = "verify_async", @@ -1446,6 +1634,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .def = "0", .help = "Number of async verifier threads to use", .parent = "verify", + .category = FIO_OPT_G_IO | FIO_OPT_G_VERIFY, }, { .name = "verify_backlog", @@ -1453,13 +1642,15 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(verify_backlog), .help = "Verify after this number of blocks are written", .parent = "verify", + .category = FIO_OPT_G_IO | FIO_OPT_G_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", + .parent = "verify", + .category = FIO_OPT_G_IO | FIO_OPT_G_VERIFY, }, #ifdef FIO_HAVE_CPU_AFFINITY { @@ -1468,6 +1659,44 @@ static struct fio_option options[FIO_MAX_OPTS] = { .cb = str_verify_cpus_allowed_cb, .help = "Set CPUs allowed for async verify threads", .parent = "verify_async", + .category = FIO_OPT_G_OS | FIO_OPT_G_CPU | FIO_OPT_G_VERIFY, + }, +#endif +#ifdef FIO_HAVE_TRIM + { + .name = "trim_percentage", + .type = FIO_OPT_INT, + .cb = str_verify_trim_cb, + .maxval = 100, + .help = "Number of verify blocks to discard/trim", + .parent = "verify", + .def = "0", + .category = FIO_OPT_G_IO, + }, + { + .name = "trim_verify_zero", + .type = FIO_OPT_INT, + .help = "Verify that trim/discarded blocks are returned as zeroes", + .off1 = td_var_offset(trim_zero), + .parent = "trim_percentage", + .def = "1", + .category = FIO_OPT_G_IO, + }, + { + .name = "trim_backlog", + .type = FIO_OPT_STR_VAL, + .off1 = td_var_offset(trim_backlog), + .help = "Trim after this number of blocks are written", + .parent = "trim_percentage", + .category = FIO_OPT_G_IO, + }, + { + .name = "trim_backlog_batch", + .type = FIO_OPT_INT, + .off1 = td_var_offset(trim_batch), + .help = "Trim this number of IO blocks", + .parent = "trim_percentage", + .category = FIO_OPT_G_IO, }, #endif { @@ -1475,24 +1704,45 @@ static struct fio_option options[FIO_MAX_OPTS] = { .type = FIO_OPT_STR_STORE, .off1 = td_var_offset(write_iolog_file), .help = "Store IO pattern to file", + .category = FIO_OPT_G_IO | FIO_OPT_G_LOG, }, { .name = "read_iolog", .type = FIO_OPT_STR_STORE, .off1 = td_var_offset(read_iolog_file), .help = "Playback IO pattern from file", + .category = FIO_OPT_G_IO | FIO_OPT_G_LOG, + }, + { + .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", + .category = FIO_OPT_G_IO | FIO_OPT_G_LOG, + }, + { + .name = "replay_redirect", + .type = FIO_OPT_STR_STORE, + .off1 = td_var_offset(replay_redirect), + .parent = "read_iolog", + .help = "Replay all I/O onto this device, regardless of trace device", + .category = FIO_OPT_G_IO | FIO_OPT_G_LOG, }, { .name = "exec_prerun", .type = FIO_OPT_STR_STORE, .off1 = td_var_offset(exec_prerun), .help = "Execute this file prior to running job", + .category = FIO_OPT_G_MISC | FIO_OPT_G_OS, }, { .name = "exec_postrun", .type = FIO_OPT_STR_STORE, .off1 = td_var_offset(exec_postrun), .help = "Execute this file after running job", + .category = FIO_OPT_G_MISC | FIO_OPT_G_OS, }, #ifdef FIO_HAVE_IOSCHED_SWITCH { @@ -1500,14 +1750,24 @@ static struct fio_option options[FIO_MAX_OPTS] = { .type = FIO_OPT_STR_STORE, .off1 = td_var_offset(ioscheduler), .help = "Use this IO scheduler on the backing device", + .category = FIO_OPT_G_OS | FIO_OPT_G_IO, }, #endif { .name = "zonesize", .type = FIO_OPT_STR_VAL, .off1 = td_var_offset(zone_size), + .help = "Amount of data to read per zone", + .def = "0", + .category = FIO_OPT_G_IO | FIO_OPT_G_ZONE, + }, + { + .name = "zonerange", + .type = FIO_OPT_STR_VAL, + .off1 = td_var_offset(zone_range), .help = "Give size of an IO zone", .def = "0", + .category = FIO_OPT_G_IO | FIO_OPT_G_ZONE, }, { .name = "zoneskip", @@ -1515,6 +1775,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(zone_skip), .help = "Space between IO zones", .def = "0", + .category = FIO_OPT_G_IO | FIO_OPT_G_ZONE, }, { .name = "lockmem", @@ -1522,6 +1783,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .cb = str_lockmem_cb, .help = "Lock down this amount of memory", .def = "0", + .category = FIO_OPT_G_OS | FIO_OPT_G_MEM, }, { .name = "rwmixread", @@ -1530,6 +1792,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .maxval = 100, .help = "Percentage of mixed workload that is reads", .def = "50", + .category = FIO_OPT_G_IO, }, { .name = "rwmixwrite", @@ -1538,10 +1801,12 @@ static struct fio_option options[FIO_MAX_OPTS] = { .maxval = 100, .help = "Percentage of mixed workload that is writes", .def = "50", + .category = FIO_OPT_G_IO, }, { .name = "rwmixcycle", .type = FIO_OPT_DEPRECATED, + .category = FIO_OPT_G_IO, }, { .name = "nice", @@ -1551,6 +1816,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .minval = -19, .maxval = 20, .def = "0", + .category = FIO_OPT_G_OS | FIO_OPT_G_CPU, }, #ifdef FIO_HAVE_IOPRIO { @@ -1560,6 +1826,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Set job IO priority value", .minval = 0, .maxval = 7, + .category = FIO_OPT_G_OS | FIO_OPT_G_CPU, }, { .name = "prioclass", @@ -1568,6 +1835,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Set job IO priority class", .minval = 0, .maxval = 3, + .category = FIO_OPT_G_OS | FIO_OPT_G_CPU, }, #endif { @@ -1576,6 +1844,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(thinktime), .help = "Idle time between IO buffers (usec)", .def = "0", + .category = FIO_OPT_G_MISC, }, { .name = "thinktime_spin", @@ -1584,6 +1853,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Start think time by spinning this amount (usec)", .def = "0", .parent = "thinktime", + .category = FIO_OPT_G_MISC, }, { .name = "thinktime_blocks", @@ -1592,6 +1862,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "IO buffer period between 'thinktime'", .def = "1", .parent = "thinktime", + .category = FIO_OPT_G_MISC, }, { .name = "rate", @@ -1599,6 +1870,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(rate[0]), .off2 = td_var_offset(rate[1]), .help = "Set bandwidth rate", + .category = FIO_OPT_G_IO, }, { .name = "ratemin", @@ -1607,6 +1879,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off2 = td_var_offset(ratemin[1]), .help = "Job must meet this rate or it will be shutdown", .parent = "rate", + .category = FIO_OPT_G_IO, }, { .name = "rate_iops", @@ -1614,14 +1887,16 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(rate_iops[0]), .off2 = td_var_offset(rate_iops[1]), .help = "Limit IO used to this number of IO operations/sec", + .category = FIO_OPT_G_IO, }, { .name = "rate_iops_min", .type = FIO_OPT_INT, .off1 = td_var_offset(rate_iops_min[0]), .off2 = td_var_offset(rate_iops_min[1]), - .help = "Job must meet this rate or it will be shutdown", + .help = "Job must meet this rate or it will be shut down", .parent = "rate_iops", + .category = FIO_OPT_G_IO, }, { .name = "ratecycle", @@ -1630,6 +1905,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Window average for rate limits (msec)", .def = "1000", .parent = "rate", + .category = FIO_OPT_G_IO, }, { .name = "invalidate", @@ -1637,6 +1913,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(invalidate_cache), .help = "Invalidate buffer/page cache prior to running job", .def = "1", + .category = FIO_OPT_G_IO | FIO_OPT_G_CACHE, }, { .name = "sync", @@ -1645,6 +1922,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Use O_SYNC for buffered writes", .def = "0", .parent = "buffered", + .category = FIO_OPT_G_IO | FIO_OPT_G_FILE, }, { .name = "bwavgtime", @@ -1653,6 +1931,17 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Time window over which to calculate bandwidth" " (msec)", .def = "500", + .parent = "write_bw_log", + .category = FIO_OPT_G_LOG | FIO_OPT_G_STAT, + }, + { + .name = "iopsavgtime", + .type = FIO_OPT_INT, + .off1 = td_var_offset(iops_avg_time), + .help = "Time window over which to calculate IOPS (msec)", + .def = "500", + .parent = "write_iops_log", + .category = FIO_OPT_G_LOG | FIO_OPT_G_STAT, }, { .name = "create_serialize", @@ -1660,13 +1949,15 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(create_serialize), .help = "Serialize creating of job files", .def = "1", + .category = FIO_OPT_G_FILE, }, { .name = "create_fsync", .type = FIO_OPT_BOOL, .off1 = td_var_offset(create_fsync), - .help = "Fsync file after creation", + .help = "fsync file after creation", .def = "1", + .category = FIO_OPT_G_FILE, }, { .name = "create_on_open", @@ -1674,19 +1965,22 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(create_on_open), .help = "Create files when they are opened for IO", .def = "0", + .category = FIO_OPT_G_FILE, }, { .name = "pre_read", .type = FIO_OPT_BOOL, .off1 = td_var_offset(pre_read), - .help = "Preread files before starting official testing", + .help = "Pre-read files before starting official testing", .def = "0", + .category = FIO_OPT_G_FILE | FIO_OPT_G_CACHE, }, { .name = "cpuload", .type = FIO_OPT_INT, .off1 = td_var_offset(cpuload), .help = "Use this percentage of CPU", + .category = FIO_OPT_G_CPU, }, { .name = "cpuchunks", @@ -1695,6 +1989,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Length of the CPU burn cycles (usecs)", .def = "50000", .parent = "cpuload", + .category = FIO_OPT_G_CPU, }, #ifdef FIO_HAVE_CPU_AFFINITY { @@ -1702,12 +1997,14 @@ static struct fio_option options[FIO_MAX_OPTS] = { .type = FIO_OPT_INT, .cb = str_cpumask_cb, .help = "CPU affinity mask", + .category = FIO_OPT_G_CPU | FIO_OPT_G_OS, }, { .name = "cpus_allowed", .type = FIO_OPT_STR, .cb = str_cpus_allowed_cb, .help = "Set CPUs allowed", + .category = FIO_OPT_G_CPU | FIO_OPT_G_OS, }, #endif { @@ -1716,6 +2013,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(end_fsync), .help = "Include fsync at the end of job", .def = "0", + .category = FIO_OPT_G_FILE, }, { .name = "fsync_on_close", @@ -1723,6 +2021,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(fsync_on_close), .help = "fsync files on close", .def = "0", + .category = FIO_OPT_G_FILE, }, { .name = "unlink", @@ -1730,30 +2029,36 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(unlink), .help = "Unlink created files after job has completed", .def = "0", + .category = FIO_OPT_G_FILE, }, { .name = "exitall", .type = FIO_OPT_STR_SET, .cb = str_exitall_cb, .help = "Terminate all jobs when one exits", + .category = FIO_OPT_G_MISC | FIO_OPT_G_JOB, }, { .name = "stonewall", + .alias = "wait_for_previous", .type = FIO_OPT_STR_SET, .off1 = td_var_offset(stonewall), .help = "Insert a hard barrier between this job and previous", + .category = FIO_OPT_G_MISC | FIO_OPT_G_JOB, }, { .name = "new_group", .type = FIO_OPT_STR_SET, .off1 = td_var_offset(new_group), .help = "Mark the start of a new group (for reporting)", + .category = FIO_OPT_G_MISC | FIO_OPT_G_JOB, }, { .name = "thread", .type = FIO_OPT_STR_SET, .off1 = td_var_offset(use_thread), .help = "Use threads instead of forks", + .category = FIO_OPT_G_MISC | FIO_OPT_G_OS | FIO_OPT_G_JOB, }, { .name = "write_bw_log", @@ -1761,6 +2066,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(write_bw_log), .cb = str_write_bw_log_cb, .help = "Write log of bandwidth during run", + .category = FIO_OPT_G_LOG, }, { .name = "write_lat_log", @@ -1768,32 +2074,81 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(write_lat_log), .cb = str_write_lat_log_cb, .help = "Write log of latency during run", + .category = FIO_OPT_G_LOG, + }, + { + .name = "write_iops_log", + .type = FIO_OPT_STR, + .off1 = td_var_offset(write_iops_log), + .cb = str_write_iops_log_cb, + .help = "Write log of IOPS during run", + .category = FIO_OPT_G_LOG, + }, + { + .name = "log_avg_msec", + .type = FIO_OPT_INT, + .off1 = td_var_offset(log_avg_msec), + .help = "Average bw/iops/lat logs over this period of time", + .def = "0", + .category = FIO_OPT_G_LOG, }, { .name = "hugepage-size", .type = FIO_OPT_INT, .off1 = td_var_offset(hugepage_size), .help = "When using hugepages, specify size of each page", - .def = __stringify(FIO_HUGE_PAGE), + .def = __fio_stringify(FIO_HUGE_PAGE), + .category = FIO_OPT_G_OS | FIO_OPT_G_MEM, }, { .name = "group_reporting", .type = FIO_OPT_STR_SET, .off1 = td_var_offset(group_reporting), .help = "Do reporting on a per-group basis", + .category = FIO_OPT_G_MISC, }, { .name = "zero_buffers", .type = FIO_OPT_STR_SET, .off1 = td_var_offset(zero_buffers), .help = "Init IO buffers to all zeroes", + .category = FIO_OPT_G_IO_BUF, }, { .name = "refill_buffers", .type = FIO_OPT_STR_SET, .off1 = td_var_offset(refill_buffers), .help = "Refill IO buffers on every IO submit", + .category = FIO_OPT_G_IO_BUF, + }, + { + .name = "scramble_buffers", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(scramble_buffers), + .help = "Slightly scramble buffers on every IO submit", + .def = "1", + .category = FIO_OPT_G_IO_BUF, }, + { + .name = "clat_percentiles", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(clat_percentiles), + .help = "Enable the reporting of completion latency percentiles", + .def = "1", + .category = FIO_OPT_G_STAT, + }, + { + .name = "percentile_list", + .type = FIO_OPT_FLOAT_LIST, + .off1 = td_var_offset(percentile_list), + .off2 = td_var_offset(overwrite_plist), + .help = "Specify a custom list of percentiles to report", + .maxlen = FIO_IO_U_LIST_MAX_LEN, + .minfp = 0.0, + .maxfp = 100.0, + .category = FIO_OPT_G_STAT, + }, + #ifdef FIO_HAVE_DISK_UTIL { .name = "disk_util", @@ -1801,6 +2156,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(do_disk_util), .help = "Log disk utilization statistics", .def = "1", + .category = FIO_OPT_G_OS | FIO_OPT_G_STAT, }, #endif { @@ -1809,6 +2165,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Greatly reduce number of gettimeofday() calls", .cb = str_gtod_reduce_cb, .def = "0", + .category = FIO_OPT_G_OS | FIO_OPT_G_MISC | FIO_OPT_G_STAT, }, { .name = "disable_lat", @@ -1817,6 +2174,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Disable latency numbers", .parent = "gtod_reduce", .def = "0", + .category = FIO_OPT_G_OS | FIO_OPT_G_MISC | FIO_OPT_G_STAT, }, { .name = "disable_clat", @@ -1825,14 +2183,16 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Disable completion latency numbers", .parent = "gtod_reduce", .def = "0", + .category = FIO_OPT_G_OS | FIO_OPT_G_MISC | FIO_OPT_G_STAT, }, { .name = "disable_slat", .type = FIO_OPT_BOOL, .off1 = td_var_offset(disable_slat), - .help = "Disable submissionn latency numbers", + .help = "Disable submission latency numbers", .parent = "gtod_reduce", .def = "0", + .category = FIO_OPT_G_OS | FIO_OPT_G_MISC | FIO_OPT_G_STAT, }, { .name = "disable_bw_measurement", @@ -1841,32 +2201,71 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Disable bandwidth logging", .parent = "gtod_reduce", .def = "0", + .category = FIO_OPT_G_OS | FIO_OPT_G_MISC | FIO_OPT_G_STAT, }, { .name = "gtod_cpu", .type = FIO_OPT_INT, .cb = str_gtod_cpu_cb, - .help = "Setup dedicated gettimeofday() thread on this CPU", + .help = "Set up dedicated gettimeofday() thread on this CPU", .verify = gtod_cpu_verify, + .category = FIO_OPT_G_OS | FIO_OPT_G_MISC | FIO_OPT_G_STAT, }, { .name = "continue_on_error", - .type = FIO_OPT_BOOL, + .type = FIO_OPT_STR, .off1 = td_var_offset(continue_on_error), - .help = "Continue on non-fatal errors during I/O", - .def = "0", + .help = "Continue on non-fatal errors during IO", + .def = "none", + .category = FIO_OPT_G_MISC | FIO_OPT_G_ERR, + .posval = { + { .ival = "none", + .oval = ERROR_TYPE_NONE, + .help = "Exit when an error is encountered", + }, + { .ival = "read", + .oval = ERROR_TYPE_READ, + .help = "Continue on read errors only", + }, + { .ival = "write", + .oval = ERROR_TYPE_WRITE, + .help = "Continue on write errors only", + }, + { .ival = "io", + .oval = ERROR_TYPE_READ | ERROR_TYPE_WRITE, + .help = "Continue on any IO errors", + }, + { .ival = "verify", + .oval = ERROR_TYPE_VERIFY, + .help = "Continue on verify errors only", + }, + { .ival = "all", + .oval = ERROR_TYPE_ANY, + .help = "Continue on all io and verify errors", + }, + { .ival = "0", + .oval = ERROR_TYPE_NONE, + .help = "Alias for 'none'", + }, + { .ival = "1", + .oval = ERROR_TYPE_ANY, + .help = "Alias for 'all'", + }, + }, }, { .name = "profile", .type = FIO_OPT_STR_STORE, .off1 = td_var_offset(profile), .help = "Select a specific builtin performance test", + .category = FIO_OPT_G_MISC | FIO_OPT_G_JOB, }, { .name = "cgroup", .type = FIO_OPT_STR_STORE, .off1 = td_var_offset(cgroup), .help = "Add job to cgroup of this name", + .category = FIO_OPT_G_MISC | FIO_OPT_G_OS, }, { .name = "cgroup_weight", @@ -1875,6 +2274,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Use given weight for cgroup", .minval = 100, .maxval = 1000, + .category = FIO_OPT_G_MISC | FIO_OPT_G_OS, }, { .name = "cgroup_nodelete", @@ -1882,18 +2282,59 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(cgroup_nodelete), .help = "Do not delete cgroups after job completion", .def = "0", + .category = FIO_OPT_G_MISC | FIO_OPT_G_OS, }, { .name = "uid", .type = FIO_OPT_INT, .off1 = td_var_offset(uid), .help = "Run job with this user ID", + .category = FIO_OPT_G_OS | FIO_OPT_G_JOB, }, { .name = "gid", .type = FIO_OPT_INT, .off1 = td_var_offset(gid), .help = "Run job with this group ID", + .category = FIO_OPT_G_OS | FIO_OPT_G_JOB, + }, + { + .name = "flow_id", + .type = FIO_OPT_INT, + .off1 = td_var_offset(flow_id), + .help = "The flow index ID to use", + .def = "0", + .category = FIO_OPT_G_IO, + }, + { + .name = "flow", + .type = FIO_OPT_INT, + .off1 = td_var_offset(flow), + .help = "Weight for flow control of this job", + .parent = "flow_id", + .def = "0", + .category = FIO_OPT_G_IO, + }, + { + .name = "flow_watermark", + .type = FIO_OPT_INT, + .off1 = td_var_offset(flow_watermark), + .help = "High watermark for flow control. This option" + " should be set to the same value for all threads" + " with non-zero flow.", + .parent = "flow_id", + .def = "1024", + .category = FIO_OPT_G_IO, + }, + { + .name = "flow_sleep", + .type = FIO_OPT_INT, + .off1 = td_var_offset(flow_sleep), + .help = "How many microseconds to sleep after being held" + " back by the flow control mechanism", + .parent = "flow_id", + .def = "0", + .category = FIO_OPT_G_IO, }, { .name = NULL, @@ -1901,33 +2342,26 @@ static struct fio_option options[FIO_MAX_OPTS] = { }; static void add_to_lopt(struct option *lopt, struct fio_option *o, - const char *name) + const char *name, int val) { lopt->name = (char *) name; - lopt->val = FIO_GETOPT_JOB; + lopt->val = val; if (o->type == FIO_OPT_STR_SET) lopt->has_arg = no_argument; else lopt->has_arg = required_argument; } -void fio_options_dup_and_init(struct option *long_options) +static void options_to_lopts(struct fio_option *opts, + struct option *long_options, + int i, int option_type) { - struct fio_option *o; - unsigned int i; - - options_init(options); - - i = 0; - while (long_options[i].name) - i++; - - o = &options[0]; + struct fio_option *o = &opts[0]; while (o->name) { - add_to_lopt(&long_options[i], o, o->name); + add_to_lopt(&long_options[i], o, o->name, option_type); if (o->alias) { i++; - add_to_lopt(&long_options[i], o, o->alias); + add_to_lopt(&long_options[i], o, o->alias, option_type); } i++; @@ -1936,6 +2370,43 @@ void fio_options_dup_and_init(struct option *long_options) } } +void fio_options_set_ioengine_opts(struct option *long_options, + struct thread_data *td) +{ + unsigned int i; + + i = 0; + while (long_options[i].name) { + if (long_options[i].val == FIO_GETOPT_IOENGINE) { + memset(&long_options[i], 0, sizeof(*long_options)); + break; + } + i++; + } + + /* + * Just clear out the prior ioengine options. + */ + if (!td || !td->eo) + return; + + options_to_lopts(td->io_ops->options, long_options, i, + FIO_GETOPT_IOENGINE); +} + +void fio_options_dup_and_init(struct option *long_options) +{ + unsigned int i; + + options_init(options); + + i = 0; + while (long_options[i].name) + i++; + + options_to_lopts(options, long_options, i, FIO_GETOPT_JOB); +} + struct fio_keyword { const char *word; const char *desc; @@ -1969,11 +2440,11 @@ void fio_keywords_init(void) sprintf(buf, "%lu", page_size); fio_keywords[0].replace = strdup(buf); - mb_memory = os_phys_mem() / page_size; + mb_memory = os_phys_mem() / (1024 * 1024); sprintf(buf, "%llu", mb_memory); fio_keywords[1].replace = strdup(buf); - l = sysconf(_SC_NPROCESSORS_ONLN); + l = cpus_online(); sprintf(buf, "%lu", l); fio_keywords[2].replace = strdup(buf); } @@ -1982,15 +2453,15 @@ void fio_keywords_init(void) static char *bc_calc(char *str) { - char *buf, *tmp, opt[80]; + char buf[128], *tmp; FILE *f; int ret; /* * No math, just return string */ - if (!strchr(str, '+') && !strchr(str, '-') && !strchr(str, '*') && - !strchr(str, '/')) + if ((!strchr(str, '+') && !strchr(str, '-') && !strchr(str, '*') && + !strchr(str, '/')) || strchr(str, '\'')) return str; /* @@ -2001,37 +2472,89 @@ static char *bc_calc(char *str) return str; tmp++; - memset(opt, 0, sizeof(opt)); - strncpy(opt, str, tmp - str); - buf = malloc(128); + /* + * Prevent buffer overflows; such a case isn't reasonable anyway + */ + if (strlen(str) >= 128 || strlen(tmp) > 100) + return str; sprintf(buf, "which %s > /dev/null", BC_APP); if (system(buf)) { log_err("fio: bc is needed for performing math\n"); - free(buf); return NULL; } - sprintf(buf, "echo %s | %s", tmp, BC_APP); + sprintf(buf, "echo '%s' | %s", tmp, BC_APP); f = popen(buf, "r"); if (!f) { - free(buf); return NULL; } - ret = fread(buf, 1, 128, f); + ret = fread(&buf[tmp - str], 1, 128 - (tmp - str), f); if (ret <= 0) { - free(buf); return NULL; } - buf[ret - 1] = '\0'; - strcat(opt, buf); - strcpy(buf, opt); pclose(f); + buf[(tmp - str) + ret - 1] = '\0'; + memcpy(buf, str, tmp - str); free(str); - return buf; + return strdup(buf); +} + +/* + * Return a copy of the input string with substrings of the form ${VARNAME} + * substituted with the value of the environment variable VARNAME. The + * substitution always occurs, even if VARNAME is empty or the corresponding + * environment variable undefined. + */ +static char *option_dup_subs(const char *opt) +{ + char out[OPT_LEN_MAX+1]; + char in[OPT_LEN_MAX+1]; + char *outptr = out; + char *inptr = in; + char *ch1, *ch2, *env; + ssize_t nchr = OPT_LEN_MAX; + size_t envlen; + + if (strlen(opt) + 1 > OPT_LEN_MAX) { + log_err("OPT_LEN_MAX (%d) is too small\n", OPT_LEN_MAX); + return NULL; + } + + in[OPT_LEN_MAX] = '\0'; + strncpy(in, opt, OPT_LEN_MAX); + + while (*inptr && nchr > 0) { + if (inptr[0] == '$' && inptr[1] == '{') { + ch2 = strchr(inptr, '}'); + if (ch2 && inptr+1 < ch2) { + ch1 = inptr+2; + inptr = ch2+1; + *ch2 = '\0'; + + env = getenv(ch1); + if (env) { + envlen = strlen(env); + if (envlen <= nchr) { + memcpy(outptr, env, envlen); + outptr += envlen; + nchr -= envlen; + } + } + + continue; + } + } + + *outptr++ = *inptr++; + --nchr; + } + + *outptr = '\0'; + return strdup(out); } /* @@ -2041,6 +2564,7 @@ static char *fio_keyword_replace(char *opt) { char *s; int i; + int docalc = 0; for (i = 0; fio_keywords[i].word != NULL; i++) { struct fio_keyword *kw = &fio_keywords[i]; @@ -2070,29 +2594,86 @@ static char *fio_keyword_replace(char *opt) * replace opt and free the old opt */ opt = new; - //free(o_org); + free(o_org); - /* - * Check for potential math and invoke bc, if possible - */ - opt = bc_calc(opt); + docalc = 1; } } + /* + * Check for potential math and invoke bc, if possible + */ + if (docalc) + opt = bc_calc(opt); + return opt; } +static char **dup_and_sub_options(char **opts, int num_opts) +{ + int i; + char **opts_copy = malloc(num_opts * sizeof(*opts)); + for (i = 0; i < num_opts; i++) { + opts_copy[i] = option_dup_subs(opts[i]); + if (!opts_copy[i]) + continue; + opts_copy[i] = fio_keyword_replace(opts_copy[i]); + } + return opts_copy; +} + int fio_options_parse(struct thread_data *td, char **opts, int num_opts) { - int i, ret; + int i, ret, unknown; + char **opts_copy; sort_options(opts, options, num_opts); + opts_copy = dup_and_sub_options(opts, num_opts); + + for (ret = 0, i = 0, unknown = 0; i < num_opts; i++) { + struct fio_option *o; + int newret = parse_option(opts_copy[i], opts[i], options, &o, + td); - for (ret = 0, i = 0; i < num_opts; i++) { - opts[i] = fio_keyword_replace(opts[i]); - ret |= parse_option(opts[i], options, td); + if (opts_copy[i]) { + if (newret && !o) { + unknown++; + continue; + } + free(opts_copy[i]); + opts_copy[i] = NULL; + } + + ret |= newret; + } + + if (unknown) { + ret |= ioengine_load(td); + if (td->eo) { + sort_options(opts_copy, td->io_ops->options, num_opts); + opts = opts_copy; + } + for (i = 0; i < num_opts; i++) { + struct fio_option *o = NULL; + int newret = 1; + if (!opts_copy[i]) + continue; + + if (td->eo) + newret = parse_option(opts_copy[i], opts[i], + td->io_ops->options, &o, + td->eo); + + ret |= newret; + if (!o) + log_err("Bad option <%s>\n", opts[i]); + + free(opts_copy[i]); + opts_copy[i] = NULL; + } } + free(opts_copy); return ret; } @@ -2101,6 +2682,12 @@ int fio_cmd_option_parse(struct thread_data *td, const char *opt, char *val) return parse_cmd_option(opt, val, options, td); } +int fio_cmd_ioengine_option_parse(struct thread_data *td, const char *opt, + char *val) +{ + return parse_cmd_option(opt, val, td->io_ops->options, td); +} + void fio_fill_default_options(struct thread_data *td) { fill_default_options(td, options); @@ -2111,42 +2698,35 @@ int fio_show_option_help(const char *opt) return show_cmd_help(options, opt); } -static void __options_mem(struct thread_data *td, int alloc) +void options_mem_dupe(void *data, struct fio_option *options) { - struct thread_options *o = &td->o; - struct fio_option *opt; + struct fio_option *o; char **ptr; - int i; - for (i = 0, opt = &options[0]; opt->name; i++, opt = &options[i]) { - if (opt->type != FIO_OPT_STR_STORE) + for (o = &options[0]; o->name; o++) { + if (o->type != FIO_OPT_STR_STORE) continue; - ptr = (void *) o + opt->off1; - if (*ptr) { - if (alloc) - *ptr = strdup(*ptr); - else { - free(*ptr); - *ptr = NULL; - } - } + ptr = td_var(data, o->off1); + if (*ptr) + *ptr = strdup(*ptr); } } /* * dupe FIO_OPT_STR_STORE options */ -void options_mem_dupe(struct thread_data *td) +void fio_options_mem_dupe(struct thread_data *td) { - __options_mem(td, 1); -} + options_mem_dupe(&td->o, options); -void options_mem_free(struct thread_data fio_unused *td) -{ -#if 0 - __options_mem(td, 0); -#endif + if (td->eo && td->io_ops) { + void *oldeo = td->eo; + + td->eo = malloc(td->io_ops->option_struct_size); + memcpy(td->eo, oldeo, td->io_ops->option_struct_size); + options_mem_dupe(td->eo, td->io_ops->options); + } } unsigned int fio_get_kb_base(void *data) @@ -2229,3 +2809,13 @@ void del_opt_posval(const char *optname, const char *ival) o->posval[i].help = NULL; } } + +void fio_options_free(struct thread_data *td) +{ + options_free(options, td); + if (td->eo && td->io_ops && td->io_ops->options) { + options_free(td->io_ops->options, td->eo); + free(td->eo); + td->eo = NULL; + } +}