X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=verify.c;h=7c12491d12d470a1de78759eaeed7d2ea7a8954e;hb=a26fc7c568964658aa2b98610ebd9054e2477456;hp=d9a68d656e490ca2d9a3e0b6a76777895e08f045;hpb=7437ee87e4f6457168e8440f9308b4296ddb9263;p=fio.git

diff --git a/verify.c b/verify.c
index d9a68d65..7c12491d 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:
@@ -336,10 +339,47 @@ static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u,
 	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 1;
+		}
+		mod++;
+		if (mod == pattern_size)
+			mod = 0;
+	}
+
+	return 0;
+}
+
 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;
 
@@ -350,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) {
@@ -386,14 +431,24 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
 		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;
 		}
-		hdr_num++;
 	}
 
-	return 0;
+	return ret;
 }
 
 static void fill_meta(struct verify_header *hdr, struct thread_data *td,
@@ -525,6 +580,8 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
 		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);