X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=verify.c;h=5770b46112270252696a25575a21e14caaf07b44;hp=42a56d7162631e51be05d10394b40fa91b1bd382;hb=90059d65bde4804e4da07401ad6902c1d956b592;hpb=8c432325c3df2075a77b27eab8a87704cf7b48ee

diff --git a/verify.c b/verify.c
index 42a56d71..5770b461 100644
--- a/verify.c
+++ b/verify.c
@@ -8,8 +8,7 @@
 
 #include "fio.h"
 
-static void fill_random_bytes(struct thread_data *td,
-			      unsigned char *p, unsigned int len)
+static void fill_random_bytes(struct thread_data *td, void *p, unsigned int len)
 {
 	unsigned int todo;
 	int r;
@@ -32,6 +31,57 @@ static void fill_random_bytes(struct thread_data *td,
 	}
 }
 
+static void fill_pattern(struct thread_data *td, void *p, unsigned int len)
+{
+	switch (td->o.verify_pattern_bytes) {
+	case 0:
+		fill_random_bytes(td, p, len);
+		break;
+	case 1:
+		memset(p, td->o.verify_pattern, len);
+		break;
+	case 2:
+	case 3:
+	case 4: {
+		unsigned int pattern = td->o.verify_pattern;
+		unsigned int i = 0;
+		unsigned char c1, c2, c3, c4;
+		unsigned char *b = p;
+
+		c1 = pattern & 0xff;
+		pattern >>= 8;
+		c2 = pattern & 0xff;
+		pattern >>= 8;
+		c3 = pattern & 0xff;
+		pattern >>= 8;
+		c4 = pattern & 0xff;
+
+		while (i < len) {
+			b[i++] = c1;
+			if (i == len)
+				break;
+			b[i++] = c2;
+			if (td->o.verify_pattern_bytes == 2 || i == len)
+				continue;
+			b[i++] = c3;
+			if (td->o.verify_pattern_bytes == 3 || i == len)
+				continue;
+			b[i++] = c4;
+		}
+		break;
+		}
+	}
+}
+
+static void memswp(void* buf1, void* buf2, unsigned int len)
+{
+	struct verify_header swap;
+
+	memcpy(&swap, buf1, len);
+	memcpy(buf1, buf2, len);
+	memcpy(buf2, &swap, len);
+}
+
 static void hexdump(void *buffer, int len)
 {
 	unsigned char *p = buffer;
@@ -42,16 +92,28 @@ static void hexdump(void *buffer, int len)
 	log_info("\n");
 }
 
-static int verify_io_u_crc7(struct verify_header *hdr, struct io_u *io_u)
+/*
+ * 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)
+{
+	return io_u->buf + sizeof(*hdr) + header_num * hdr->len;
+}
+
+static int verify_io_u_crc7(struct verify_header *hdr, struct io_u *io_u,
+                            unsigned char header_num)
 {
-	unsigned char *p = io_u->buf;
+	void *p = io_u_verify_off(hdr, io_u, header_num);
 	unsigned char c;
 
-	p += sizeof(*hdr);
 	c = crc7(p, hdr->len - sizeof(*hdr));
 
 	if (c != hdr->crc7) {
-		log_err("crc7: verify failed at %llu/%lu\n", io_u->offset, io_u->buflen);
+		log_err("crc7: verify failed at %llu/%u\n",
+		                io_u->offset + header_num * hdr->len,
+				hdr->len);
 		log_err("crc7: wanted %x, got %x\n", hdr->crc7, c);
 		return 1;
 	}
@@ -59,16 +121,18 @@ static int verify_io_u_crc7(struct verify_header *hdr, struct io_u *io_u)
 	return 0;
 }
 
-static int verify_io_u_crc16(struct verify_header *hdr, struct io_u *io_u)
+static int verify_io_u_crc16(struct verify_header *hdr, struct io_u *io_u,
+                             unsigned int header_num)
 {
-	unsigned char *p = io_u->buf;
+	void *p = io_u_verify_off(hdr, io_u, header_num);
 	unsigned short c;
 
-	p += sizeof(*hdr);
 	c = crc16(p, hdr->len - sizeof(*hdr));
 
 	if (c != hdr->crc16) {
-		log_err("crc16: verify failed at %llu/%lu\n", io_u->offset, io_u->buflen);
+		log_err("crc16: verify failed at %llu/%u\n",
+		                io_u->offset + header_num * hdr->len,
+				hdr->len);
 		log_err("crc16: wanted %x, got %x\n", hdr->crc16, c);
 		return 1;
 	}
@@ -76,16 +140,37 @@ static int verify_io_u_crc16(struct verify_header *hdr, struct io_u *io_u)
 	return 0;
 }
 
-static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u)
+static int verify_io_u_crc64(struct verify_header *hdr, struct io_u *io_u,
+                             unsigned int header_num)
 {
-	unsigned char *p = io_u->buf;
+	void *p = io_u_verify_off(hdr, io_u, header_num);
+	unsigned long long c;
+
+	c = crc64(p, hdr->len - sizeof(*hdr));
+
+	if (c != hdr->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", hdr->crc64, c);
+		return 1;
+	}
+
+	return 0;
+}
+
+static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u,
+		             unsigned int header_num)
+{
+	void *p = io_u_verify_off(hdr, io_u, header_num);
 	unsigned long c;
 
-	p += sizeof(*hdr);
 	c = crc32(p, hdr->len - sizeof(*hdr));
 
 	if (c != hdr->crc32) {
-		log_err("crc32: verify failed at %llu/%lu\n", io_u->offset, io_u->buflen);
+		log_err("crc32: verify failed at %llu/%u\n",
+		                io_u->offset + header_num * hdr->len,
+				hdr->len);
 		log_err("crc32: wanted %lx, got %lx\n", hdr->crc32, c);
 		return 1;
 	}
@@ -93,18 +178,22 @@ static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u)
 	return 0;
 }
 
-static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u)
+static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u,
+		           unsigned int header_num)
 {
-	unsigned char *p = io_u->buf + sizeof(*hdr);
+	void *p = io_u_verify_off(hdr, io_u, header_num);
 	uint32_t hash[MD5_HASH_WORDS];
 	struct md5_ctx md5_ctx = {
 		.hash = hash,
 	};
 
+	memset(md5_ctx.hash, 0, sizeof(hdr->md5_digest));
 	md5_update(&md5_ctx, p, hdr->len - sizeof(*hdr));
 
 	if (memcmp(hdr->md5_digest, md5_ctx.hash, sizeof(hash))) {
-		log_err("md5: verify failed at %llu/%lu\n", io_u->offset, io_u->buflen);
+		log_err("md5: verify failed at %llu/%u\n",
+		              io_u->offset + header_num * hdr->len,
+		              hdr->len);
 		hexdump(hdr->md5_digest, sizeof(hdr->md5_digest));
 		hexdump(md5_ctx.hash, sizeof(hash));
 		return 1;
@@ -115,37 +204,51 @@ 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 = (struct verify_header *) io_u->buf;
+	struct verify_header *hdr;
+	unsigned int hdr_inc, hdr_num = 0;
+	void *p;
 	int ret;
 
 	if (td->o.verify == VERIFY_NULL || io_u->ddir != DDIR_READ)
 		return 0;
 
-	if (hdr->fio_magic != FIO_HDR_MAGIC) {
-		log_err("Bad verify header %x\n", hdr->fio_magic);
-		return EIO;
-	}
+	hdr_inc = io_u->buflen;
+	if (td->o.verify_interval)
+		hdr_inc = td->o.verify_interval;
 
-	switch (hdr->verify_type) {
-	case VERIFY_MD5:
-		ret = verify_io_u_md5(hdr, io_u);
-		break;
-	case VERIFY_CRC32:
-		ret = verify_io_u_crc32(hdr, io_u);
-		break;
-	case VERIFY_CRC16:
-		ret = verify_io_u_crc16(hdr, io_u);
-		break;
-	case VERIFY_CRC7:
-		ret = verify_io_u_crc7(hdr, io_u);
-		break;
-	default:
-		log_err("Bad verify type %u\n", hdr->verify_type);
-		ret = 1;
-	}
+	for (p = io_u->buf; p < io_u->buf + io_u->buflen; p += hdr_inc) {
+		if (td->o.verify_offset)
+			memswp(p, p + td->o.verify_offset, sizeof(*hdr));
+
+		hdr = p;
+
+		if (hdr->fio_magic != FIO_HDR_MAGIC) {
+			log_err("Bad verify header %x\n", hdr->fio_magic);
+			return EIO;
+		}
 
-	if (ret)
-		return EIO;
+		switch (hdr->verify_type) {
+		case VERIFY_MD5:
+			ret = verify_io_u_md5(hdr, io_u, hdr_num);
+			break;
+		case VERIFY_CRC64:
+			ret = verify_io_u_crc64(hdr, io_u, hdr_num);
+			break;
+		case VERIFY_CRC32:
+			ret = verify_io_u_crc32(hdr, io_u, hdr_num);
+			break;
+		case VERIFY_CRC16:
+			ret = verify_io_u_crc16(hdr, io_u, hdr_num);
+			break;
+		case VERIFY_CRC7:
+			ret = verify_io_u_crc7(hdr, io_u, hdr_num);
+			break;
+		default:
+			log_err("Bad verify type %u\n", hdr->verify_type);
+			ret = 1;
+		}
+		hdr_num++;
+	}
 
 	return 0;
 }
@@ -165,12 +268,18 @@ static void fill_crc32(struct verify_header *hdr, void *p, unsigned int len)
 	hdr->crc32 = crc32(p, len);
 }
 
+static void fill_crc64(struct verify_header *hdr, void *p, unsigned int len)
+{
+	hdr->crc64 = crc64(p, len);
+}
+
 static void fill_md5(struct verify_header *hdr, void *p, unsigned int len)
 {
 	struct md5_ctx md5_ctx = {
 		.hash = (uint32_t *) hdr->md5_digest,
 	};
 
+	memset(md5_ctx.hash, 0, sizeof(hdr->md5_digest));
 	md5_update(&md5_ctx, p, len);
 }
 
@@ -180,37 +289,50 @@ static void fill_md5(struct verify_header *hdr, void *p, unsigned int len)
  */
 void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
 {
-	const unsigned int len = io_u->buflen - sizeof(struct verify_header);
 	struct verify_header *hdr;
-	unsigned char *p;
+	void *p = io_u->buf, *data;
+	unsigned int hdr_inc, data_len;
 
 	if (td->o.verify == VERIFY_NULL)
 		return;
 
-	hdr = (struct verify_header *) io_u->buf;
-	hdr->fio_magic = FIO_HDR_MAGIC;
-	hdr->len = io_u->buflen;
-	hdr->verify_type = td->o.verify;
-
-	p = io_u->buf + sizeof(*hdr);
-	fill_random_bytes(td, p, len);
-
-	switch (td->o.verify) {
-	case VERIFY_MD5:
-		fill_md5(hdr, p, len);
-		break;
-	case VERIFY_CRC32:
-		fill_crc32(hdr, p, len);
-		break;
-	case VERIFY_CRC16:
-		fill_crc16(hdr, p, len);
-		break;
-	case VERIFY_CRC7:
-		fill_crc7(hdr, p, len);
-		break;
-	default:
-		log_err("fio: bad verify type: %d\n", td->o.verify);
-		assert(0);
+	fill_pattern(td, p, io_u->buflen);
+
+	hdr_inc = io_u->buflen;
+	if (td->o.verify_interval)
+		hdr_inc = td->o.verify_interval;
+	data_len = hdr_inc - sizeof(*hdr);
+
+	for (;p < io_u->buf + io_u->buflen; p += hdr_inc) {
+		hdr = p;
+
+		hdr->fio_magic = FIO_HDR_MAGIC;
+		hdr->verify_type = td->o.verify;
+		hdr->len = hdr_inc;
+
+		data = p + sizeof(*hdr);
+		switch (td->o.verify) {
+		case VERIFY_MD5:
+			fill_md5(hdr, data, data_len);
+			break;
+		case VERIFY_CRC64:
+			fill_crc64(hdr, data, data_len);
+			break;
+		case VERIFY_CRC32:
+			fill_crc32(hdr, data, data_len);
+			break;
+		case VERIFY_CRC16:
+			fill_crc16(hdr, data, data_len);
+			break;
+		case VERIFY_CRC7:
+			fill_crc7(hdr, data, data_len);
+			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, sizeof(*hdr));
 	}
 }