X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=verify.c;h=42a56d7162631e51be05d10394b40fa91b1bd382;hp=794244a9b495240974f26f1e4f972f38ec1cc8c2;hb=8c432325c3df2075a77b27eab8a87704cf7b48ee;hpb=4c5946c6606abc87ba7e2bfc57a5030d19b6d4d5

diff --git a/verify.c b/verify.c
index 794244a9..42a56d71 100644
--- a/verify.c
+++ b/verify.c
@@ -42,9 +42,43 @@ 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)
+{
+	unsigned char *p = io_u->buf;
+	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: wanted %x, got %x\n", hdr->crc7, c);
+		return 1;
+	}
+
+	return 0;
+}
+
+static int verify_io_u_crc16(struct verify_header *hdr, struct io_u *io_u)
+{
+	unsigned char *p = io_u->buf;
+	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: wanted %x, got %x\n", hdr->crc16, c);
+		return 1;
+	}
+
+	return 0;
+}
+
 static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u)
 {
-	unsigned char *p = (unsigned char *) io_u->buf;
+	unsigned char *p = io_u->buf;
 	unsigned long c;
 
 	p += sizeof(*hdr);
@@ -61,17 +95,18 @@ static int verify_io_u_crc32(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 char *p = (unsigned char *) io_u->buf;
-	struct md5_ctx md5_ctx;
+	unsigned char *p = io_u->buf + sizeof(*hdr);
+	uint32_t hash[MD5_HASH_WORDS];
+	struct md5_ctx md5_ctx = {
+		.hash = hash,
+	};
 
-	memset(&md5_ctx, 0, sizeof(md5_ctx));
-	p += sizeof(*hdr);
 	md5_update(&md5_ctx, p, hdr->len - sizeof(*hdr));
 
-	if (memcmp(hdr->md5_digest, md5_ctx.hash, sizeof(md5_ctx.hash))) {
+	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);
 		hexdump(hdr->md5_digest, sizeof(hdr->md5_digest));
-		hexdump(md5_ctx.hash, sizeof(md5_ctx.hash));
+		hexdump(md5_ctx.hash, sizeof(hash));
 		return 1;
 	}
 
@@ -83,7 +118,7 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
 	struct verify_header *hdr = (struct verify_header *) io_u->buf;
 	int ret;
 
-	if (td->o.verify == VERIFY_NULL)
+	if (td->o.verify == VERIFY_NULL || io_u->ddir != DDIR_READ)
 		return 0;
 
 	if (hdr->fio_magic != FIO_HDR_MAGIC) {
@@ -91,11 +126,20 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
 		return EIO;
 	}
 
-	if (hdr->verify_type == VERIFY_MD5)
+	switch (hdr->verify_type) {
+	case VERIFY_MD5:
 		ret = verify_io_u_md5(hdr, io_u);
-	else if (hdr->verify_type == VERIFY_CRC32)
+		break;
+	case VERIFY_CRC32:
 		ret = verify_io_u_crc32(hdr, io_u);
-	else {
+		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;
 	}
@@ -106,6 +150,16 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
 	return 0;
 }
 
+static void fill_crc7(struct verify_header *hdr, void *p, unsigned int len)
+{
+	hdr->crc7 = crc7(p, len);
+}
+
+static void fill_crc16(struct verify_header *hdr, void *p, unsigned int len)
+{
+	hdr->crc16 = crc16(p, len);
+}
+
 static void fill_crc32(struct verify_header *hdr, void *p, unsigned int len)
 {
 	hdr->crc32 = crc32(p, len);
@@ -113,11 +167,11 @@ static void fill_crc32(struct verify_header *hdr, void *p, unsigned int len)
 
 static void fill_md5(struct verify_header *hdr, void *p, unsigned int len)
 {
-	struct md5_ctx md5_ctx;
+	struct md5_ctx md5_ctx = {
+		.hash = (uint32_t *) hdr->md5_digest,
+	};
 
-	memset(&md5_ctx, 0, sizeof(md5_ctx));
 	md5_update(&md5_ctx, p, len);
-	memcpy(hdr->md5_digest, md5_ctx.hash, sizeof(md5_ctx.hash));
 }
 
 /*
@@ -126,26 +180,38 @@ 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)
 {
-	unsigned char *p = (unsigned char *) io_u->buf;
-	struct verify_header hdr;
+	const unsigned int len = io_u->buflen - sizeof(struct verify_header);
+	struct verify_header *hdr;
+	unsigned char *p;
 
 	if (td->o.verify == VERIFY_NULL)
 		return;
 
-	hdr.fio_magic = FIO_HDR_MAGIC;
-	hdr.len = io_u->buflen;
-	p += sizeof(hdr);
-	fill_random_bytes(td, p, io_u->buflen - sizeof(hdr));
-
-	if (td->o.verify == VERIFY_MD5) {
-		fill_md5(&hdr, p, io_u->buflen - sizeof(hdr));
-		hdr.verify_type = VERIFY_MD5;
-	} else if (td->o.verify == VERIFY_CRC32) {
-		fill_crc32(&hdr, p, io_u->buflen - sizeof(hdr));
-		hdr.verify_type = VERIFY_CRC32;
+	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);
 	}
-
-	memcpy(io_u->buf, &hdr, sizeof(hdr));
 }
 
 int get_next_verify(struct thread_data *td, struct io_u *io_u)