Allow upper-case 'X' for hexidecimal in parser
[fio.git] / verify.c
index e261a01abc1b294f64fd4dea91e81dd5fdce4456..2acd216dec10a91f12b15f78d5f8257a90098194 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -8,13 +8,13 @@
 
 #include "fio.h"
 
-#include "md5.h"
-#include "crc64.h"
-#include "crc32.h"
-#include "crc16.h"
-#include "crc7.h"
-#include "sha256.h"
-#include "sha512.h"
+#include "crc/md5.h"
+#include "crc/crc64.h"
+#include "crc/crc32.h"
+#include "crc/crc16.h"
+#include "crc/crc7.h"
+#include "crc/sha256.h"
+#include "crc/sha512.h"
 
 static void fill_random_bytes(struct thread_data *td, void *p, unsigned int len)
 {
@@ -83,7 +83,9 @@ static void fill_pattern(struct thread_data *td, void *p, 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);
@@ -103,15 +105,58 @@ static void hexdump(void *buffer, int len)
 /*
  * Prepare for seperation of verify_header and checksum header
  */
-static inline unsigned int __hdr_size(int fio_unused verify_type)
+static inline unsigned int __hdr_size(int verify_type)
 {
-       return sizeof(struct verify_header);
+       unsigned int len;
+
+       switch (verify_type) {
+       case VERIFY_NONE:
+       case VERIFY_NULL:
+       case VERIFY_PATTERN:
+               len = 0;
+               break;
+       case VERIFY_MD5:
+               len = sizeof(struct vhdr_md5);
+               break;
+       case VERIFY_CRC64:
+               len = sizeof(struct vhdr_crc64);
+               break;
+       case VERIFY_CRC32:
+               len = sizeof(struct vhdr_crc32);
+               break;
+       case VERIFY_CRC16:
+               len = sizeof(struct vhdr_crc16);
+               break;
+       case VERIFY_CRC7:
+               len = sizeof(struct vhdr_crc7);
+               break;
+       case VERIFY_SHA256:
+               len = sizeof(struct vhdr_sha256);
+               break;
+       case VERIFY_SHA512:
+               len = sizeof(struct vhdr_sha512);
+               break;
+       case VERIFY_META:
+               len = sizeof(struct vhdr_meta);
+               break;
+       default:
+               log_err("fio: unknown verify header!\n");
+               assert(0);
+       }
 
+       return len + sizeof(struct verify_header);
 }
 
 static inline unsigned int hdr_size(struct verify_header *hdr)
 {
-       return sizeof(*hdr);
+       return __hdr_size(hdr->verify_type);
+}
+
+static void *hdr_priv(struct verify_header *hdr)
+{
+       void *priv = hdr;
+
+       return priv + sizeof(struct verify_header);
 }
 
 /*
@@ -124,10 +169,26 @@ static inline void *io_u_verify_off(struct verify_header *hdr,
        return io_u->buf + header_num * hdr->len + hdr_size(hdr);
 }
 
+static int verify_io_u_meta(struct verify_header *hdr, struct thread_data *td,
+                            struct io_u *io_u, unsigned int header_num)
+{
+       struct vhdr_meta *vh = hdr_priv(hdr);
+
+       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 1;
+       }
+
+       return 0;
+}
+
 static int verify_io_u_sha512(struct verify_header *hdr, struct io_u *io_u,
                              unsigned int header_num)
 {
        void *p = io_u_verify_off(hdr, io_u, header_num);
+       struct vhdr_sha512 *vh = hdr_priv(hdr);
        uint8_t sha512[128];
        struct sha512_ctx sha512_ctx = {
                .buf = sha512,
@@ -136,11 +197,11 @@ static int verify_io_u_sha512(struct verify_header *hdr, struct io_u *io_u,
        sha512_init(&sha512_ctx);
        sha512_update(&sha512_ctx, p, hdr->len - hdr_size(hdr));
 
-       if (memcmp(hdr->sha512, sha512_ctx.buf, sizeof(sha512))) {
+       if (memcmp(vh->sha512, sha512_ctx.buf, sizeof(sha512))) {
                log_err("sha512: verify failed at %llu/%u\n",
                              io_u->offset + header_num * hdr->len,
                              hdr->len);
-               hexdump(hdr->sha512, sizeof(hdr->sha512));
+               hexdump(vh->sha512, sizeof(vh->sha512));
                hexdump(sha512_ctx.buf, sizeof(sha512));
                return 1;
        }
@@ -152,6 +213,7 @@ static int verify_io_u_sha256(struct verify_header *hdr, struct io_u *io_u,
                              unsigned int header_num)
 {
        void *p = io_u_verify_off(hdr, io_u, header_num);
+       struct vhdr_sha256 *vh = hdr_priv(hdr);
        uint8_t sha256[128];
        struct sha256_ctx sha256_ctx = {
                .buf = sha256,
@@ -160,11 +222,11 @@ static int verify_io_u_sha256(struct verify_header *hdr, struct io_u *io_u,
        sha256_init(&sha256_ctx);
        sha256_update(&sha256_ctx, p, hdr->len - hdr_size(hdr));
 
-       if (memcmp(hdr->sha256, sha256_ctx.buf, sizeof(sha256))) {
+       if (memcmp(vh->sha256, sha256_ctx.buf, sizeof(sha256))) {
                log_err("sha256: verify failed at %llu/%u\n",
                              io_u->offset + header_num * hdr->len,
                              hdr->len);
-               hexdump(hdr->sha256, sizeof(hdr->sha256));
+               hexdump(vh->sha256, sizeof(vh->sha256));
                hexdump(sha256_ctx.buf, sizeof(sha256));
                return 1;
        }
@@ -176,15 +238,16 @@ static int verify_io_u_crc7(struct verify_header *hdr, struct io_u *io_u,
                             unsigned char header_num)
 {
        void *p = io_u_verify_off(hdr, io_u, header_num);
+       struct vhdr_crc7 *vh = hdr_priv(hdr);
        unsigned char c;
 
        c = crc7(p, hdr->len - hdr_size(hdr));
 
-       if (c != hdr->crc7) {
+       if (c != vh->crc7) {
                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", hdr->crc7, c);
+               log_err("crc7: wanted %x, got %x\n", vh->crc7, c);
                return 1;
        }
 
@@ -195,15 +258,16 @@ static int verify_io_u_crc16(struct verify_header *hdr, struct io_u *io_u,
                              unsigned int header_num)
 {
        void *p = io_u_verify_off(hdr, io_u, header_num);
+       struct vhdr_crc16 *vh = hdr_priv(hdr);
        unsigned short c;
 
        c = crc16(p, hdr->len - hdr_size(hdr));
 
-       if (c != hdr->crc16) {
+       if (c != vh->crc16) {
                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", hdr->crc16, c);
+               log_err("crc16: wanted %x, got %x\n", vh->crc16, c);
                return 1;
        }
 
@@ -214,15 +278,16 @@ static int verify_io_u_crc64(struct verify_header *hdr, struct io_u *io_u,
                              unsigned int header_num)
 {
        void *p = io_u_verify_off(hdr, io_u, header_num);
+       struct vhdr_crc64 *vh = hdr_priv(hdr);
        unsigned long long c;
 
        c = crc64(p, hdr->len - hdr_size(hdr));
 
-       if (c != hdr->crc64) {
+       if (c != vh->crc64) {
                log_err("crc64: verify failed at %llu/%u\n",
                                io_u->offset + header_num * hdr->len,
                                hdr->len);
-               log_err("crc64: wanted %llx, got %llx\n", hdr->crc64, c);
+               log_err("crc64: wanted %llx, got %llx\n", (unsigned long long) vh->crc64, c);
                return 1;
        }
 
@@ -233,15 +298,16 @@ static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u,
                             unsigned int header_num)
 {
        void *p = io_u_verify_off(hdr, io_u, header_num);
-       unsigned long c;
+       struct vhdr_crc32 *vh = hdr_priv(hdr);
+       uint32_t c;
 
        c = crc32(p, hdr->len - hdr_size(hdr));
 
-       if (c != hdr->crc32) {
+       if (c != vh->crc32) {
                log_err("crc32: verify failed at %llu/%u\n",
                                io_u->offset + header_num * hdr->len,
                                hdr->len);
-               log_err("crc32: wanted %lx, got %lx\n", hdr->crc32, c);
+               log_err("crc32: wanted %x, got %x\n", vh->crc32, c);
                return 1;
        }
 
@@ -252,6 +318,7 @@ static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u,
                           unsigned int header_num)
 {
        void *p = io_u_verify_off(hdr, io_u, header_num);
+       struct vhdr_md5 *vh = hdr_priv(hdr);
        uint32_t hash[MD5_HASH_WORDS];
        struct md5_ctx md5_ctx = {
                .hash = hash,
@@ -260,11 +327,11 @@ static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u,
        md5_init(&md5_ctx);
        md5_update(&md5_ctx, p, hdr->len - hdr_size(hdr));
 
-       if (memcmp(hdr->md5_digest, md5_ctx.hash, sizeof(hash))) {
+       if (memcmp(vh->md5_digest, md5_ctx.hash, sizeof(hash))) {
                log_err("md5: verify failed at %llu/%u\n",
                              io_u->offset + header_num * hdr->len,
                              hdr->len);
-               hexdump(hdr->md5_digest, sizeof(hdr->md5_digest));
+               hexdump(vh->md5_digest, sizeof(vh->md5_digest));
                hexdump(md5_ctx.hash, sizeof(hash));
                return 1;
        }
@@ -272,10 +339,47 @@ static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u,
        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 1;
+               }
+               mod++;
+               if (mod == pattern_size)
+                       mod = 0;
+       }
+
+       return 0;
+}
+
 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;
 
@@ -286,10 +390,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(hdr->verify_type));
-
+                       memswp(p, p + td->o.verify_offset, hdr_size);
                hdr = p;
 
                if (hdr->fio_magic != FIO_HDR_MAGIC) {
@@ -319,20 +428,49 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
                case VERIFY_SHA512:
                        ret = verify_io_u_sha512(hdr, io_u, hdr_num);
                        break;
+               case VERIFY_META:
+                       ret = verify_io_u_meta(hdr, td, io_u, hdr_num);
+                       break;
+               case VERIFY_PATTERN:
+                       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);
+                       break;
                default:
                        log_err("Bad verify type %u\n", hdr->verify_type);
                        ret = 1;
                }
-               hdr_num++;
        }
 
-       return 0;
+       return ret;
+}
+
+static void fill_meta(struct verify_header *hdr, struct thread_data *td,
+                      struct io_u *io_u, unsigned int header_num)
+{
+       struct vhdr_meta *vh = hdr_priv(hdr);
+
+       vh->thread = td->thread_number;
+
+       vh->time_sec = io_u->start_time.tv_sec;
+       vh->time_usec = io_u->start_time.tv_usec;
+
+       vh->numberio = td->io_issues[DDIR_WRITE];
+
+       vh->offset = io_u->offset + header_num * td->o.verify_interval;
 }
 
 static void fill_sha512(struct verify_header *hdr, void *p, unsigned int len)
 {
+       struct vhdr_sha512 *vh = hdr_priv(hdr);
        struct sha512_ctx sha512_ctx = {
-               .buf = hdr->sha512,
+               .buf = vh->sha512,
        };
 
        sha512_init(&sha512_ctx);
@@ -341,8 +479,9 @@ static void fill_sha512(struct verify_header *hdr, void *p, unsigned int len)
 
 static void fill_sha256(struct verify_header *hdr, void *p, unsigned int len)
 {
+       struct vhdr_sha256 *vh = hdr_priv(hdr);
        struct sha256_ctx sha256_ctx = {
-               .buf = hdr->sha256,
+               .buf = vh->sha256,
        };
 
        sha256_init(&sha256_ctx);
@@ -351,28 +490,37 @@ static void fill_sha256(struct verify_header *hdr, void *p, unsigned int len)
 
 static void fill_crc7(struct verify_header *hdr, void *p, unsigned int len)
 {
-       hdr->crc7 = crc7(p, len);
+       struct vhdr_crc7 *vh = hdr_priv(hdr);
+
+       vh->crc7 = crc7(p, len);
 }
 
 static void fill_crc16(struct verify_header *hdr, void *p, unsigned int len)
 {
-       hdr->crc16 = crc16(p, len);
+       struct vhdr_crc16 *vh = hdr_priv(hdr);
+
+       vh->crc16 = crc16(p, len);
 }
 
 static void fill_crc32(struct verify_header *hdr, void *p, unsigned int len)
 {
-       hdr->crc32 = crc32(p, len);
+       struct vhdr_crc32 *vh = hdr_priv(hdr);
+
+       vh->crc32 = crc32(p, len);
 }
 
 static void fill_crc64(struct verify_header *hdr, void *p, unsigned int len)
 {
-       hdr->crc64 = crc64(p, len);
+       struct vhdr_crc64 *vh = hdr_priv(hdr);
+
+       vh->crc64 = crc64(p, len);
 }
 
 static void fill_md5(struct verify_header *hdr, void *p, unsigned int len)
 {
+       struct vhdr_md5 *vh = hdr_priv(hdr);
        struct md5_ctx md5_ctx = {
-               .hash = (uint32_t *) hdr->md5_digest,
+               .hash = (uint32_t *) vh->md5_digest,
        };
 
        md5_init(&md5_ctx);
@@ -387,7 +535,7 @@ 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;
+       unsigned int hdr_inc, data_len, header_num = 0;
 
        if (td->o.verify == VERIFY_NULL)
                return;
@@ -429,12 +577,18 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
                case VERIFY_SHA512:
                        fill_sha512(hdr, data, data_len);
                        break;
+               case VERIFY_META:
+                       fill_meta(hdr, td, io_u, header_num);
+                       break;
+               case VERIFY_PATTERN:
+                       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++;
        }
 }