X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=options.c;h=93f7f477acc8dafd214c03ec910e53052997d3e1;hb=20eb06bd2aef37fa8dd314a110bb81c733115e15;hp=2e1e709e91a0d60470ac99085ad42c5c046aa9a4;hpb=068420271828b3b2426ffc3ccf64404cb9d340fb;p=fio.git diff --git a/options.c b/options.c index 2e1e709e..93f7f477 100644 --- a/options.c +++ b/options.c @@ -160,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) @@ -245,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; @@ -689,12 +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; } @@ -826,21 +842,124 @@ static int kb_base_verify(struct fio_option *o, void *data) return 0; } +/* + * Option grouping + */ +static struct opt_group fio_opt_groups[] = { + { + .name = "Description", + .mask = FIO_OPT_G_DESC, + }, + { + .name = "File", + .mask = FIO_OPT_G_FILE, + }, + { + .name = "Misc", + .mask = FIO_OPT_G_MISC, + }, + { + .name = "IO (main)", + .mask = FIO_OPT_G_IO, + }, + { + .name = "IO direction", + .mask = FIO_OPT_G_IO_DDIR, + }, + { + .name = "IO buffer", + .mask = FIO_OPT_G_IO_BUF, + }, + { + .name = "IO engine", + .mask = FIO_OPT_G_IO_ENG, + }, + { + .name = "Random", + .mask = FIO_OPT_G_RAND, + }, + { + .name = "OS", + .mask = FIO_OPT_G_OS, + }, + { + .name = "Memory", + .mask = FIO_OPT_G_MEM, + }, + { + .name = "Verify", + .mask = FIO_OPT_G_VERIFY, + }, + { + .name = "CPU", + .mask = FIO_OPT_G_CPU, + }, + { + .name = "Log", + .mask = FIO_OPT_G_LOG, + }, + { + .name = "Zone", + .mask = FIO_OPT_G_ZONE, + }, + { + .name = "Cache", + .mask = FIO_OPT_G_CACHE, + }, + { + .name = "Stat", + .mask = FIO_OPT_G_STAT, + }, + { + .name = "Error", + .mask = FIO_OPT_G_ERR, + }, + { + .name = "Job", + .mask = FIO_OPT_G_JOB, + }, + { + .name = NULL, + }, +}; + +struct opt_group *opt_group_from_mask(unsigned int *mask) +{ + struct opt_group *og; + int i; + + if (*mask == FIO_OPT_G_INVALID) + return NULL; + + for (i = 0; fio_opt_groups[i].name; i++) { + og = &fio_opt_groups[i]; + + if (*mask & og->mask) { + *mask &= ~(og->mask); + return og; + } + } + + return NULL; +} + /* * Map of job/command line options */ -static struct fio_option options[FIO_MAX_OPTS] = { +struct fio_option fio_options[FIO_MAX_OPTS] = { { .name = "description", .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", @@ -848,6 +967,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", @@ -856,6 +976,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", @@ -865,6 +986,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", @@ -874,6 +996,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, @@ -896,6 +1019,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", @@ -906,6 +1030,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, @@ -939,6 +1064,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, @@ -957,6 +1083,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(ioengine), .help = "IO engine to use", .def = FIO_PREFERRED_ENGINE, + .category = FIO_OPT_G_IO, .posval = { { .ival = "sync", .help = "Use read/write", @@ -1043,7 +1170,9 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(iodepth), .help = "Number of IO buffers to keep in flight", .minval = 1, + .interval = 1, .def = "1", + .category = FIO_OPT_G_IO, }, { .name = "iodepth_batch", @@ -1053,7 +1182,9 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Number of IO buffers to submit in one go", .parent = "iodepth", .minval = 1, + .interval = 1, .def = "1", + .category = FIO_OPT_G_IO, }, { .name = "iodepth_batch_complete", @@ -1062,7 +1193,9 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Number of IO buffers to retrieve in one go", .parent = "iodepth", .minval = 0, + .interval = 1, .def = "1", + .category = FIO_OPT_G_IO, }, { .name = "iodepth_low", @@ -1070,12 +1203,16 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(iodepth_low), .help = "Low water mark for queuing depth", .parent = "iodepth", + .interval = 1, + .category = FIO_OPT_G_IO, }, { .name = "size", .type = FIO_OPT_STR_VAL, .cb = str_size_cb, .help = "Total size of device or files", + .interval = 1024 * 1024, + .category = FIO_OPT_G_IO, }, { .name = "fill_device", @@ -1084,6 +1221,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(fill_device), .help = "Write until an ENOSPC error occurs", .def = "0", + .category = FIO_OPT_G_IO, }, { .name = "filesize", @@ -1092,6 +1230,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off2 = td_var_offset(file_size_high), .minval = 1, .help = "Size of individual files", + .interval = 1024 * 1024, + .category = FIO_OPT_G_IO | FIO_OPT_G_FILE, }, { .name = "offset", @@ -1100,6 +1240,18 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(start_offset), .help = "Start IO from this offset", .def = "0", + .interval = 1024 * 1024, + .category = FIO_OPT_G_IO, + }, + { + .name = "offset_increment", + .type = FIO_OPT_STR_VAL, + .off1 = td_var_offset(offset_increment), + .help = "What is the increment from one offset to the next", + .parent = "offset", + .def = "0", + .interval = 1024 * 1024, + .category = FIO_OPT_G_IO, }, { .name = "bs", @@ -1111,6 +1263,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Block size unit", .def = "4k", .parent = "rw", + .interval = 512, + .category = FIO_OPT_G_IO, }, { .name = "ba", @@ -1121,6 +1275,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .minval = 1, .help = "IO block offset alignment", .parent = "rw", + .interval = 512, + .category = FIO_OPT_G_IO | FIO_OPT_G_IO_BUF, }, { .name = "bsrange", @@ -1133,6 +1289,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .minval = 1, .help = "Set block size range (in more detail than bs)", .parent = "rw", + .interval = 4096, + .category = FIO_OPT_G_IO, }, { .name = "bssplit", @@ -1140,6 +1298,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", @@ -1148,6 +1307,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", @@ -1156,6 +1316,7 @@ 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", @@ -1164,6 +1325,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Set to use OS random generator", .def = "0", .parent = "rw", + .category = FIO_OPT_G_RAND, }, { .name = "norandommap", @@ -1171,6 +1333,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", @@ -1179,6 +1342,7 @@ 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", @@ -1187,12 +1351,15 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(nr_files), .help = "Split job workload between this number of files", .def = "1", + .interval = 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", @@ -1201,6 +1368,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, @@ -1224,6 +1392,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .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, @@ -1257,6 +1426,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .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", @@ -1264,6 +1434,8 @@ 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", + .interval = 1, + .category = FIO_OPT_G_FILE, }, { .name = "fdatasync", @@ -1271,6 +1443,8 @@ 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", + .interval = 1, + .category = FIO_OPT_G_FILE, }, { .name = "write_barrier", @@ -1278,6 +1452,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(barrier_blocks), .help = "Make every Nth write a barrier write", .def = "0", + .interval = 1, + .category = FIO_OPT_G_IO, }, #ifdef FIO_HAVE_SYNC_FILE_RANGE { @@ -1304,6 +1480,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 { @@ -1312,6 +1489,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", @@ -1320,6 +1498,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", @@ -1327,6 +1506,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", @@ -1334,6 +1514,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(loops), .help = "Number of times to run the job", .def = "1", + .interval = 1, + .category = FIO_OPT_G_MISC, }, { .name = "numjobs", @@ -1341,6 +1523,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(numjobs), .help = "Duplicate this job this many times", .def = "1", + .interval = 1, + .category = FIO_OPT_G_MISC, }, { .name = "startdelay", @@ -1348,6 +1532,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", @@ -1356,18 +1541,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", @@ -1375,6 +1563,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, @@ -1400,6 +1589,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, @@ -1436,6 +1626,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", @@ -1444,6 +1635,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, @@ -1462,12 +1654,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, @@ -1507,6 +1699,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", @@ -1515,6 +1708,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", @@ -1523,6 +1717,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .minval = 2 * sizeof(struct verify_header), .help = "Store verify buffer header every N bytes", .parent = "verify", + .interval = 2 * sizeof(struct verify_header), + .category = FIO_OPT_G_IO | FIO_OPT_G_VERIFY, }, { .name = "verify_offset", @@ -1531,6 +1727,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", @@ -1538,6 +1735,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", @@ -1546,6 +1744,7 @@ 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", @@ -1554,6 +1753,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .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", @@ -1562,6 +1762,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", @@ -1569,6 +1770,7 @@ 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", @@ -1576,6 +1778,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(verify_batch), .help = "Verify this number of IO blocks", .parent = "verify", + .category = FIO_OPT_G_IO | FIO_OPT_G_VERIFY, }, #ifdef FIO_HAVE_CPU_AFFINITY { @@ -1584,6 +1787,7 @@ 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 @@ -1591,18 +1795,22 @@ static struct fio_option options[FIO_MAX_OPTS] = { .name = "trim_percentage", .type = FIO_OPT_INT, .cb = str_verify_trim_cb, + .minval = 0, .maxval = 100, .help = "Number of verify blocks to discard/trim", .parent = "verify", .def = "0", + .interval = 1, + .category = FIO_OPT_G_IO, }, { .name = "trim_verify_zero", - .type = FIO_OPT_INT, + .type = FIO_OPT_BOOL, .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", @@ -1610,6 +1818,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(trim_backlog), .help = "Trim after this number of blocks are written", .parent = "trim_percentage", + .interval = 1, + .category = FIO_OPT_G_IO, }, { .name = "trim_backlog_batch", @@ -1617,6 +1827,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(trim_batch), .help = "Trim this number of IO blocks", .parent = "trim_percentage", + .interval = 1, + .category = FIO_OPT_G_IO, }, #endif { @@ -1624,20 +1836,23 @@ 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, + .type = FIO_OPT_BOOL, .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", @@ -1645,18 +1860,21 @@ static struct fio_option options[FIO_MAX_OPTS] = { .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 { @@ -1664,14 +1882,26 @@ 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", + .interval = 1024 * 1024, + .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", + .interval = 1024 * 1024, + .category = FIO_OPT_G_IO | FIO_OPT_G_ZONE, }, { .name = "zoneskip", @@ -1679,6 +1909,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(zone_skip), .help = "Space between IO zones", .def = "0", + .interval = 1024 * 1024, + .category = FIO_OPT_G_IO | FIO_OPT_G_ZONE, }, { .name = "lockmem", @@ -1686,6 +1918,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .cb = str_lockmem_cb, .help = "Lock down this amount of memory", .def = "0", + .interval = 1024 * 1024, + .category = FIO_OPT_G_OS | FIO_OPT_G_MEM, }, { .name = "rwmixread", @@ -1694,6 +1928,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .maxval = 100, .help = "Percentage of mixed workload that is reads", .def = "50", + .interval = 5, + .category = FIO_OPT_G_IO, }, { .name = "rwmixwrite", @@ -1702,10 +1938,13 @@ static struct fio_option options[FIO_MAX_OPTS] = { .maxval = 100, .help = "Percentage of mixed workload that is writes", .def = "50", + .interval = 5, + .category = FIO_OPT_G_IO, }, { .name = "rwmixcycle", .type = FIO_OPT_DEPRECATED, + .category = FIO_OPT_G_IO, }, { .name = "nice", @@ -1715,6 +1954,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .minval = -19, .maxval = 20, .def = "0", + .interval = 1, + .category = FIO_OPT_G_OS | FIO_OPT_G_CPU, }, #ifdef FIO_HAVE_IOPRIO { @@ -1724,6 +1965,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Set job IO priority value", .minval = 0, .maxval = 7, + .interval = 1, + .category = FIO_OPT_G_OS | FIO_OPT_G_CPU, }, { .name = "prioclass", @@ -1732,6 +1975,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Set job IO priority class", .minval = 0, .maxval = 3, + .interval = 1, + .category = FIO_OPT_G_OS | FIO_OPT_G_CPU, }, #endif { @@ -1740,6 +1985,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", @@ -1748,6 +1994,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", @@ -1756,6 +2003,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", @@ -1763,6 +2011,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", @@ -1771,6 +2020,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", @@ -1778,6 +2028,7 @@ 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", @@ -1786,6 +2037,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off2 = td_var_offset(rate_iops_min[1]), .help = "Job must meet this rate or it will be shut down", .parent = "rate_iops", + .category = FIO_OPT_G_IO, }, { .name = "ratecycle", @@ -1794,6 +2046,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", @@ -1801,6 +2054,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", @@ -1809,6 +2063,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", @@ -1818,6 +2073,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { " (msec)", .def = "500", .parent = "write_bw_log", + .interval = 100, + .category = FIO_OPT_G_LOG | FIO_OPT_G_STAT, }, { .name = "iopsavgtime", @@ -1826,6 +2083,8 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Time window over which to calculate IOPS (msec)", .def = "500", .parent = "write_iops_log", + .interval = 100, + .category = FIO_OPT_G_LOG | FIO_OPT_G_STAT, }, { .name = "create_serialize", @@ -1833,6 +2092,7 @@ 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", @@ -1840,6 +2100,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(create_fsync), .help = "fsync file after creation", .def = "1", + .category = FIO_OPT_G_FILE, }, { .name = "create_on_open", @@ -1847,6 +2108,7 @@ 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", @@ -1854,12 +2116,14 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(pre_read), .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", @@ -1868,6 +2132,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 { @@ -1875,12 +2140,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 { @@ -1889,6 +2156,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", @@ -1896,6 +2164,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", @@ -1903,12 +2172,14 @@ 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", @@ -1916,18 +2187,21 @@ static struct fio_option options[FIO_MAX_OPTS] = { .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", + .help = "Use threads instead of processes", + .category = FIO_OPT_G_MISC | FIO_OPT_G_OS | FIO_OPT_G_JOB, }, { .name = "write_bw_log", @@ -1935,6 +2209,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", @@ -1942,6 +2217,7 @@ 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", @@ -1949,6 +2225,15 @@ static struct fio_option options[FIO_MAX_OPTS] = { .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", @@ -1956,24 +2241,29 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(hugepage_size), .help = "When using hugepages, specify size of each page", .def = __fio_stringify(FIO_HUGE_PAGE), + .interval = 1024 * 1024, + .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", @@ -1981,6 +2271,26 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(scramble_buffers), .help = "Slightly scramble buffers on every IO submit", .def = "1", + .category = FIO_OPT_G_IO_BUF, + }, + { + .name = "buffer_compress_percentage", + .type = FIO_OPT_INT, + .off1 = td_var_offset(compress_percentage), + .maxval = 100, + .minval = 1, + .help = "How compressible the buffer is (approximately)", + .interval = 5, + .category = FIO_OPT_G_IO_BUF, + }, + { + .name = "buffer_compress_chunk", + .type = FIO_OPT_INT, + .off1 = td_var_offset(compress_chunk), + .parent = "buffer_compress_percentage", + .help = "Size of compressible region in buffer", + .interval = 256, + .category = FIO_OPT_G_IO_BUF, }, { .name = "clat_percentiles", @@ -1988,6 +2298,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(clat_percentiles), .help = "Enable the reporting of completion latency percentiles", .def = "1", + .category = FIO_OPT_G_STAT, }, { .name = "percentile_list", @@ -1998,6 +2309,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .maxlen = FIO_IO_U_LIST_MAX_LEN, .minfp = 0.0, .maxfp = 100.0, + .category = FIO_OPT_G_STAT, }, #ifdef FIO_HAVE_DISK_UTIL @@ -2007,6 +2319,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 { @@ -2015,6 +2328,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", @@ -2023,6 +2337,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", @@ -2031,6 +2346,7 @@ 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", @@ -2039,6 +2355,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .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", @@ -2047,6 +2364,7 @@ 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", @@ -2054,6 +2372,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .cb = str_gtod_cpu_cb, .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", @@ -2061,6 +2380,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(continue_on_error), .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, @@ -2101,12 +2421,14 @@ static struct fio_option options[FIO_MAX_OPTS] = { .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", @@ -2115,6 +2437,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", @@ -2122,18 +2445,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, @@ -2197,13 +2561,13 @@ void fio_options_dup_and_init(struct option *long_options) { unsigned int i; - options_init(options); + options_init(fio_options); i = 0; while (long_options[i].name) i++; - options_to_lopts(options, long_options, i, FIO_GETOPT_JOB); + options_to_lopts(fio_options, long_options, i, FIO_GETOPT_JOB); } struct fio_keyword { @@ -2426,13 +2790,13 @@ int fio_options_parse(struct thread_data *td, char **opts, int num_opts) int i, ret, unknown; char **opts_copy; - sort_options(opts, options, num_opts); + sort_options(opts, fio_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); + int newret = parse_option(opts_copy[i], opts[i], fio_options, + &o, td); if (opts_copy[i]) { if (newret && !o) { @@ -2478,7 +2842,7 @@ int fio_options_parse(struct thread_data *td, char **opts, int num_opts) int fio_cmd_option_parse(struct thread_data *td, const char *opt, char *val) { - return parse_cmd_option(opt, val, options, td); + return parse_cmd_option(opt, val, fio_options, td); } int fio_cmd_ioengine_option_parse(struct thread_data *td, const char *opt, @@ -2489,12 +2853,12 @@ int fio_cmd_ioengine_option_parse(struct thread_data *td, const char *opt, void fio_fill_default_options(struct thread_data *td) { - fill_default_options(td, options); + fill_default_options(td, fio_options); } int fio_show_option_help(const char *opt) { - return show_cmd_help(options, opt); + return show_cmd_help(fio_options, opt); } void options_mem_dupe(void *data, struct fio_option *options) @@ -2517,7 +2881,7 @@ void options_mem_dupe(void *data, struct fio_option *options) */ void fio_options_mem_dupe(struct thread_data *td) { - options_mem_dupe(&td->o, options); + options_mem_dupe(&td->o, fio_options); if (td->eo && td->io_ops) { void *oldeo = td->eo; @@ -2546,13 +2910,13 @@ int add_option(struct fio_option *o) struct fio_option *__o; int opt_index = 0; - __o = options; + __o = fio_options; while (__o->name) { opt_index++; __o++; } - memcpy(&options[opt_index], o, sizeof(*o)); + memcpy(&fio_options[opt_index], o, sizeof(*o)); return 0; } @@ -2560,7 +2924,7 @@ void invalidate_profile_options(const char *prof_name) { struct fio_option *o; - o = options; + o = fio_options; while (o->name) { if (o->prof_name && !strcmp(o->prof_name, prof_name)) { o->type = FIO_OPT_INVALID; @@ -2575,7 +2939,7 @@ void add_opt_posval(const char *optname, const char *ival, const char *help) struct fio_option *o; unsigned int i; - o = find_option(options, optname); + o = find_option(fio_options, optname); if (!o) return; @@ -2594,7 +2958,7 @@ void del_opt_posval(const char *optname, const char *ival) struct fio_option *o; unsigned int i; - o = find_option(options, optname); + o = find_option(fio_options, optname); if (!o) return; @@ -2611,7 +2975,7 @@ void del_opt_posval(const char *optname, const char *ival) void fio_options_free(struct thread_data *td) { - options_free(options, td); + options_free(fio_options, td); if (td->eo && td->io_ops && td->io_ops->options) { options_free(td->io_ops->options, td->eo); free(td->eo);