X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=0fc9955729f55ce54ce4a66d7284f5db74778097;hp=94eacbaaebbb6e7ca448bfefe17b735db7c659cd;hb=e7d2e61694c62b90a2fb84c012b4edcc1973d72c;hpb=9cce02e89e01984a5bf58e730fb9311dc5273554

diff --git a/options.c b/options.c
index 94eacbaa..0fc99557 100644
--- a/options.c
+++ b/options.c
@@ -8,6 +8,7 @@
 
 #include "fio.h"
 #include "parse.h"
+#include "fls.h"
 
 #define td_var_offset(var)	((size_t) &((struct thread_options *)0)->var)
 
@@ -73,6 +74,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 +90,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
@@ -203,6 +206,52 @@ 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_cb(void *data, const char *mem)
+{
+	struct thread_data *td = data;
+	unsigned int nr, msb;
+	char *pat;
+
+	if (td->o.verify != VERIFY_PATTERN)
+		return 0;
+
+	pat = get_opt_postfix(mem);
+	if (!pat) {
+		log_err("fio: missing pattern\n");
+		return 1;
+	}
+
+	if (strstr(pat, "0x") || strstr(pat, "0X"))
+		nr = strtol(pat, NULL, 16);
+	else
+		nr = strtol(pat, NULL, 16);
+
+	msb = fls(nr);
+	if (msb <= 8)
+		td->o.verify_pattern_bytes = 1;
+	else if (msb <= 16)
+		td->o.verify_pattern_bytes = 2;
+	else if (msb <= 24)
+		td->o.verify_pattern_bytes = 3;
+	else
+		td->o.verify_pattern_bytes = 4;
+
+	td->o.verify_pattern = nr;
+	return 0;
+}
 
 #define __stringify_1(x)	#x
 #define __stringify(x)		__stringify_1(x)
@@ -279,13 +328,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 +338,9 @@ static struct fio_option options[] = {
 			  { .ival = "sync",
 			    .help = "Use read/write",
 			  },
+			  { .ival = "psync",
+			    .help = "Use pread/pwrite",
+			  },
 #ifdef FIO_HAVE_LIBAIO
 			  { .ival = "libaio",
 			    .help = "Linux native asynchronous IO",
@@ -358,17 +403,20 @@ static struct fio_option options[] = {
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(iodepth_batch),
 		.help	= "Number of IO to submit in one go",
+		.parent	= "iodepth",
 	},
 	{
 		.name	= "iodepth_low",
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(iodepth_low),
 		.help	= "Low water mark for queuing depth",
+		.parent	= "iodepth",
 	},
 	{
 		.name	= "size",
 		.type	= FIO_OPT_STR_VAL,
 		.off1	= td_var_offset(size),
+		.minval = 1,
 		.help	= "Total size of device or files",
 	},
 	{
@@ -376,16 +424,27 @@ static struct fio_option options[] = {
 		.type	= FIO_OPT_STR_VAL,
 		.off1	= td_var_offset(file_size_low),
 		.off2	= td_var_offset(file_size_high),
+		.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,
 		.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	= "bsrange",
@@ -395,7 +454,9 @@ static struct fio_option options[] = {
 		.off2	= td_var_offset(max_bs[DDIR_READ]),
 		.off3	= td_var_offset(min_bs[DDIR_WRITE]),
 		.off4	= td_var_offset(max_bs[DDIR_WRITE]),
+		.minval = 1,
 		.help	= "Set block size range (in more detail than bs)",
+		.parent = "rw",
 	},
 	{
 		.name	= "bs_unaligned",
@@ -403,13 +464,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",
@@ -417,12 +472,14 @@ 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	= "nrfiles",
@@ -454,6 +511,14 @@ static struct fio_option options[] = {
 			    .help = "Round robin select files",
 			  },
 		},
+		.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",
@@ -558,6 +623,7 @@ static struct fio_option options[] = {
 		.name	= "verify",
 		.type	= FIO_OPT_STR,
 		.off1	= td_var_offset(verify),
+		.cb	= str_verify_cb,
 		.help	= "Verify data written",
 		.def	= "0",
 		.posval = {
@@ -565,13 +631,41 @@ static struct fio_option options[] = {
 			    .oval = VERIFY_NONE,
 			    .help = "Don't do IO verification",
 			  },
+			  { .ival = "md5",
+			    .oval = VERIFY_MD5,
+			    .help = "Use md5 checksums for verification",
+			  },
+			  { .ival = "crc64",
+			    .oval = VERIFY_CRC64,
+			    .help = "Use crc64 checksums for verification",
+			  },
 			  { .ival = "crc32",
 			    .oval = VERIFY_CRC32,
 			    .help = "Use crc32 checksums for verification",
 			  },
-			  { .ival = "md5",
-			    .oval = VERIFY_MD5,
-			    .help = "Use md5 checksums for verification",
+			  { .ival = "crc16",
+			    .oval = VERIFY_CRC16,
+			    .help = "Use crc16 checksums for verification",
+			  },
+			  { .ival = "crc7",
+			    .oval = VERIFY_CRC7,
+			    .help = "Use crc7 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 = "pattern",
+			    .oval = VERIFY_PATTERN,
+			    .help = "Verify a specific buffer pattern",
 			  },
 			  {
 			    .ival = "null",
@@ -580,12 +674,45 @@ 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_STR_VAL_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_STR_VAL_INT,
+		.help	= "Offset verify header location by N bytes",
+		.def	= "0",
+		.cb	= str_verify_offset_cb,	
+		.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	= "write_iolog",
@@ -640,13 +767,6 @@ 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,
@@ -663,6 +783,14 @@ static struct fio_option options[] = {
 		.help	= "Percentage of mixed workload that is writes",
 		.def	= "50",
 	},
+	{
+		.name	= "rwmixcycle",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(rwmixcycle),
+		.help	= "Cycle period for mixed read/write workloads (msec)",
+		.def	= "500",
+		.parent	= "rwmixread",
+	},
 	{
 		.name	= "nice",
 		.type	= FIO_OPT_INT,
@@ -703,6 +831,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",
@@ -710,6 +839,7 @@ static struct fio_option options[] = {
 		.off1	= td_var_offset(thinktime_blocks),
 		.help	= "IO buffer period between 'thinktime'",
 		.def	= "1",
+		.parent	= "thinktime",
 	},
 	{
 		.name	= "rate",
@@ -722,6 +852,7 @@ static struct fio_option options[] = {
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(ratemin),
 		.help	= "Job must meet this rate or it will be shutdown",
+		.parent	= "rate",
 	},
 	{
 		.name	= "rate_iops",
@@ -734,6 +865,7 @@ static struct fio_option options[] = {
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(rate_iops_min),
 		.help	= "Job must meet this rate or it will be shutdown",
+		.parent	= "rate_iops",
 	},
 	{
 		.name	= "ratecycle",
@@ -741,6 +873,7 @@ static struct fio_option options[] = {
 		.off1	= td_var_offset(ratecycle),
 		.help	= "Window average for rate limits (msec)",
 		.def	= "1000",
+		.parent = "rate",
 	},
 	{
 		.name	= "invalidate",
@@ -755,6 +888,7 @@ static struct fio_option options[] = {
 		.off1	= td_var_offset(sync_io),
 		.help	= "Use O_SYNC for buffered writes",
 		.def	= "0",
+		.parent = "buffered",
 	},
 	{
 		.name	= "bwavgtime",
@@ -789,6 +923,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
 	{