Typo in 'init' debug option mask

[fio.git] / verify.c

diff --git a/verify.c b/verify.c
index d9a68d656e490ca2d9a3e0b6a76777895e08f045..3cda3267c9f7262f88aa59f71dfb33614d0fcdf6 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -81,9 +81,11 @@ static void fill_pattern(struct thread_data *td, void *p, unsigned int len)
        }
 }
 
-static void memswp(void* buf1, void* buf2, unsigned int len)
+static void memswp(void *buf1, void *buf2, unsigned int len)
 {
-       struct verify_header swap;
+       char swap[200];
+
+       assert(len <= sizeof(swap));
 
        memcpy(&swap, buf1, len);
        memcpy(buf1, buf2, len);
@@ -175,7 +177,7 @@ static int verify_io_u_meta(struct verify_header *hdr, struct thread_data *td,
                log_err("meta: verify failed at %llu/%u\n",
                              io_u->offset + header_num * hdr->len,
                              hdr->len);
-               return 1;
+               return EIO;
        }
 
        return 0;
@@ -200,7 +202,7 @@ static int verify_io_u_sha512(struct verify_header *hdr, struct io_u *io_u,
                              hdr->len);
                hexdump(vh->sha512, sizeof(vh->sha512));
                hexdump(sha512_ctx.buf, sizeof(sha512));
-               return 1;
+               return EIO;
        }
 
        return 0;
@@ -225,7 +227,7 @@ static int verify_io_u_sha256(struct verify_header *hdr, struct io_u *io_u,
                              hdr->len);
                hexdump(vh->sha256, sizeof(vh->sha256));
                hexdump(sha256_ctx.buf, sizeof(sha256));
-               return 1;
+               return EIO;
        }
 
        return 0;
@@ -245,7 +247,7 @@ static int verify_io_u_crc7(struct verify_header *hdr, struct io_u *io_u,
                                io_u->offset + header_num * hdr->len,
                                hdr->len);
                log_err("crc7: wanted %x, got %x\n", vh->crc7, c);
-               return 1;
+               return EIO;
        }
 
        return 0;
@@ -265,7 +267,7 @@ static int verify_io_u_crc16(struct verify_header *hdr, struct io_u *io_u,
                                io_u->offset + header_num * hdr->len,
                                hdr->len);
                log_err("crc16: wanted %x, got %x\n", vh->crc16, c);
-               return 1;
+               return EIO;
        }
 
        return 0;
@@ -285,7 +287,7 @@ static int verify_io_u_crc64(struct verify_header *hdr, struct io_u *io_u,
                                io_u->offset + header_num * hdr->len,
                                hdr->len);
                log_err("crc64: wanted %llx, got %llx\n", (unsigned long long) vh->crc64, c);
-               return 1;
+               return EIO;
        }
 
        return 0;
@@ -305,7 +307,7 @@ static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u,
                                io_u->offset + header_num * hdr->len,
                                hdr->len);
                log_err("crc32: wanted %x, got %x\n", vh->crc32, c);
-               return 1;
+               return EIO;
        }
 
        return 0;
@@ -330,7 +332,44 @@ static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u,
                              hdr->len);
                hexdump(vh->md5_digest, sizeof(vh->md5_digest));
                hexdump(md5_ctx.hash, sizeof(hash));
-               return 1;
+               return EIO;
+       }
+
+       return 0;
+}
+
+static unsigned int hweight8(unsigned int w)
+{
+       unsigned int res = w - ((w >> 1) & 0x55);
+
+       res = (res & 0x33) + ((res >> 2) & 0x33);
+       return (res + (res >> 4)) & 0x0F;
+}
+
+int verify_io_u_pattern(unsigned long pattern, unsigned long pattern_size,
+                        char *buf, unsigned int len, unsigned int mod)
+{
+       unsigned int i;
+       char split_pattern[4];
+
+       for (i = 0; i < 4; i++) {
+               split_pattern[i] = pattern & 0xff;
+               pattern >>= 8;
+       }
+
+       for (i = 0; i < len; i++) {
+               if (buf[i] != split_pattern[mod]) {
+                       unsigned int bits;
+
+                       bits = hweight8(buf[i] ^ split_pattern[mod]);
+                       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;
+               }
+               mod++;
+               if (mod == pattern_size)
+                       mod = 0;
        }
 
        return 0;
@@ -339,7 +378,7 @@ 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;
-       unsigned int hdr_inc, hdr_num = 0;
+       unsigned int hdr_size, hdr_inc, hdr_num = 0;
        void *p;
        int ret;
 
@@ -350,10 +389,15 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
        if (td->o.verify_interval)
                hdr_inc = td->o.verify_interval;
 
-       for (p = io_u->buf; p < io_u->buf + io_u->buflen; p += hdr_inc) {
+       ret = 0;
+       for (p = io_u->buf; p < io_u->buf + io_u->buflen; p += hdr_inc, hdr_num++) {
+               if (ret && td->o.verify_fatal) {
+                       td->terminate = 1;
+                       break;
+               }
+               hdr_size = __hdr_size(td->o.verify);
                if (td->o.verify_offset)
-                       memswp(p, p + td->o.verify_offset, __hdr_size(td->o.verify));
-
+                       memswp(p, p + td->o.verify_offset, hdr_size);
                hdr = p;
 
                if (hdr->fio_magic != FIO_HDR_MAGIC) {
@@ -361,6 +405,19 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
                        return EIO;
                }
 
+               if (td->o.verify_pattern_bytes) {
+                       ret = verify_io_u_pattern(td->o.verify_pattern,
+                                                 td->o.verify_pattern_bytes,
+                                                 p + hdr_size,
+                                                 hdr_inc - hdr_size,
+                                                 hdr_size % 4);
+                       if (ret)
+                               log_err("fio: verify failed at %llu/%u\n",
+                                       io_u->offset + hdr_num * hdr->len,
+                                       hdr->len);
+                       continue;
+               }
+
                switch (hdr->verify_type) {
                case VERIFY_MD5:
                        ret = verify_io_u_md5(hdr, io_u, hdr_num);
@@ -388,12 +445,11 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
                        break;
                default:
                        log_err("Bad verify type %u\n", hdr->verify_type);
-                       ret = 1;
+                       ret = EINVAL;
                }
-               hdr_num++;
        }
 
-       return 0;
+       return ret;
 }
 
 static void fill_meta(struct verify_header *hdr, struct thread_data *td,