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

diff --git a/verify.c b/verify.c
index d9a68d65..6de0b884 100644
--- a/verify.c
+++ b/verify.c
@@ -11,6 +11,7 @@
 #include "crc/md5.h"
 #include "crc/crc64.h"
 #include "crc/crc32.h"
+#include "crc/crc32c.h"
 #include "crc/crc16.h"
 #include "crc/crc7.h"
 #include "crc/sha256.h"
@@ -43,9 +44,11 @@ static void fill_pattern(struct thread_data *td, void *p, unsigned int len)
 {
 	switch (td->o.verify_pattern_bytes) {
 	case 0:
+		dprint(FD_VERIFY, "fill random bytes len=%u\n", len);
 		fill_random_bytes(td, p, len);
 		break;
 	case 1:
+		dprint(FD_VERIFY, "fill verify pattern b=0 len=%u\n", len);
 		memset(p, td->o.verify_pattern, len);
 		break;
 	case 2:
@@ -56,6 +59,9 @@ static void fill_pattern(struct thread_data *td, void *p, unsigned int len)
 		unsigned char c1, c2, c3, c4;
 		unsigned char *b = p;
 
+		dprint(FD_VERIFY, "fill verify pattern b=%d len=%u\n",
+					td->o.verify_pattern_bytes, len);
+
 		c1 = pattern & 0xff;
 		pattern >>= 8;
 		c2 = pattern & 0xff;
@@ -81,9 +87,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);
@@ -105,7 +113,7 @@ static void hexdump(void *buffer, int len)
  */
 static inline unsigned int __hdr_size(int verify_type)
 {
-	unsigned int len;
+	unsigned int len = len;
 
 	switch (verify_type) {
 	case VERIFY_NONE:
@@ -118,7 +126,9 @@ static inline unsigned int __hdr_size(int verify_type)
 	case VERIFY_CRC64:
 		len = sizeof(struct vhdr_crc64);
 		break;
+	case VERIFY_CRC32C:
 	case VERIFY_CRC32:
+	case VERIFY_CRC32C_INTEL:
 		len = sizeof(struct vhdr_crc32);
 		break;
 	case VERIFY_CRC16:
@@ -160,22 +170,22 @@ static void *hdr_priv(struct verify_header *hdr)
  * Return data area 'header_num'
  */
 static inline void *io_u_verify_off(struct verify_header *hdr,
-				    struct io_u *io_u,
-				    unsigned char header_num)
+				    struct io_u *io_u, unsigned char header_num)
 {
 	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 io_u *io_u, unsigned int header_num)
 {
 	struct vhdr_meta *vh = hdr_priv(hdr);
 
+	dprint(FD_VERIFY, "meta verify io_u %p, len %u\n", io_u, hdr->len);
+
 	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 1;
+				io_u->offset + header_num * hdr->len, hdr->len);
+		return EILSEQ;
 	}
 
 	return 0;
@@ -191,16 +201,17 @@ static int verify_io_u_sha512(struct verify_header *hdr, struct io_u *io_u,
 		.buf = sha512,
 	};
 
+	dprint(FD_VERIFY, "sha512 verify io_u %p, len %u\n", io_u, hdr->len);
+
 	sha512_init(&sha512_ctx);
 	sha512_update(&sha512_ctx, p, hdr->len - hdr_size(hdr));
 
 	if (memcmp(vh->sha512, sha512_ctx.buf, sizeof(sha512))) {
 		log_err("sha512: verify failed at %llu/%u\n",
-		              io_u->offset + header_num * hdr->len,
-		              hdr->len);
+				io_u->offset + header_num * hdr->len, hdr->len);
 		hexdump(vh->sha512, sizeof(vh->sha512));
 		hexdump(sha512_ctx.buf, sizeof(sha512));
-		return 1;
+		return EILSEQ;
 	}
 
 	return 0;
@@ -216,103 +227,134 @@ static int verify_io_u_sha256(struct verify_header *hdr, struct io_u *io_u,
 		.buf = sha256,
 	};
 
+	dprint(FD_VERIFY, "sha256 verify io_u %p, len %u\n", io_u, hdr->len);
+
 	sha256_init(&sha256_ctx);
 	sha256_update(&sha256_ctx, p, hdr->len - hdr_size(hdr));
 
 	if (memcmp(vh->sha256, sha256_ctx.buf, sizeof(sha256))) {
 		log_err("sha256: verify failed at %llu/%u\n",
-		              io_u->offset + header_num * hdr->len,
-		              hdr->len);
+				io_u->offset + header_num * hdr->len, hdr->len);
 		hexdump(vh->sha256, sizeof(vh->sha256));
 		hexdump(sha256_ctx.buf, sizeof(sha256));
-		return 1;
+		return EILSEQ;
 	}
 
 	return 0;
 }
 
 static int verify_io_u_crc7(struct verify_header *hdr, struct io_u *io_u,
-                            unsigned char header_num)
+			    unsigned char header_num)
 {
 	void *p = io_u_verify_off(hdr, io_u, header_num);
 	struct vhdr_crc7 *vh = hdr_priv(hdr);
 	unsigned char c;
 
+	dprint(FD_VERIFY, "crc7 verify io_u %p, len %u\n", io_u, hdr->len);
+
 	c = crc7(p, hdr->len - hdr_size(hdr));
 
 	if (c != vh->crc7) {
 		log_err("crc7: verify failed at %llu/%u\n",
-		                io_u->offset + header_num * hdr->len,
-				hdr->len);
+				io_u->offset + header_num * hdr->len, hdr->len);
 		log_err("crc7: wanted %x, got %x\n", vh->crc7, c);
-		return 1;
+		return EILSEQ;
 	}
 
 	return 0;
 }
 
 static int verify_io_u_crc16(struct verify_header *hdr, struct io_u *io_u,
-                             unsigned int header_num)
+			     unsigned int header_num)
 {
 	void *p = io_u_verify_off(hdr, io_u, header_num);
 	struct vhdr_crc16 *vh = hdr_priv(hdr);
 	unsigned short c;
 
+	dprint(FD_VERIFY, "crc16 verify io_u %p, len %u\n", io_u, hdr->len);
+
 	c = crc16(p, hdr->len - hdr_size(hdr));
 
 	if (c != vh->crc16) {
 		log_err("crc16: verify failed at %llu/%u\n",
-		                io_u->offset + header_num * hdr->len,
-				hdr->len);
+				io_u->offset + header_num * hdr->len, hdr->len);
 		log_err("crc16: wanted %x, got %x\n", vh->crc16, c);
-		return 1;
+		return EILSEQ;
 	}
 
 	return 0;
 }
 
 static int verify_io_u_crc64(struct verify_header *hdr, struct io_u *io_u,
-                             unsigned int header_num)
+			     unsigned int header_num)
 {
 	void *p = io_u_verify_off(hdr, io_u, header_num);
 	struct vhdr_crc64 *vh = hdr_priv(hdr);
 	unsigned long long c;
 
+	dprint(FD_VERIFY, "crc64 verify io_u %p, len %u\n", io_u, hdr->len);
+
 	c = crc64(p, hdr->len - hdr_size(hdr));
 
 	if (c != vh->crc64) {
 		log_err("crc64: verify failed at %llu/%u\n",
 				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;
+		log_err("crc64: wanted %llx, got %llx\n",
+					(unsigned long long) vh->crc64, c);
+		return EILSEQ;
 	}
 
 	return 0;
 }
 
 static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u,
-		             unsigned int header_num)
+			     unsigned int header_num)
 {
 	void *p = io_u_verify_off(hdr, io_u, header_num);
 	struct vhdr_crc32 *vh = hdr_priv(hdr);
 	uint32_t c;
 
+	dprint(FD_VERIFY, "crc32 verify io_u %p, len %u\n", io_u, hdr->len);
+
 	c = crc32(p, hdr->len - hdr_size(hdr));
 
 	if (c != vh->crc32) {
 		log_err("crc32: verify failed at %llu/%u\n",
-		                io_u->offset + header_num * hdr->len,
-				hdr->len);
+				io_u->offset + header_num * hdr->len, hdr->len);
 		log_err("crc32: wanted %x, got %x\n", vh->crc32, c);
-		return 1;
+		return EILSEQ;
+	}
+
+	return 0;
+}
+
+static int verify_io_u_crc32c(struct verify_header *hdr, struct io_u *io_u,
+			      unsigned int header_num)
+{
+	void *p = io_u_verify_off(hdr, io_u, header_num);
+	struct vhdr_crc32 *vh = hdr_priv(hdr);
+	uint32_t c;
+
+	dprint(FD_VERIFY, "crc32c verify io_u %p, len %u\n", io_u, hdr->len);
+
+	if (hdr->verify_type == VERIFY_CRC32C_INTEL)
+		c = crc32c_intel(p, hdr->len - hdr_size(hdr));
+	else
+		c = crc32c(p, hdr->len - hdr_size(hdr));
+
+	if (c != vh->crc32) {
+		log_err("crc32c: verify failed at %llu/%u\n",
+				io_u->offset + header_num * hdr->len, hdr->len);
+		log_err("crc32c: wanted %x, got %x\n", vh->crc32, c);
+		return EILSEQ;
 	}
 
 	return 0;
 }
 
 static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u,
-		           unsigned int header_num)
+			   unsigned int header_num)
 {
 	void *p = io_u_verify_off(hdr, io_u, header_num);
 	struct vhdr_md5 *vh = hdr_priv(hdr);
@@ -321,16 +363,54 @@ static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u,
 		.hash = hash,
 	};
 
+	dprint(FD_VERIFY, "md5 verify io_u %p, len %u\n", io_u, hdr->len);
+
 	md5_init(&md5_ctx);
 	md5_update(&md5_ctx, p, hdr->len - hdr_size(hdr));
 
 	if (memcmp(vh->md5_digest, md5_ctx.hash, sizeof(hash))) {
 		log_err("md5: verify failed at %llu/%u\n",
-		              io_u->offset + header_num * hdr->len,
-		              hdr->len);
+				io_u->offset + header_num * hdr->len, hdr->len);
 		hexdump(vh->md5_digest, sizeof(vh->md5_digest));
 		hexdump(md5_ctx.hash, sizeof(hash));
-		return 1;
+		return EILSEQ;
+	}
+
+	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 EILSEQ;
+		}
+		mod++;
+		if (mod == pattern_size)
+			mod = 0;
 	}
 
 	return 0;
@@ -339,7 +419,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;
 
@@ -350,15 +430,36 @@ 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) {
 			log_err("Bad verify header %x\n", hdr->fio_magic);
-			return EIO;
+			return EILSEQ;
+		}
+
+		if (td->o.verify_pattern_bytes) {
+			dprint(FD_VERIFY, "pattern verify io_u %p, len %u\n",
+								io_u, hdr->len);
+			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);
+			continue;
 		}
 
 		switch (hdr->verify_type) {
@@ -368,6 +469,10 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
 		case VERIFY_CRC64:
 			ret = verify_io_u_crc64(hdr, io_u, hdr_num);
 			break;
+		case VERIFY_CRC32C:
+		case VERIFY_CRC32C_INTEL:
+			ret = verify_io_u_crc32c(hdr, io_u, hdr_num);
+			break;
 		case VERIFY_CRC32:
 			ret = verify_io_u_crc32(hdr, io_u, hdr_num);
 			break;
@@ -388,16 +493,15 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
 			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 io_u *io_u, unsigned int header_num)
 {
 	struct vhdr_meta *vh = hdr_priv(hdr);
 
@@ -454,6 +558,16 @@ static void fill_crc32(struct verify_header *hdr, void *p, unsigned int len)
 	vh->crc32 = crc32(p, len);
 }
 
+static void fill_crc32c(struct verify_header *hdr, void *p, unsigned int len)
+{
+	struct vhdr_crc32 *vh = hdr_priv(hdr);
+
+	if (hdr->verify_type == VERIFY_CRC32C_INTEL)
+		vh->crc32 = crc32c_intel(p, len);
+	else
+		vh->crc32 = crc32c(p, len);
+}
+
 static void fill_crc64(struct verify_header *hdr, void *p, unsigned int len)
 {
 	struct vhdr_crc64 *vh = hdr_priv(hdr);
@@ -491,7 +605,7 @@ void populate_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 + io_u->buflen; p += hdr_inc) {
+	for (; p < io_u->buf + io_u->buflen; p += hdr_inc) {
 		hdr = p;
 
 		hdr->fio_magic = FIO_HDR_MAGIC;
@@ -502,27 +616,49 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
 		data = p + hdr_size(hdr);
 		switch (td->o.verify) {
 		case VERIFY_MD5:
+			dprint(FD_VERIFY, "fill md5 io_u %p, len %u\n",
+							io_u, hdr->len);
 			fill_md5(hdr, data, data_len);
 			break;
 		case VERIFY_CRC64:
+			dprint(FD_VERIFY, "fill crc64 io_u %p, len %u\n",
+							io_u, hdr->len);
 			fill_crc64(hdr, data, data_len);
 			break;
+		case VERIFY_CRC32C:
+		case VERIFY_CRC32C_INTEL:
+			dprint(FD_VERIFY, "fill crc32c io_u %p, len %u\n",
+							io_u, hdr->len);
+			fill_crc32c(hdr, data, data_len);
+			break;
 		case VERIFY_CRC32:
+			dprint(FD_VERIFY, "fill crc32 io_u %p, len %u\n",
+							io_u, hdr->len);
 			fill_crc32(hdr, data, data_len);
 			break;
 		case VERIFY_CRC16:
+			dprint(FD_VERIFY, "fill crc16 io_u %p, len %u\n",
+							io_u, hdr->len);
 			fill_crc16(hdr, data, data_len);
 			break;
 		case VERIFY_CRC7:
+			dprint(FD_VERIFY, "fill crc7 io_u %p, len %u\n",
+							io_u, hdr->len);
 			fill_crc7(hdr, data, data_len);
 			break;
 		case VERIFY_SHA256:
+			dprint(FD_VERIFY, "fill sha256 io_u %p, len %u\n",
+							io_u, hdr->len);
 			fill_sha256(hdr, data, data_len);
 			break;
 		case VERIFY_SHA512:
+			dprint(FD_VERIFY, "fill sha512 io_u %p, len %u\n",
+							io_u, hdr->len);
 			fill_sha512(hdr, data, data_len);
 			break;
 		case VERIFY_META:
+			dprint(FD_VERIFY, "fill meta io_u %p, len %u\n",
+							io_u, hdr->len);
 			fill_meta(hdr, td, io_u, header_num);
 			break;
 		default:
@@ -550,9 +686,9 @@ int get_next_verify(struct thread_data *td, struct io_u *io_u)
 
 		ipo = rb_entry(n, struct io_piece, rb_node);
 		rb_erase(n, &td->io_hist_tree);
-	} else if (!list_empty(&td->io_hist_list)) {
-		ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
-		list_del(&ipo->list);
+	} else if (!flist_empty(&td->io_hist_list)) {
+		ipo = flist_entry(td->io_hist_list.next, struct io_piece, list);
+		flist_del(&ipo->list);
 	}
 
 	if (ipo) {
@@ -560,21 +696,26 @@ int get_next_verify(struct thread_data *td, struct io_u *io_u)
 		io_u->buflen = ipo->len;
 		io_u->file = ipo->file;
 
-		if ((io_u->file->flags & FIO_FILE_OPEN) == 0) {
+		if (!fio_file_open(io_u->file)) {
 			int r = td_io_open_file(td, io_u->file);
 
-			if (r)
+			if (r) {
+				dprint(FD_VERIFY, "failed file %s open\n",
+						io_u->file->file_name);
 				return 1;
+			}
 		}
 
 		get_file(ipo->file);
-		assert(io_u->file->flags & FIO_FILE_OPEN);
+		assert(fio_file_open(io_u->file));
 		io_u->ddir = DDIR_READ;
 		io_u->xfer_buf = io_u->buf;
 		io_u->xfer_buflen = io_u->buflen;
 		free(ipo);
+		dprint(FD_VERIFY, "get_next_verify: ret io_u %p\n", io_u);
 		return 0;
 	}
 
+	dprint(FD_VERIFY, "get_next_verify: empty\n");
 	return 1;
 }