X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=82d5ff51b47f684be065d848f1493aac63f6dbad;hp=9ba9ca566802eea7743b1ec9d177024d2938d6fc;hb=4241ea8fb0606f9bd5b7ed1278d3b7825883acf6;hpb=cd14cc1079771ece34fce5b30d47c7b273ee56e5

diff --git a/options.c b/options.c
index 9ba9ca56..82d5ff51 100644
--- a/options.c
+++ b/options.c
@@ -217,12 +217,27 @@ static int str_verify_offset_cb(void *data, unsigned int *off)
 	return 0;
 }
 
-static int str_verify_pattern_cb(void *data, unsigned int *off)
+static int str_verify_cb(void *data, const char *mem)
 {
 	struct thread_data *td = data;
-	unsigned int msb;
+	unsigned int nr, msb;
+	char *pat;
 
-	msb = fls(*off);
+	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)
@@ -232,7 +247,7 @@ static int str_verify_pattern_cb(void *data, unsigned int *off)
 	else
 		td->o.verify_pattern_bytes = 4;
 
-	td->o.verify_pattern = *off;
+	td->o.verify_pattern = nr;
 	return 0;
 }
 
@@ -311,13 +326,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,
@@ -390,12 +398,14 @@ 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",
@@ -412,6 +422,14 @@ 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",
@@ -421,6 +439,7 @@ static struct fio_option options[] = {
 		.minval = 1,
 		.help	= "Block size unit",
 		.def	= "4k",
+		.parent = "rw",
 	},
 	{
 		.name	= "bsrange",
@@ -432,6 +451,7 @@ 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	= "bs_unaligned",
@@ -439,13 +459,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",
@@ -453,12 +467,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",
@@ -490,6 +506,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",
@@ -594,6 +618,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 = {
@@ -629,6 +654,14 @@ static struct fio_option options[] = {
 			    .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",
 			    .oval = VERIFY_NULL,
@@ -636,12 +669,21 @@ 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",
@@ -649,6 +691,7 @@ static struct fio_option options[] = {
 		.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",
@@ -656,12 +699,15 @@ static struct fio_option options[] = {
 		.help	= "Offset verify header location by N bytes",
 		.def	= "0",
 		.cb	= str_verify_offset_cb,	
+		.parent	= "verify",
 	},
 	{
-		.name	= "verify_pattern",
-		.type	= FIO_OPT_INT,
-		.cb	= str_verify_pattern_cb,
-		.help	= "Fill pattern for IO buffers",
+		.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",
@@ -716,13 +762,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,
@@ -739,6 +778,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,
@@ -779,6 +826,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",
@@ -786,6 +834,7 @@ static struct fio_option options[] = {
 		.off1	= td_var_offset(thinktime_blocks),
 		.help	= "IO buffer period between 'thinktime'",
 		.def	= "1",
+		.parent	= "thinktime",
 	},
 	{
 		.name	= "rate",
@@ -798,6 +847,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",
@@ -810,6 +860,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",
@@ -817,6 +868,7 @@ static struct fio_option options[] = {
 		.off1	= td_var_offset(ratecycle),
 		.help	= "Window average for rate limits (msec)",
 		.def	= "1000",
+		.parent = "rate",
 	},
 	{
 		.name	= "invalidate",
@@ -831,6 +883,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",
@@ -865,6 +918,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
 	{