Clean up file flags

[fio.git] / verify.c

diff --git a/verify.c b/verify.c
index 680e49105480b6f76fecff85876ffd097eca18a7..6de0b884112c0b78aa6fbc7d7c25d7867826e59c 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -11,6 +11,7 @@
 #include "crc/md5.h"
 #include "crc/crc64.h"
 #include "crc/crc32.h"
+#include "crc/crc32c.h"
 #include "crc/crc16.h"
 #include "crc/crc7.h"
 #include "crc/sha256.h"
@@ -125,7 +126,9 @@ static inline unsigned int __hdr_size(int verify_type)
        case VERIFY_CRC64:
                len = sizeof(struct vhdr_crc64);
                break;
+       case VERIFY_CRC32C:
        case VERIFY_CRC32:
+       case VERIFY_CRC32C_INTEL:
                len = sizeof(struct vhdr_crc32);
                break;
        case VERIFY_CRC16:
@@ -182,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;
@@ -208,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;
@@ -234,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;
@@ -255,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;
@@ -276,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;
@@ -299,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;
@@ -320,7 +323,31 @@ 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;
+}
+
+static int verify_io_u_crc32c(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_crc32 *vh = hdr_priv(hdr);
+       uint32_t c;
+
+       dprint(FD_VERIFY, "crc32c verify io_u %p, len %u\n", io_u, hdr->len);
+
+       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 EILSEQ;
        }
 
        return 0;
@@ -346,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;
@@ -379,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)
@@ -417,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) {
@@ -442,6 +469,10 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
                case VERIFY_CRC64:
                        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:
                        ret = verify_io_u_crc32(hdr, io_u, hdr_num);
                        break;
@@ -527,6 +558,16 @@ static void fill_crc32(struct verify_header *hdr, void *p, unsigned int len)
        vh->crc32 = crc32(p, len);
 }
 
+static void fill_crc32c(struct verify_header *hdr, void *p, unsigned int len)
+{
+       struct vhdr_crc32 *vh = hdr_priv(hdr);
+
+       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)
 {
        struct vhdr_crc64 *vh = hdr_priv(hdr);
@@ -584,6 +625,12 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
                                                        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);
@@ -649,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) {
@@ -660,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;