X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=16908a07710a5e525ba666aa82fa4235c3f6c3c0;hp=829b808ce5be554f1f9092dbfdf9c7c022095dfb;hb=6adb38a1a1cbe95f7131815416c8bb31683c3f47;hpb=3f9f4e2631c4f5d33f125dd71db20c1773d22c91 diff --git a/options.c b/options.c index 829b808c..16908a07 100644 --- a/options.c +++ b/options.c @@ -5,9 +5,15 @@ #include #include #include +#include +#include +#include +#include #include "fio.h" +#include "verify.h" #include "parse.h" +#include "lib/fls.h" #define td_var_offset(var) ((size_t) &((struct thread_options *)0)->var) @@ -27,14 +33,180 @@ static char *get_opt_postfix(const char *str) return strdup(p); } +static int converthexchartoint(char a) +{ + int base; + + switch(a) { + case '0'...'9': + base = '0'; + break; + case 'A'...'F': + base = 'A' - 10; + break; + case 'a'...'f': + base = 'a' - 10; + break; + default: + base = 0; + } + return (a - base); +} + +static int bs_cmp(const void *p1, const void *p2) +{ + const struct bssplit *bsp1 = p1; + const struct bssplit *bsp2 = p2; + + return bsp1->perc < bsp2->perc; +} + +static int bssplit_ddir(struct thread_data *td, int ddir, char *str) +{ + struct bssplit *bssplit; + unsigned int i, perc, perc_missing; + unsigned int max_bs, min_bs; + long long val; + char *fname; + + td->o.bssplit_nr[ddir] = 4; + bssplit = malloc(4 * sizeof(struct bssplit)); + + i = 0; + max_bs = 0; + min_bs = -1; + while ((fname = strsep(&str, ":")) != NULL) { + char *perc_str; + + if (!strlen(fname)) + break; + + /* + * grow struct buffer, if needed + */ + if (i == td->o.bssplit_nr[ddir]) { + td->o.bssplit_nr[ddir] <<= 1; + bssplit = realloc(bssplit, td->o.bssplit_nr[ddir] + * sizeof(struct bssplit)); + } + + perc_str = strstr(fname, "/"); + if (perc_str) { + *perc_str = '\0'; + perc_str++; + perc = atoi(perc_str); + if (perc > 100) + perc = 100; + else if (!perc) + perc = -1; + } else + perc = -1; + + if (str_to_decimal(fname, &val, 1, td)) { + log_err("fio: bssplit conversion failed\n"); + free(td->o.bssplit); + return 1; + } + + if (val > max_bs) + max_bs = val; + if (val < min_bs) + min_bs = val; + + bssplit[i].bs = val; + bssplit[i].perc = perc; + i++; + } + + td->o.bssplit_nr[ddir] = i; + + /* + * Now check if the percentages add up, and how much is missing + */ + perc = perc_missing = 0; + for (i = 0; i < td->o.bssplit_nr[ddir]; i++) { + struct bssplit *bsp = &bssplit[i]; + + if (bsp->perc == (unsigned char) -1) + perc_missing++; + else + perc += bsp->perc; + } + + if (perc > 100) { + log_err("fio: bssplit percentages add to more than 100%%\n"); + free(bssplit); + return 1; + } + /* + * If values didn't have a percentage set, divide the remains between + * them. + */ + if (perc_missing) { + for (i = 0; i < td->o.bssplit_nr[ddir]; i++) { + struct bssplit *bsp = &bssplit[i]; + + if (bsp->perc == (unsigned char) -1) + bsp->perc = (100 - perc) / perc_missing; + } + } + + td->o.min_bs[ddir] = min_bs; + td->o.max_bs[ddir] = max_bs; + + /* + * now sort based on percentages, for ease of lookup + */ + 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) +{ + struct thread_data *td = data; + char *str, *p, *odir; + int ret = 0; + + p = str = strdup(input); + + strip_blank_front(&str); + strip_blank_end(str); + + odir = strchr(str, ','); + if (odir) { + ret = bssplit_ddir(td, DDIR_WRITE, odir + 1); + if (!ret) { + *odir = '\0'; + ret = bssplit_ddir(td, DDIR_READ, str); + } + } else { + char *op; + + op = strdup(str); + + ret = bssplit_ddir(td, DDIR_READ, str); + if (!ret) + ret = bssplit_ddir(td, DDIR_WRITE, op); + + free(op); + } + + free(p); + return ret; +} + 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; - if (nr) + if (nr) { td->o.ddir_nr = atoi(nr); + free(nr); + } return 0; } @@ -60,6 +232,24 @@ static int str_lockmem_cb(void fio_unused *data, unsigned long *val) return 0; } +static int str_rwmix_read_cb(void *data, unsigned int *val) +{ + struct thread_data *td = data; + + td->o.rwmix[DDIR_READ] = *val; + td->o.rwmix[DDIR_WRITE] = 100 - *val; + return 0; +} + +static int str_rwmix_write_cb(void *data, unsigned int *val) +{ + struct thread_data *td = data; + + td->o.rwmix[DDIR_WRITE] = *val; + td->o.rwmix[DDIR_READ] = 100 - *val; + return 0; +} + #ifdef FIO_HAVE_IOPRIO static int str_prioclass_cb(void *data, unsigned int *val) { @@ -73,6 +263,7 @@ static int str_prioclass_cb(void *data, unsigned int *val) td->ioprio &= mask; td->ioprio |= *val << IOPRIO_CLASS_SHIFT; + td->ioprio_set = 1; return 0; } @@ -88,6 +279,7 @@ static int str_prio_cb(void *data, unsigned int *val) if ((td->ioprio >> IOPRIO_CLASS_SHIFT) == 0) td->ioprio |= IOPRIO_CLASS_BE << IOPRIO_CLASS_SHIFT; + td->ioprio_set = 1; return 0; } #endif @@ -103,39 +295,124 @@ static int str_cpumask_cb(void *data, unsigned int *val) { struct thread_data *td = data; unsigned int i; + long max_cpu; + int ret; - CPU_ZERO(&td->o.cpumask); + ret = fio_cpuset_init(&td->o.cpumask); + if (ret < 0) { + log_err("fio: cpuset_init failed\n"); + td_verror(td, ret, "fio_cpuset_init"); + return 1; + } - for (i = 0; i < sizeof(int) * 8; i++) - if ((1 << i) & *val) - CPU_SET(*val, &td->o.cpumask); + max_cpu = sysconf(_SC_NPROCESSORS_ONLN); + + for (i = 0; i < sizeof(int) * 8; i++) { + if ((1 << i) & *val) { + if (i > max_cpu) { + log_err("fio: CPU %d too large (max=%ld)\n", i, + max_cpu); + return 1; + } + dprint(FD_PARSE, "set cpu allowed %d\n", i); + fio_cpu_set(&td->o.cpumask, i); + } + } td->o.cpumask_set = 1; return 0; } -static int str_cpus_allowed_cb(void *data, const char *input) +static int set_cpus_allowed(struct thread_data *td, os_cpu_mask_t *mask, + const char *input) { - struct thread_data *td = data; char *cpu, *str, *p; + long max_cpu; + int ret = 0; - CPU_ZERO(&td->o.cpumask); + ret = fio_cpuset_init(mask); + if (ret < 0) { + log_err("fio: cpuset_init failed\n"); + td_verror(td, ret, "fio_cpuset_init"); + return 1; + } p = str = strdup(input); strip_blank_front(&str); strip_blank_end(str); + max_cpu = sysconf(_SC_NPROCESSORS_ONLN); + while ((cpu = strsep(&str, ",")) != NULL) { + char *str2, *cpu2; + int icpu, icpu2; + if (!strlen(cpu)) break; - CPU_SET(atoi(cpu), &td->o.cpumask); + + str2 = cpu; + icpu2 = -1; + while ((cpu2 = strsep(&str2, "-")) != NULL) { + if (!strlen(cpu2)) + break; + + icpu2 = atoi(cpu2); + } + + icpu = atoi(cpu); + if (icpu2 == -1) + icpu2 = icpu; + while (icpu <= icpu2) { + if (icpu >= FIO_MAX_CPUS) { + log_err("fio: your OS only supports up to" + " %d CPUs\n", (int) FIO_MAX_CPUS); + ret = 1; + break; + } + if (icpu > max_cpu) { + log_err("fio: CPU %d too large (max=%ld)\n", + icpu, max_cpu); + ret = 1; + break; + } + + dprint(FD_PARSE, "set cpu allowed %d\n", icpu); + fio_cpu_set(mask, icpu); + icpu++; + } + if (ret) + break; } free(p); - td->o.cpumask_set = 1; - exit(0); - return 0; + if (!ret) + td->o.cpumask_set = 1; + return ret; +} + +static int str_cpus_allowed_cb(void *data, const char *input) +{ + struct thread_data *td = data; + int ret; + + ret = set_cpus_allowed(td, &td->o.cpumask, input); + if (!ret) + td->o.cpumask_set = 1; + + return ret; +} + +static int str_verify_cpus_allowed_cb(void *data, const char *input) +{ + struct thread_data *td = data; + int ret; + + ret = set_cpus_allowed(td, &td->o.verify_cpumask, input); + if (!ret) + td->o.verify_cpumask_set = 1; + + return ret; } #endif @@ -145,12 +422,99 @@ static int str_fst_cb(void *data, const char *str) char *nr = get_opt_postfix(str); td->file_service_nr = 1; - if (nr) + if (nr) { td->file_service_nr = atoi(nr); + free(nr); + } + + return 0; +} + +static int check_dir(struct thread_data *td, char *fname) +{ + char file[PATH_MAX], *dir; + int elen = 0; + + if (td->o.directory) { + strcpy(file, td->o.directory); + strcat(file, "/"); + elen = strlen(file); + } + + sprintf(file + elen, "%s", fname); + dir = dirname(file); + +#if 0 + { + struct stat sb; + /* + * We can't do this on FIO_DISKLESSIO engines. The engine isn't loaded + * yet, so we can't do this check right here... + */ + if (lstat(dir, &sb) < 0) { + int ret = errno; + + log_err("fio: %s is not a directory\n", dir); + td_verror(td, ret, "lstat"); + return 1; + } + + if (!S_ISDIR(sb.st_mode)) { + log_err("fio: %s is not a directory\n", dir); + return 1; + } + } +#endif return 0; } +/* + * Return next file in the string. Files are separated with ':'. If the ':' + * is escaped with a '\', then that ':' is part of the filename and does not + * indicate a new file. + */ +static char *get_next_file_name(char **ptr) +{ + char *str = *ptr; + char *p, *start; + + if (!str || !strlen(str)) + return NULL; + + start = str; + do { + /* + * No colon, we are done + */ + p = strchr(str, ':'); + if (!p) { + *ptr = NULL; + break; + } + + /* + * We got a colon, but it's the first character. Skip and + * continue + */ + if (p == start) { + str = ++start; + continue; + } + + if (*(p - 1) != '\\') { + *p = '\0'; + *ptr = p + 1; + break; + } + + memmove(p - 1, p, strlen(p) + 1); + str = p; + } while (1); + + return start; +} + static int str_filename_cb(void *data, const char *input) { struct thread_data *td = data; @@ -164,9 +528,13 @@ static int str_filename_cb(void *data, const char *input) if (!td->files_index) td->o.nr_files = 0; - while ((fname = strsep(&str, ":")) != NULL) { + while ((fname = get_next_file_name(&str)) != NULL) { if (!strlen(fname)) break; + if (check_dir(td, fname)) { + free(p); + return 1; + } add_file(td, fname); td->o.nr_files++; } @@ -181,8 +549,10 @@ static int str_directory_cb(void *data, const char fio_unused *str) struct stat sb; if (lstat(td->o.directory, &sb) < 0) { + int ret = errno; + log_err("fio: %s is not a directory\n", td->o.directory); - td_verror(td, errno, "lstat"); + td_verror(td, ret, "lstat"); return 1; } if (!S_ISDIR(sb.st_mode)) { @@ -203,6 +573,161 @@ 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) +{ + struct thread_data *td = data; + + if (*off && *off < sizeof(struct verify_header)) { + log_err("fio: verify_offset too small\n"); + return 1; + } + + td->o.verify_offset = *off; + return 0; +} + +static int str_verify_pattern_cb(void *data, const char *input) +{ + struct thread_data *td = data; + long off; + int i = 0, j = 0, len, k, base = 10; + char* loc1, * loc2; + + loc1 = strstr(input, "0x"); + loc2 = strstr(input, "0X"); + if (loc1 || loc2) + base = 16; + off = strtol(input, NULL, base); + if (off != LONG_MAX || errno != ERANGE) { + while (off) { + td->o.verify_pattern[i] = off & 0xff; + off >>= 8; + i++; + } + } else { + len = strlen(input); + k = len - 1; + if (base == 16) { + if (loc1) + j = loc1 - input + 2; + else + j = loc2 - input + 2; + } else + return 1; + if (len - j < MAX_PATTERN_SIZE * 2) { + while (k >= j) { + off = converthexchartoint(input[k--]); + if (k >= j) + off += (converthexchartoint(input[k--]) + * 16); + td->o.verify_pattern[i++] = (char) off; + } + } + } + td->o.verify_pattern_bytes = i; + return 0; +} + +static int str_lockfile_cb(void *data, const char *str) +{ + struct thread_data *td = data; + char *nr = get_opt_postfix(str); + + td->o.lockfile_batch = 1; + if (nr) { + td->o.lockfile_batch = atoi(nr); + free(nr); + } + + return 0; +} + +static int str_write_bw_log_cb(void *data, const char *str) +{ + struct thread_data *td = data; + + if (str) + td->o.bw_log_file = strdup(str); + + td->o.write_bw_log = 1; + return 0; +} + +static int str_write_lat_log_cb(void *data, const char *str) +{ + struct thread_data *td = data; + + if (str) + td->o.lat_log_file = strdup(str); + + td->o.write_lat_log = 1; + return 0; +} + +static int str_gtod_reduce_cb(void *data, int *il) +{ + struct thread_data *td = data; + int val = *il; + + td->o.disable_clat = !!val; + td->o.disable_slat = !!val; + td->o.disable_bw = !!val; + if (val) + td->tv_cache_mask = 63; + + return 0; +} + +static int str_gtod_cpu_cb(void *data, int *il) +{ + struct thread_data *td = data; + int val = *il; + + td->o.gtod_cpu = val; + td->o.gtod_offload = 1; + return 0; +} + +static int rw_verify(struct fio_option *o, void *data) +{ + struct thread_data *td = data; + + if (read_only && td_write(td)) { + log_err("fio: job <%s> has write bit set, but fio is in" + " read-only mode\n", td->o.name); + return 1; + } + + return 0; +} + +static int gtod_cpu_verify(struct fio_option *o, void *data) +{ +#ifndef FIO_HAVE_CPU_AFFINITY + struct thread_data *td = data; + + if (td->o.gtod_cpu) { + log_err("fio: platform must support CPU affinity for" + "gettimeofday() offloading\n"); + return 1; + } +#endif + + return 0; +} + +static int kb_base_verify(struct fio_option *o, void *data) +{ + struct thread_data *td = data; + + if (td->o.kb_base != 1024 && td->o.kb_base != 1000) { + log_err("fio: kb_base set to nonsensical value: %u\n", + td->o.kb_base); + return 1; + } + + return 0; +} #define __stringify_1(x) #x #define __stringify(x) __stringify_1(x) @@ -235,8 +760,42 @@ static struct fio_option options[] = { .type = FIO_OPT_STR_STORE, .off1 = td_var_offset(filename), .cb = str_filename_cb, + .prio = -1, /* must come after "directory" */ .help = "File(s) to use for the workload", }, + { + .name = "kb_base", + .type = FIO_OPT_INT, + .off1 = td_var_offset(kb_base), + .verify = kb_base_verify, + .prio = 1, + .def = "1024", + .help = "How many bytes per KB for reporting (1000 or 1024)", + }, + { + .name = "lockfile", + .type = FIO_OPT_STR, + .cb = str_lockfile_cb, + .off1 = td_var_offset(file_lock_mode), + .help = "Lock file when doing IO to it", + .parent = "filename", + .def = "none", + .posval = { + { .ival = "none", + .oval = FILE_LOCK_NONE, + .help = "No file locking", + }, + { .ival = "exclusive", + .oval = FILE_LOCK_EXCLUSIVE, + .help = "Exclusive file lock", + }, + { + .ival = "readwrite", + .oval = FILE_LOCK_READWRITE, + .help = "Read vs write lock", + }, + }, + }, { .name = "opendir", .type = FIO_OPT_STR_STORE, @@ -252,6 +811,7 @@ static struct fio_option options[] = { .off1 = td_var_offset(td_ddir), .help = "IO direction", .def = "read", + .verify = rw_verify, .posval = { { .ival = "read", .oval = TD_DDIR_READ, @@ -279,13 +839,6 @@ static struct fio_option options[] = { }, }, }, - { - .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", - }, { .name = "ioengine", .type = FIO_OPT_STR_STORE, @@ -296,6 +849,12 @@ static struct fio_option options[] = { { .ival = "sync", .help = "Use read/write", }, + { .ival = "psync", + .help = "Use pread/pwrite", + }, + { .ival = "vsync", + .help = "Use readv/writev", + }, #ifdef FIO_HAVE_LIBAIO { .ival = "libaio", .help = "Linux native asynchronous IO", @@ -305,6 +864,11 @@ static struct fio_option options[] = { { .ival = "posixaio", .help = "POSIX asynchronous IO", }, +#endif +#ifdef FIO_HAVE_SOLARISAIO + { .ival = "solarisaio", + .help = "Solaris native asynchronous IO", + }, #endif { .ival = "mmap", .help = "Memory mapped IO", @@ -351,19 +915,34 @@ static struct fio_option options[] = { .type = FIO_OPT_INT, .off1 = td_var_offset(iodepth), .help = "Amount of IO buffers to keep in flight", + .minval = 1, .def = "1", }, { .name = "iodepth_batch", + .alias = "iodepth_batch_submit", .type = FIO_OPT_INT, .off1 = td_var_offset(iodepth_batch), - .help = "Number of IO to submit in one go", + .help = "Number of IO buffers to submit in one go", + .parent = "iodepth", + .minval = 1, + .def = "1", + }, + { + .name = "iodepth_batch_complete", + .type = FIO_OPT_INT, + .off1 = td_var_offset(iodepth_batch_complete), + .help = "Number of IO buffers to retrieve in one go", + .parent = "iodepth", + .minval = 0, + .def = "1", }, { .name = "iodepth_low", .type = FIO_OPT_INT, .off1 = td_var_offset(iodepth_low), .help = "Low water mark for queuing depth", + .parent = "iodepth", }, { .name = "size", @@ -372,6 +951,13 @@ static struct fio_option options[] = { .minval = 1, .help = "Total size of device or files", }, + { + .name = "fill_device", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(fill_device), + .help = "Write until an ENOSPC error occurs", + .def = "0", + }, { .name = "filesize", .type = FIO_OPT_STR_VAL, @@ -380,15 +966,34 @@ static struct fio_option options[] = { .minval = 1, .help = "Size of individual files", }, + { + .name = "offset", + .alias = "fileoffset", + .type = FIO_OPT_STR_VAL, + .off1 = td_var_offset(start_offset), + .help = "Start IO from this offset", + .def = "0", + }, { .name = "bs", .alias = "blocksize", - .type = FIO_OPT_STR_VAL_INT, + .type = FIO_OPT_INT, .off1 = td_var_offset(bs[DDIR_READ]), .off2 = td_var_offset(bs[DDIR_WRITE]), .minval = 1, .help = "Block size unit", .def = "4k", + .parent = "rw", + }, + { + .name = "ba", + .alias = "blockalign", + .type = FIO_OPT_INT, + .off1 = td_var_offset(ba[DDIR_READ]), + .off2 = td_var_offset(ba[DDIR_WRITE]), + .minval = 1, + .help = "IO block offset alignment", + .parent = "rw", }, { .name = "bsrange", @@ -400,6 +1005,14 @@ static struct fio_option options[] = { .off4 = td_var_offset(max_bs[DDIR_WRITE]), .minval = 1, .help = "Set block size range (in more detail than bs)", + .parent = "rw", + }, + { + .name = "bssplit", + .type = FIO_OPT_STR, + .cb = str_bssplit_cb, + .help = "Set a specific mix of block sizes", + .parent = "rw", }, { .name = "bs_unaligned", @@ -407,13 +1020,7 @@ static struct fio_option options[] = { .type = FIO_OPT_STR_SET, .off1 = td_var_offset(bs_unaligned), .help = "Don't sector align IO buffer sizes", - }, - { - .name = "offset", - .type = FIO_OPT_STR_VAL, - .off1 = td_var_offset(start_offset), - .help = "Start IO from this offset", - .def = "0", + .parent = "rw", }, { .name = "randrepeat", @@ -421,12 +1028,22 @@ static struct fio_option options[] = { .off1 = td_var_offset(rand_repeatable), .help = "Use repeatable random IO pattern", .def = "1", + .parent = "rw", }, { .name = "norandommap", .type = FIO_OPT_STR_SET, .off1 = td_var_offset(norandommap), .help = "Accept potential duplicate random blocks", + .parent = "rw", + }, + { + .name = "softrandommap", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(softrandommap), + .help = "Set norandommap if randommap allocation fails", + .parent = "norandommap", + .def = "0", }, { .name = "nrfiles", @@ -457,7 +1074,19 @@ static struct fio_option options[] = { .oval = FIO_FSERVICE_RR, .help = "Round robin select files", }, + { .ival = "sequential", + .oval = FIO_FSERVICE_SEQ, + .help = "Finish one file before moving to the next", + }, }, + .parent = "nrfiles", + }, + { + .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", }, { .name = "fsync", @@ -466,6 +1095,13 @@ static struct fio_option options[] = { .help = "Issue fsync for writes every given number of blocks", .def = "0", }, + { + .name = "fdatasync", + .type = FIO_OPT_INT, + .off1 = td_var_offset(fdatasync_blocks), + .help = "Issue fdatasync for writes every given number of blocks", + .def = "0", + }, { .name = "direct", .type = FIO_OPT_BOOL, @@ -523,6 +1159,12 @@ static struct fio_option options[] = { .off1 = td_var_offset(time_based), .help = "Keep running until runtime/timeout is met", }, + { + .name = "ramp_time", + .type = FIO_OPT_STR_VAL_TIME, + .off1 = td_var_offset(ramp_time), + .help = "Ramp up time before measuring performance", + }, { .name = "mem", .alias = "iomem", @@ -558,6 +1200,16 @@ static struct fio_option options[] = { #endif }, }, + { + .name = "iomem_align", + .alias = "mem_align", + .type = FIO_OPT_INT, + .off1 = td_var_offset(mem_align), + .minval = 0, + .help = "IO memory buffer offset alignment", + .def = "0", + .parent = "iomem", + }, { .name = "verify", .type = FIO_OPT_STR, @@ -581,6 +1233,14 @@ static struct fio_option options[] = { .oval = VERIFY_CRC32, .help = "Use crc32 checksums for verification", }, + { .ival = "crc32c-intel", + .oval = VERIFY_CRC32C_INTEL, + .help = "Use hw crc32c checksums for verification", + }, + { .ival = "crc32c", + .oval = VERIFY_CRC32C, + .help = "Use crc32c checksums for verification", + }, { .ival = "crc16", .oval = VERIFY_CRC16, .help = "Use crc16 checksums for verification", @@ -589,6 +1249,22 @@ static struct fio_option options[] = { .oval = VERIFY_CRC7, .help = "Use crc7 checksums for verification", }, + { .ival = "sha1", + .oval = VERIFY_SHA1, + .help = "Use sha1 checksums for verification", + }, + { .ival = "sha256", + .oval = VERIFY_SHA256, + .help = "Use sha256 checksums for verification", + }, + { .ival = "sha512", + .oval = VERIFY_SHA512, + .help = "Use sha512 checksums for verification", + }, + { .ival = "meta", + .oval = VERIFY_META, + .help = "Use io information", + }, { .ival = "null", .oval = VERIFY_NULL, @@ -596,20 +1272,70 @@ static struct fio_option options[] = { }, }, }, + { + .name = "do_verify", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(do_verify), + .help = "Run verification stage after write", + .def = "1", + .parent = "verify", + }, { .name = "verifysort", .type = FIO_OPT_BOOL, .off1 = td_var_offset(verifysort), .help = "Sort written verify blocks for read back", .def = "1", + .parent = "verify", + }, + { + .name = "verify_interval", + .type = FIO_OPT_INT, + .off1 = td_var_offset(verify_interval), + .minval = 2 * sizeof(struct verify_header), + .help = "Store verify buffer header every N bytes", + .parent = "verify", + }, + { + .name = "verify_offset", + .type = FIO_OPT_INT, + .help = "Offset verify header location by N bytes", + .def = "0", + .cb = str_verify_offset_cb, + .parent = "verify", + }, + { + .name = "verify_pattern", + .type = FIO_OPT_STR, + .cb = str_verify_pattern_cb, + .help = "Fill pattern for IO buffers", + .parent = "verify", + }, + { + .name = "verify_fatal", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(verify_fatal), + .def = "0", + .help = "Exit on a single verify failure, don't continue", + .parent = "verify", }, { - .name = "header_interval", - .type = FIO_OPT_STR_VAL_INT, - .off1 = td_var_offset(header_interval), - .help = "Store buffer header every N bytes", - .def = "0", + .name = "verify_async", + .type = FIO_OPT_INT, + .off1 = td_var_offset(verify_async), + .def = "0", + .help = "Number of async verifier threads to use", + .parent = "verify", }, +#ifdef FIO_HAVE_CPU_AFFINITY + { + .name = "verify_async_cpus", + .type = FIO_OPT_STR, + .cb = str_verify_cpus_allowed_cb, + .help = "Set CPUs allowed for async verify threads", + .parent = "verify_async", + }, +#endif { .name = "write_iolog", .type = FIO_OPT_STR_STORE, @@ -663,17 +1389,10 @@ static struct fio_option options[] = { .help = "Lock down this amount of memory", .def = "0", }, - { - .name = "rwmixcycle", - .type = FIO_OPT_INT, - .off1 = td_var_offset(rwmixcycle), - .help = "Cycle period for mixed read/write workloads (msec)", - .def = "500", - }, { .name = "rwmixread", .type = FIO_OPT_INT, - .off1 = td_var_offset(rwmix[DDIR_READ]), + .cb = str_rwmix_read_cb, .maxval = 100, .help = "Percentage of mixed workload that is reads", .def = "50", @@ -681,11 +1400,15 @@ static struct fio_option options[] = { { .name = "rwmixwrite", .type = FIO_OPT_INT, - .off1 = td_var_offset(rwmix[DDIR_WRITE]), + .cb = str_rwmix_write_cb, .maxval = 100, .help = "Percentage of mixed workload that is writes", .def = "50", }, + { + .name = "rwmixcycle", + .type = FIO_OPT_DEPRECATED, + }, { .name = "nice", .type = FIO_OPT_INT, @@ -726,6 +1449,7 @@ static struct fio_option options[] = { .off1 = td_var_offset(thinktime_spin), .help = "Start think time by spinning this amount (usec)", .def = "0", + .parent = "thinktime", }, { .name = "thinktime_blocks", @@ -733,30 +1457,37 @@ static struct fio_option options[] = { .off1 = td_var_offset(thinktime_blocks), .help = "IO buffer period between 'thinktime'", .def = "1", + .parent = "thinktime", }, { .name = "rate", .type = FIO_OPT_INT, - .off1 = td_var_offset(rate), + .off1 = td_var_offset(rate[0]), + .off2 = td_var_offset(rate[1]), .help = "Set bandwidth rate", }, { .name = "ratemin", .type = FIO_OPT_INT, - .off1 = td_var_offset(ratemin), + .off1 = td_var_offset(ratemin[0]), + .off2 = td_var_offset(ratemin[1]), .help = "Job must meet this rate or it will be shutdown", + .parent = "rate", }, { .name = "rate_iops", .type = FIO_OPT_INT, - .off1 = td_var_offset(rate_iops), + .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", }, { .name = "rate_iops_min", .type = FIO_OPT_INT, - .off1 = td_var_offset(rate_iops_min), + .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", + .parent = "rate_iops", }, { .name = "ratecycle", @@ -764,6 +1495,7 @@ static struct fio_option options[] = { .off1 = td_var_offset(ratecycle), .help = "Window average for rate limits (msec)", .def = "1000", + .parent = "rate", }, { .name = "invalidate", @@ -778,12 +1510,14 @@ static struct fio_option options[] = { .off1 = td_var_offset(sync_io), .help = "Use O_SYNC for buffered writes", .def = "0", + .parent = "buffered", }, { .name = "bwavgtime", .type = FIO_OPT_INT, .off1 = td_var_offset(bw_avg_time), - .help = "Time window over which to calculate bandwidth (msec)", + .help = "Time window over which to calculate bandwidth" + " (msec)", .def = "500", }, { @@ -800,6 +1534,20 @@ static struct fio_option options[] = { .help = "Fsync file after creation", .def = "1", }, + { + .name = "create_on_open", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(create_on_open), + .help = "Create files when they are opened for IO", + .def = "0", + }, + { + .name = "pre_read", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(pre_read), + .help = "Preread files before starting official testing", + .def = "0", + }, { .name = "cpuload", .type = FIO_OPT_INT, @@ -812,6 +1560,7 @@ static struct fio_option options[] = { .off1 = td_var_offset(cpucycle), .help = "Length of the CPU burn cycles (usecs)", .def = "50000", + .parent = "cpuload", }, #ifdef FIO_HAVE_CPU_AFFINITY { @@ -874,19 +1623,21 @@ static struct fio_option options[] = { }, { .name = "write_bw_log", - .type = FIO_OPT_STR_SET, + .type = FIO_OPT_STR, .off1 = td_var_offset(write_bw_log), + .cb = str_write_bw_log_cb, .help = "Write log of bandwidth during run", }, { .name = "write_lat_log", - .type = FIO_OPT_STR_SET, + .type = FIO_OPT_STR, .off1 = td_var_offset(write_lat_log), + .cb = str_write_lat_log_cb, .help = "Write log of latency during run", }, { .name = "hugepage-size", - .type = FIO_OPT_STR_VAL, + .type = FIO_OPT_INT, .off1 = td_var_offset(hugepage_size), .help = "When using hugepages, specify size of each page", .def = __stringify(FIO_HUGE_PAGE), @@ -903,15 +1654,92 @@ static struct fio_option options[] = { .off1 = td_var_offset(zero_buffers), .help = "Init IO buffers to all zeroes", }, + { + .name = "refill_buffers", + .type = FIO_OPT_STR_SET, + .off1 = td_var_offset(refill_buffers), + .help = "Refill IO buffers on every IO submit", + }, #ifdef FIO_HAVE_DISK_UTIL { .name = "disk_util", .type = FIO_OPT_BOOL, .off1 = td_var_offset(do_disk_util), - .help = "Log disk utilization stats", + .help = "Log disk utilization statistics", .def = "1", }, #endif + { + .name = "gtod_reduce", + .type = FIO_OPT_BOOL, + .help = "Greatly reduce number of gettimeofday() calls", + .cb = str_gtod_reduce_cb, + .def = "0", + }, + { + .name = "disable_clat", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(disable_clat), + .help = "Disable completion latency numbers", + .parent = "gtod_reduce", + .def = "0", + }, + { + .name = "disable_slat", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(disable_slat), + .help = "Disable submissionn latency numbers", + .parent = "gtod_reduce", + .def = "0", + }, + { + .name = "disable_bw_measurement", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(disable_bw), + .help = "Disable bandwidth logging", + .parent = "gtod_reduce", + .def = "0", + }, + { + .name = "gtod_cpu", + .type = FIO_OPT_INT, + .cb = str_gtod_cpu_cb, + .help = "Setup dedicated gettimeofday() thread on this CPU", + .verify = gtod_cpu_verify, + }, + { + .name = "continue_on_error", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(continue_on_error), + .help = "Continue on non-fatal errors during I/O", + .def = "0", + }, + { + .name = "profile", + .type = FIO_OPT_STR, + .off1 = td_var_offset(profile), + .posval = { + { .ival = "tiobench", + .oval = PROFILE_TIOBENCH, + .help = "Perform tiobench like test", + }, + }, + .help = "Select a specific builtin performance test", + }, + { + .name = "cgroup", + .type = FIO_OPT_STR_STORE, + .off1 = td_var_offset(cgroup), + .help = "Add job to cgroup of this name", + }, + { + .name = "cgroup_weight", + .type = FIO_OPT_INT, + .off1 = td_var_offset(cgroup_weight), + .help = "Use given weight for cgroup", + .minval = 100, + .maxval = 1000, + }, { .name = NULL, }, @@ -930,7 +1758,7 @@ void fio_options_dup_and_init(struct option *long_options) o = &options[0]; while (o->name) { - long_options[i].name = o->name; + long_options[i].name = (char *) o->name; long_options[i].val = FIO_GETOPT_JOB; if (o->type == FIO_OPT_STR_SET) long_options[i].has_arg = no_argument; @@ -943,9 +1771,165 @@ void fio_options_dup_and_init(struct option *long_options) } } -int fio_option_parse(struct thread_data *td, const char *opt) +struct fio_keyword { + const char *word; + const char *desc; + char *replace; +}; + +static struct fio_keyword fio_keywords[] = { + { + .word = "$pagesize", + .desc = "Page size in the system", + }, + { + .word = "$mb_memory", + .desc = "Megabytes of memory online", + }, + { + .word = "$ncpus", + .desc = "Number of CPUs online in the system", + }, + { + .word = NULL, + }, +}; + +void fio_keywords_init(void) { - return parse_option(opt, options, td); + unsigned long mb_memory; + char buf[128]; + long l; + + sprintf(buf, "%lu", page_size); + fio_keywords[0].replace = strdup(buf); + + l = sysconf(_SC_PHYS_PAGES); + mb_memory = l * (page_size / 1024UL); + sprintf(buf, "%lu", mb_memory); + fio_keywords[1].replace = strdup(buf); + + l = sysconf(_SC_NPROCESSORS_ONLN); + sprintf(buf, "%lu", l); + fio_keywords[2].replace = strdup(buf); +} + +#define BC_APP "bc" + +static char *bc_calc(char *str) +{ + char *buf, *tmp, opt[80]; + FILE *f; + int ret; + + /* + * No math, just return string + */ + if (!strchr(str, '+') && !strchr(str, '-') && !strchr(str, '*') && + !strchr(str, '/')) + return str; + + /* + * Split option from value, we only need to calculate the value + */ + tmp = strchr(str, '='); + if (!tmp) + return str; + + tmp++; + memset(opt, 0, sizeof(opt)); + strncpy(opt, str, tmp - str); + + buf = malloc(128); + + 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); + f = popen(buf, "r"); + if (!f) { + free(buf); + return NULL; + } + + ret = fread(buf, 1, 128, f); + if (ret <= 0) { + free(buf); + return NULL; + } + + buf[ret - 1] = '\0'; + strcat(opt, buf); + strcpy(buf, opt); + pclose(f); + free(str); + return buf; +} + +/* + * Look for reserved variable names and replace them with real values + */ +static char *fio_keyword_replace(char *opt) +{ + char *s; + int i; + + for (i = 0; fio_keywords[i].word != NULL; i++) { + struct fio_keyword *kw = &fio_keywords[i]; + + while ((s = strstr(opt, kw->word)) != NULL) { + char *new = malloc(strlen(opt) + 1); + char *o_org = opt; + int olen = s - opt; + int len; + + /* + * Copy part of the string before the keyword and + * sprintf() the replacement after it. + */ + memcpy(new, opt, olen); + len = sprintf(new + olen, "%s", kw->replace); + + /* + * If there's more in the original string, copy that + * in too + */ + opt += strlen(kw->word) + olen; + if (strlen(opt)) + memcpy(new + olen + len, opt, opt - o_org - 1); + + /* + * replace opt and free the old opt + */ + opt = new; + //free(o_org); + + /* + * Check for potential math and invoke bc, if possible + */ + opt = bc_calc(opt); + } + } + + return opt; +} + +int fio_options_parse(struct thread_data *td, char **opts, int num_opts) +{ + int i, ret; + + sort_options(opts, options, num_opts); + + for (ret = 0, i = 0; i < num_opts; i++) { + opts[i] = fio_keyword_replace(opts[i]); + ret |= parse_option(opts[i], options, td); + } + + return ret; } int fio_cmd_option_parse(struct thread_data *td, const char *opt, char *val) @@ -1000,3 +1984,16 @@ void options_mem_free(struct thread_data fio_unused *td) __options_mem(td, 0); #endif } + +unsigned int fio_get_kb_base(void *data) +{ + struct thread_data *td = data; + unsigned int kb_base = 0; + + if (td) + kb_base = td->o.kb_base; + if (!kb_base) + kb_base = 1024; + + return kb_base; +}