X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=verify.c;h=492cc9153ecde358dc363664bf29fdd886f46ba1;hp=a9441b4179615c83c43056e134a1c92b10c180b8;hb=1e154bdbf14a1d352117aea057035235b66f0381;hpb=6d86144dd10b05e8b82e9b895c35dd778e5e71ab;ds=inline

diff --git a/verify.c b/verify.c
index a9441b41..492cc915 100644
--- a/verify.c
+++ b/verify.c
@@ -4,18 +4,18 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
+#include <assert.h>
 
 #include "fio.h"
-#include "os.h"
 
 static void fill_random_bytes(struct thread_data *td,
 			      unsigned char *p, unsigned int len)
 {
 	unsigned int todo;
-	double r;
+	int r;
 
 	while (len) {
-		r = os_random_double(&td->verify_state);
+		r = os_random_long(&td->verify_state);
 
 		/*
 		 * lrand48_r seems to be broken and only fill the bottom
@@ -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 %lx, got %x\n", hdr->crc32, 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,7 +95,7 @@ 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;
+	unsigned char *p = io_u->buf;
 	struct md5_ctx md5_ctx;
 
 	memset(&md5_ctx, 0, sizeof(md5_ctx));
@@ -78,11 +112,14 @@ static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u)
 	return 0;
 }
 
-int verify_io_u(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;
 	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;
@@ -92,6 +129,10 @@ int verify_io_u(struct io_u *io_u)
 		ret = verify_io_u_md5(hdr, io_u);
 	else if (hdr->verify_type == VERIFY_CRC32)
 		ret = verify_io_u_crc32(hdr, io_u);
+	else if (hdr->verify_type == VERIFY_CRC16)
+		ret = verify_io_u_crc16(hdr, io_u);
+	else if (hdr->verify_type == VERIFY_CRC7)
+		ret = verify_io_u_crc7(hdr, io_u);
 	else {
 		log_err("Bad verify type %u\n", hdr->verify_type);
 		ret = 1;
@@ -103,6 +144,16 @@ int verify_io_u(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);
@@ -126,17 +177,26 @@ 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;
 
+	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->verify == VERIFY_MD5) {
+	if (td->o.verify == VERIFY_MD5) {
 		fill_md5(&hdr, p, io_u->buflen - sizeof(hdr));
 		hdr.verify_type = VERIFY_MD5;
-	} else {
+	} else if (td->o.verify == VERIFY_CRC32) {
 		fill_crc32(&hdr, p, io_u->buflen - sizeof(hdr));
 		hdr.verify_type = VERIFY_CRC32;
+	} else if (td->o.verify == VERIFY_CRC16) {
+		fill_crc16(&hdr, p, io_u->buflen - sizeof(hdr));
+		hdr.verify_type = VERIFY_CRC16;
+	} else if (td->o.verify == VERIFY_CRC7) {
+		fill_crc7(&hdr, p, io_u->buflen - sizeof(hdr));
+		hdr.verify_type = VERIFY_CRC7;
 	}
 
 	memcpy(io_u->buf, &hdr, sizeof(hdr));
@@ -144,7 +204,7 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
 
 int get_next_verify(struct thread_data *td, struct io_u *io_u)
 {
-	struct io_piece *ipo;
+	struct io_piece *ipo = NULL;
 
 	/*
 	 * this io_u is from a requeue, we already filled the offsets
@@ -152,14 +212,30 @@ int get_next_verify(struct thread_data *td, struct io_u *io_u)
 	if (io_u->file)
 		return 0;
 
-	if (!list_empty(&td->io_hist_list)) {
-		ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
+	if (!RB_EMPTY_ROOT(&td->io_hist_tree)) {
+		struct rb_node *n = rb_first(&td->io_hist_tree);
 
+		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);
+	}
 
+	if (ipo) {
 		io_u->offset = ipo->offset;
 		io_u->buflen = ipo->len;
 		io_u->file = ipo->file;
+
+		if ((io_u->file->flags & FIO_FILE_OPEN) == 0) {
+			int r = td_io_open_file(td, io_u->file);
+
+			if (r)
+				return 1;
+		}
+
+		get_file(ipo->file);
+		assert(io_u->file->flags & FIO_FILE_OPEN);
 		io_u->ddir = DDIR_READ;
 		io_u->xfer_buf = io_u->buf;
 		io_u->xfer_buflen = io_u->buflen;