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

diff --git a/verify.c b/verify.c
index afb4cb7d..6de0b884 100644
--- a/verify.c
+++ b/verify.c
@@ -128,6 +128,7 @@ static inline unsigned int __hdr_size(int verify_type)
 		break;
 	case VERIFY_CRC32C:
 	case VERIFY_CRC32:
+	case VERIFY_CRC32C_INTEL:
 		len = sizeof(struct vhdr_crc32);
 		break;
 	case VERIFY_CRC16:
@@ -184,7 +185,7 @@ static int verify_io_u_meta(struct verify_header *hdr, struct thread_data *td,
 	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 EILSEQ;
 	}
 
 	return 0;
@@ -210,7 +211,7 @@ static int verify_io_u_sha512(struct verify_header *hdr, struct io_u *io_u,
 				io_u->offset + header_num * hdr->len, hdr->len);
 		hexdump(vh->sha512, sizeof(vh->sha512));
 		hexdump(sha512_ctx.buf, sizeof(sha512));
-		return EIO;
+		return EILSEQ;
 	}
 
 	return 0;
@@ -236,7 +237,7 @@ static int verify_io_u_sha256(struct verify_header *hdr, struct io_u *io_u,
 				io_u->offset + header_num * hdr->len, hdr->len);
 		hexdump(vh->sha256, sizeof(vh->sha256));
 		hexdump(sha256_ctx.buf, sizeof(sha256));
-		return EIO;
+		return EILSEQ;
 	}
 
 	return 0;
@@ -257,7 +258,7 @@ static int verify_io_u_crc7(struct verify_header *hdr, struct io_u *io_u,
 		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", vh->crc7, c);
-		return EIO;
+		return EILSEQ;
 	}
 
 	return 0;
@@ -278,7 +279,7 @@ static int verify_io_u_crc16(struct verify_header *hdr, struct io_u *io_u,
 		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", vh->crc16, c);
-		return EIO;
+		return EILSEQ;
 	}
 
 	return 0;
@@ -301,7 +302,7 @@ static int verify_io_u_crc64(struct verify_header *hdr, struct io_u *io_u,
 				hdr->len);
 		log_err("crc64: wanted %llx, got %llx\n",
 					(unsigned long long) vh->crc64, c);
-		return EIO;
+		return EILSEQ;
 	}
 
 	return 0;
@@ -322,7 +323,7 @@ static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u,
 		log_err("crc32: verify failed at %llu/%u\n",
 				io_u->offset + header_num * hdr->len, hdr->len);
 		log_err("crc32: wanted %x, got %x\n", vh->crc32, c);
-		return EIO;
+		return EILSEQ;
 	}
 
 	return 0;
@@ -337,13 +338,16 @@ static int verify_io_u_crc32c(struct verify_header *hdr, struct io_u *io_u,
 
 	dprint(FD_VERIFY, "crc32c verify io_u %p, len %u\n", io_u, hdr->len);
 
-	c = crc32c(p, hdr->len - hdr_size(hdr));
+	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 EIO;
+		return EILSEQ;
 	}
 
 	return 0;
@@ -369,7 +373,7 @@ static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u,
 				io_u->offset + header_num * hdr->len, hdr->len);
 		hexdump(vh->md5_digest, sizeof(vh->md5_digest));
 		hexdump(md5_ctx.hash, sizeof(hash));
-		return EIO;
+		return EILSEQ;
 	}
 
 	return 0;
@@ -402,7 +406,7 @@ int verify_io_u_pattern(unsigned long pattern, unsigned long pattern_size,
 			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;
+			return EILSEQ;
 		}
 		mod++;
 		if (mod == pattern_size)
@@ -440,7 +444,7 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
 
 		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) {
@@ -466,6 +470,7 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
 			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:
@@ -557,7 +562,10 @@ static void fill_crc32c(struct verify_header *hdr, void *p, unsigned int len)
 {
 	struct vhdr_crc32 *vh = hdr_priv(hdr);
 
-	vh->crc32 = crc32c(p, len);
+	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)
@@ -618,6 +626,7 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
 			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);
@@ -687,7 +696,7 @@ 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) {
@@ -698,7 +707,7 @@ int get_next_verify(struct thread_data *td, struct io_u *io_u)
 		}
 
 		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;