X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=verify.c;h=59a9ddedb6157c0e5a31171069fdb0bab6195bbf;hp=a0e26c9f97cdfc7f00902c86a740acca553501b1;hb=4a88edf731f806974124e68d66726715dbee6778;hpb=eef6eea1b935a67f1ae26b38e06a69d4410a12aa

diff --git a/verify.c b/verify.c
index a0e26c9f..59a9dded 100644
--- a/verify.c
+++ b/verify.c
@@ -81,9 +81,11 @@ static void fill_pattern(struct thread_data *td, void *p, unsigned int len)
 	}
 }
 
-static void memswp(void* buf1, void* buf2, unsigned int len)
+static void memswp(void *buf1, void *buf2, unsigned int len)
 {
-	struct verify_header swap;
+	char swap[200];
+
+	assert(len <= sizeof(swap));
 
 	memcpy(&swap, buf1, len);
 	memcpy(buf1, buf2, len);
@@ -110,6 +112,7 @@ static inline unsigned int __hdr_size(int verify_type)
 	switch (verify_type) {
 	case VERIFY_NONE:
 	case VERIFY_NULL:
+	case VERIFY_PATTERN:
 		len = 0;
 		break;
 	case VERIFY_MD5:
@@ -133,6 +136,9 @@ static inline unsigned int __hdr_size(int verify_type)
 	case VERIFY_SHA512:
 		len = sizeof(struct vhdr_sha512);
 		break;
+	case VERIFY_META:
+		len = sizeof(struct vhdr_meta);
+		break;
 	default:
 		log_err("fio: unknown verify header!\n");
 		assert(0);
@@ -163,6 +169,21 @@ static inline void *io_u_verify_off(struct verify_header *hdr,
 	return io_u->buf + header_num * hdr->len + hdr_size(hdr);
 }
 
+static int verify_io_u_meta(struct verify_header *hdr, struct thread_data *td,
+                            struct io_u *io_u, unsigned int header_num)
+{
+	struct vhdr_meta *vh = hdr_priv(hdr);
+
+	if (vh->offset != io_u->offset + header_num * td->o.verify_interval) {
+		log_err("meta: verify failed at %llu/%u\n",
+		              io_u->offset + header_num * hdr->len,
+		              hdr->len);
+		return EIO;
+	}
+
+	return 0;
+}
+
 static int verify_io_u_sha512(struct verify_header *hdr, struct io_u *io_u,
 			      unsigned int header_num)
 {
@@ -182,7 +203,7 @@ static int verify_io_u_sha512(struct verify_header *hdr, struct io_u *io_u,
 		              hdr->len);
 		hexdump(vh->sha512, sizeof(vh->sha512));
 		hexdump(sha512_ctx.buf, sizeof(sha512));
-		return 1;
+		return EIO;
 	}
 
 	return 0;
@@ -207,7 +228,7 @@ static int verify_io_u_sha256(struct verify_header *hdr, struct io_u *io_u,
 		              hdr->len);
 		hexdump(vh->sha256, sizeof(vh->sha256));
 		hexdump(sha256_ctx.buf, sizeof(sha256));
-		return 1;
+		return EIO;
 	}
 
 	return 0;
@@ -227,7 +248,7 @@ static int verify_io_u_crc7(struct verify_header *hdr, struct io_u *io_u,
 		                io_u->offset + header_num * hdr->len,
 				hdr->len);
 		log_err("crc7: wanted %x, got %x\n", vh->crc7, c);
-		return 1;
+		return EIO;
 	}
 
 	return 0;
@@ -247,7 +268,7 @@ static int verify_io_u_crc16(struct verify_header *hdr, struct io_u *io_u,
 		                io_u->offset + header_num * hdr->len,
 				hdr->len);
 		log_err("crc16: wanted %x, got %x\n", vh->crc16, c);
-		return 1;
+		return EIO;
 	}
 
 	return 0;
@@ -267,7 +288,7 @@ static int verify_io_u_crc64(struct verify_header *hdr, struct io_u *io_u,
 				io_u->offset + header_num * hdr->len,
 				hdr->len);
 		log_err("crc64: wanted %llx, got %llx\n", (unsigned long long) vh->crc64, c);
-		return 1;
+		return EIO;
 	}
 
 	return 0;
@@ -287,7 +308,7 @@ static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u,
 		                io_u->offset + header_num * hdr->len,
 				hdr->len);
 		log_err("crc32: wanted %x, got %x\n", vh->crc32, c);
-		return 1;
+		return EIO;
 	}
 
 	return 0;
@@ -312,7 +333,44 @@ static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u,
 		              hdr->len);
 		hexdump(vh->md5_digest, sizeof(vh->md5_digest));
 		hexdump(md5_ctx.hash, sizeof(hash));
-		return 1;
+		return EIO;
+	}
+
+	return 0;
+}
+
+static unsigned int hweight8(unsigned int w)
+{
+	unsigned int res = w - ((w >> 1) & 0x55);
+
+	res = (res & 0x33) + ((res >> 2) & 0x33);
+	return (res + (res >> 4)) & 0x0F;
+}
+
+int verify_io_u_pattern(unsigned long pattern, unsigned long pattern_size,
+                        char *buf, unsigned int len, unsigned int mod)
+{
+	unsigned int i;
+	char split_pattern[4];
+
+	for (i = 0; i < 4; i++) {
+		split_pattern[i] = pattern & 0xff;
+		pattern >>= 8;
+	}
+
+	for (i = 0; i < len; i++) {
+		if (buf[i] != split_pattern[mod]) {
+			unsigned int bits;
+
+			bits = hweight8(buf[i] ^ split_pattern[mod]);
+			log_err("fio: got pattern %x, wanted %x. Bad bits %d\n",
+				buf[i], split_pattern[mod], bits);
+			log_err("fio: bad pattern block offset %u\n", i);
+			return EIO;
+		}
+		mod++;
+		if (mod == pattern_size)
+			mod = 0;
 	}
 
 	return 0;
@@ -321,7 +379,7 @@ static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u,
 int verify_io_u(struct thread_data *td, struct io_u *io_u)
 {
 	struct verify_header *hdr;
-	unsigned int hdr_inc, hdr_num = 0;
+	unsigned int hdr_size, hdr_inc, hdr_num = 0;
 	void *p;
 	int ret;
 
@@ -332,10 +390,15 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
 	if (td->o.verify_interval)
 		hdr_inc = td->o.verify_interval;
 
-	for (p = io_u->buf; p < io_u->buf + io_u->buflen; p += hdr_inc) {
+	ret = 0;
+	for (p = io_u->buf; p < io_u->buf + io_u->buflen; p += hdr_inc, hdr_num++) {
+		if (ret && td->o.verify_fatal) {
+			td->terminate = 1;
+			break;
+		}
+		hdr_size = __hdr_size(td->o.verify);
 		if (td->o.verify_offset)
-			memswp(p, p + td->o.verify_offset, __hdr_size(td->o.verify));
-
+			memswp(p, p + td->o.verify_offset, hdr_size);
 		hdr = p;
 
 		if (hdr->fio_magic != FIO_HDR_MAGIC) {
@@ -365,14 +428,42 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
 		case VERIFY_SHA512:
 			ret = verify_io_u_sha512(hdr, io_u, hdr_num);
 			break;
+		case VERIFY_META:
+			ret = verify_io_u_meta(hdr, td, io_u, hdr_num);
+			break;
+		case VERIFY_PATTERN:
+			ret = verify_io_u_pattern(td->o.verify_pattern,
+			                          td->o.verify_pattern_bytes,
+			                          p + hdr_size,
+			                          hdr_inc - hdr_size,
+			                          hdr_size % 4);
+			if (ret)
+				log_err("fio: verify failed at %llu/%u\n",
+					io_u->offset + hdr_num * hdr->len,
+					hdr->len);
+			break;
 		default:
 			log_err("Bad verify type %u\n", hdr->verify_type);
-			ret = 1;
+			ret = EINVAL;
 		}
-		hdr_num++;
 	}
 
-	return 0;
+	return ret;
+}
+
+static void fill_meta(struct verify_header *hdr, struct thread_data *td,
+                      struct io_u *io_u, unsigned int header_num)
+{
+	struct vhdr_meta *vh = hdr_priv(hdr);
+
+	vh->thread = td->thread_number;
+
+	vh->time_sec = io_u->start_time.tv_sec;
+	vh->time_usec = io_u->start_time.tv_usec;
+
+	vh->numberio = td->io_issues[DDIR_WRITE];
+
+	vh->offset = io_u->offset + header_num * td->o.verify_interval;
 }
 
 static void fill_sha512(struct verify_header *hdr, void *p, unsigned int len)
@@ -444,7 +535,7 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
 {
 	struct verify_header *hdr;
 	void *p = io_u->buf, *data;
-	unsigned int hdr_inc, data_len;
+	unsigned int hdr_inc, data_len, header_num = 0;
 
 	if (td->o.verify == VERIFY_NULL)
 		return;
@@ -486,12 +577,18 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
 		case VERIFY_SHA512:
 			fill_sha512(hdr, data, data_len);
 			break;
+		case VERIFY_META:
+			fill_meta(hdr, td, io_u, header_num);
+			break;
+		case VERIFY_PATTERN:
+			break;
 		default:
 			log_err("fio: bad verify type: %d\n", td->o.verify);
 			assert(0);
 		}
 		if (td->o.verify_offset)
 			memswp(p, p + td->o.verify_offset, hdr_size(hdr));
+		header_num++;
 	}
 }