Cleanup some verify bits
[fio.git] / verify.c
index dc107087cefbabc5630a0f2cdcfec8e199743b4f..66b3ef0d36583d1f7a045821b139b3961d5d03f5 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -6,6 +6,7 @@
 #include <string.h>
 #include <assert.h>
 #include <pthread.h>
+#include <libgen.h>
 
 #include "fio.h"
 #include "verify.h"
 #include "crc/sha512.h"
 #include "crc/sha1.h"
 
-void fill_pattern(struct thread_data *td, void *p, unsigned int len, struct io_u *io_u)
+static void populate_hdr(struct thread_data *td, struct io_u *io_u,
+                        struct verify_header *hdr, unsigned int header_num,
+                        unsigned int header_len);
+
+void fill_pattern(struct thread_data *td, void *p, unsigned int len, struct io_u *io_u, unsigned long seed, int use_seed)
 {
        switch (td->o.verify_pattern_bytes) {
        case 0:
                dprint(FD_VERIFY, "fill random bytes len=%u\n", len);
-               fill_random_buf(p, len);
+               if (use_seed)
+                       __fill_random_buf(p, len, seed);
+               else
+                       io_u->rand_seed = fill_random_buf(p, len);
                break;
        case 1:
+               /*
+                * See below write barrier comment
+                */
+#if 0
+               read_barrier();
                if (io_u->buf_filled_len >= len) {
                        dprint(FD_VERIFY, "using already filled verify pattern b=0 len=%u\n", len);
                        return;
                }
+#endif
                dprint(FD_VERIFY, "fill verify pattern b=0 len=%u\n", len);
                memset(p, td->o.verify_pattern[0], len);
+               /*
+                * We need to ensure that the pattern stores are seen before
+                * the fill length store, or we could observe headers that
+                * aren't valid to the extent notified by the fill length
+                */
+               write_barrier();
                io_u->buf_filled_len = len;
                break;
        default: {
                unsigned int i = 0, size = 0;
                unsigned char *b = p;
 
+#if 0
+               read_barrier();
                if (io_u->buf_filled_len >= len) {
                        dprint(FD_VERIFY, "using already filled verify pattern b=%d len=%u\n",
                                        td->o.verify_pattern_bytes, len);
                        return;
                }
+#endif
                dprint(FD_VERIFY, "fill verify pattern b=%d len=%u\n",
                                        td->o.verify_pattern_bytes, len);
 
@@ -58,12 +81,42 @@ void fill_pattern(struct thread_data *td, void *p, unsigned int len, struct io_u
                        memcpy(b+i, td->o.verify_pattern, size);
                        i += size;
                }
+               write_barrier();
                io_u->buf_filled_len = len;
                break;
                }
        }
 }
 
+static unsigned int get_hdr_inc(struct thread_data *td, struct io_u *io_u)
+{
+       unsigned int hdr_inc;
+
+       hdr_inc = io_u->buflen;
+       if (td->o.verify_interval)
+               hdr_inc = td->o.verify_interval;
+
+       return hdr_inc;
+}
+
+static void fill_pattern_headers(struct thread_data *td, struct io_u *io_u,
+                                unsigned long seed, int use_seed)
+{
+       unsigned int hdr_inc, header_num;
+       struct verify_header *hdr;
+       void *p = io_u->buf;
+
+       fill_pattern(td, p, io_u->buflen, io_u, seed, use_seed);
+
+       hdr_inc = get_hdr_inc(td, io_u);
+       header_num = 0;
+       for (; p < io_u->buf + io_u->buflen; p += hdr_inc) {
+               hdr = p;
+               populate_hdr(td, io_u, hdr, header_num, hdr_inc);
+               header_num++;
+       }
+}
+
 static void memswp(void *buf1, void *buf2, unsigned int len)
 {
        char swap[200];
@@ -156,6 +209,7 @@ struct vcont {
         */
        struct io_u *io_u;
        unsigned int hdr_num;
+       struct thread_data *td;
 
        /*
         * Output, only valid in case of error
@@ -166,6 +220,76 @@ struct vcont {
        unsigned int crc_len;
 };
 
+static void dump_buf(char *buf, unsigned int len, unsigned long long offset,
+                    const char *type, struct fio_file *f)
+{
+       char *ptr, fname[256];
+       int ret, fd;
+
+       ptr = strdup(f->file_name);
+       strcpy(fname, basename(ptr));
+
+       sprintf(fname + strlen(fname), ".%llu.%s", offset, type);
+
+       fd = open(fname, O_CREAT | O_TRUNC | O_WRONLY, 0644);
+       if (fd < 0) {
+               perror("open verify buf file");
+               return;
+       }
+
+       while (len) {
+               ret = write(fd, buf, len);
+               if (!ret)
+                       break;
+               else if (ret < 0) {
+                       perror("write verify buf file");
+                       break;
+               }
+               len -= ret;
+               buf += ret;
+       }
+
+       close(fd);
+       log_err("       %s data dumped as %s\n", type, fname);
+       free(ptr);
+}
+
+/*
+ * Dump the contents of the read block and re-generate the correct data
+ * and dump that too.
+ */
+static void dump_verify_buffers(struct verify_header *hdr, struct vcont *vc)
+{
+       struct thread_data *td = vc->td;
+       struct io_u *io_u = vc->io_u;
+       unsigned long hdr_offset;
+       struct io_u dummy;
+       void *buf;
+
+       /*
+        * Dump the contents we just read off disk
+        */
+       hdr_offset = vc->hdr_num * hdr->len;
+
+       dump_buf(io_u->buf + hdr_offset, hdr->len, io_u->offset + hdr_offset,
+                       "received", vc->io_u->file);
+
+       /*
+        * Allocate a new buf and re-generate the original data
+        */
+       buf = malloc(io_u->buflen);
+       dummy = *io_u;
+       dummy.buf = buf;
+       dummy.rand_seed = hdr->rand_seed;
+       dummy.buf_filled_len = 0;
+
+       fill_pattern_headers(td, &dummy, hdr->rand_seed, 1);
+
+       dump_buf(buf + hdr_offset, hdr->len, io_u->offset + hdr_offset,
+                       "expected", vc->io_u->file);
+       free(buf);
+}
+
 static void log_verify_failure(struct verify_header *hdr, struct vcont *vc)
 {
        unsigned long long offset;
@@ -181,6 +305,8 @@ static void log_verify_failure(struct verify_header *hdr, struct vcont *vc)
                log_err("       Received CRC: ");
                hexdump(vc->bad_crc, vc->crc_len);
        }
+
+       dump_verify_buffers(hdr, vc);
 }
 
 /*
@@ -423,10 +549,18 @@ static unsigned int hweight8(unsigned int w)
        return (res + (res >> 4)) & 0x0F;
 }
 
-int verify_io_u_pattern(char *pattern, unsigned long pattern_size,
-                       char *buf, unsigned int len, unsigned int mod)
+int verify_io_u_pattern(struct verify_header *hdr, struct vcont *vc)
 {
-       unsigned int i;
+       struct thread_data *td = vc->td;
+       struct io_u *io_u = vc->io_u;
+       char *buf, *pattern;
+       unsigned int hdr_size = __hdr_size(td->o.verify);
+       unsigned int len, mod, i;
+
+       pattern = td->o.verify_pattern;
+       buf = (void *) hdr + hdr_size;
+       len = get_hdr_inc(td, io_u) - hdr_size;
+       mod = hdr_size % td->o.verify_pattern_bytes;
 
        for (i = 0; i < len; i++) {
                if (buf[i] != pattern[mod]) {
@@ -436,10 +570,11 @@ int verify_io_u_pattern(char *pattern, unsigned long pattern_size,
                        log_err("fio: got pattern %x, wanted %x. Bad bits %d\n",
                                buf[i], pattern[mod], bits);
                        log_err("fio: bad pattern block offset %u\n", i);
+                       dump_verify_buffers(hdr, vc);
                        return EILSEQ;
                }
                mod++;
-               if (mod == pattern_size)
+               if (mod == td->o.verify_pattern_bytes)
                        mod = 0;
        }
 
@@ -519,9 +654,7 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
                goto done;
        }
 
-       hdr_inc = io_u->buflen;
-       if (td->o.verify_interval)
-               hdr_inc = td->o.verify_interval;
+       hdr_inc = get_hdr_inc(td, io_u);
 
        ret = 0;
        for (p = io_u->buf; p < io_u->buf + io_u->buflen;
@@ -529,6 +662,7 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
                struct vcont vc = {
                        .io_u           = io_u,
                        .hdr_num        = hdr_num,
+                       .td             = td,
                };
 
                if (ret && td->o.verify_fatal)
@@ -550,12 +684,7 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
                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 % td->o.verify_pattern_bytes);
-
+                       ret = verify_io_u_pattern(hdr, &vc);
                        if (ret) {
                                log_err("pattern: verify failed at file %s offset %llu, length %u\n",
                                        io_u->file->file_name,
@@ -713,94 +842,92 @@ static void fill_md5(struct verify_header *hdr, void *p, unsigned int len)
        md5_update(&md5_ctx, p, len);
 }
 
+static void populate_hdr(struct thread_data *td, struct io_u *io_u,
+                        struct verify_header *hdr, unsigned int header_num,
+                        unsigned int header_len)
+{
+       unsigned int data_len;
+       void *data, *p;
+
+       p = (void *) hdr;
+
+       hdr->fio_magic = FIO_HDR_MAGIC;
+       hdr->len = header_len;
+       hdr->verify_type = td->o.verify;
+       hdr->rand_seed = io_u->rand_seed;
+       data_len = header_len - hdr_size(hdr);
+
+       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;
+       case VERIFY_SHA1:
+               dprint(FD_VERIFY, "fill sha1 io_u %p, len %u\n",
+                                               io_u, hdr->len);
+               fill_sha1(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, hdr_size(hdr));
+}
+
 /*
  * fill body of io_u->buf with random data and add a header with the
- * crc32 or md5 sum of that data.
+ * checksum of choice
  */
 void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
 {
-       struct verify_header *hdr;
-       void *p = io_u->buf, *data;
-       unsigned int hdr_inc, data_len, header_num = 0;
-
        if (td->o.verify == VERIFY_NULL)
                return;
 
-       fill_pattern(td, p, io_u->buflen, io_u);
-
-       hdr_inc = io_u->buflen;
-       if (td->o.verify_interval)
-               hdr_inc = td->o.verify_interval;
-
-       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_len = hdr_inc - hdr_size(hdr);
-
-               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;
-               case VERIFY_SHA1:
-                       dprint(FD_VERIFY, "fill sha1 io_u %p, len %u\n",
-                                                       io_u, hdr->len);
-                       fill_sha1(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, hdr_size(hdr));
-               header_num++;
-       }
+       fill_pattern_headers(td, io_u, 0, 0);
 }
 
 int get_next_verify(struct thread_data *td, struct io_u *io_u)