X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=verify.c;h=f5c009cec5f5355f23db9027e1de50f1d993308c;hp=8bf14ae05fb08ecb4b960051c8444635219d933c;hb=d6b72507e72d3f2ed334fa5665880b0ab59dbfdd;hpb=f65d1c2663ac6007eac1a2063fe25b4275d013e4 diff --git a/verify.c b/verify.c index 8bf14ae0..f5c009ce 100644 --- a/verify.c +++ b/verify.c @@ -10,9 +10,9 @@ #include "fio.h" #include "verify.h" -#include "smalloc.h" #include "trim.h" #include "lib/rand.h" +#include "lib/hweight.h" #include "crc/md5.h" #include "crc/crc64.h" @@ -23,62 +23,77 @@ #include "crc/sha256.h" #include "crc/sha512.h" #include "crc/sha1.h" +#include "crc/xxhash.h" 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) +static void fill_pattern(struct thread_data *td, void *p, unsigned int len, + char *pattern, unsigned int pattern_bytes) { - switch (td->o.verify_pattern_bytes) { + switch (pattern_bytes) { case 0: - dprint(FD_VERIFY, "fill random bytes len=%u\n", len); - if (use_seed) - __fill_random_buf(p, len, seed); - else - io_u->rand_seed = fill_random_buf(&td->buf_state, p, len); + assert(0); break; case 1: - if (io_u->buf_filled_len >= len) { - dprint(FD_VERIFY, "using already filled verify pattern b=0 len=%u\n", len); - return; - } dprint(FD_VERIFY, "fill verify pattern b=0 len=%u\n", len); - memset(p, td->o.verify_pattern[0], len); - io_u->buf_filled_len = len; + memset(p, pattern[0], len); break; default: { unsigned int i = 0, size = 0; unsigned char *b = p; - 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; - } - dprint(FD_VERIFY, "fill verify pattern b=%d len=%u\n", - td->o.verify_pattern_bytes, len); + pattern_bytes, len); while (i < len) { - size = td->o.verify_pattern_bytes; + size = pattern_bytes; if (size > (len - i)) size = len - i; - memcpy(b+i, td->o.verify_pattern, size); + memcpy(b+i, pattern, size); i += size; } - io_u->buf_filled_len = len; break; } } } +void fill_buffer_pattern(struct thread_data *td, void *p, unsigned int len) +{ + fill_pattern(td, p, len, td->o.buffer_pattern, td->o.buffer_pattern_bytes); +} + +void fill_verify_pattern(struct thread_data *td, void *p, unsigned int len, + struct io_u *io_u, unsigned long seed, int use_seed) +{ + if (!td->o.verify_pattern_bytes) { + dprint(FD_VERIFY, "fill random bytes len=%u\n", len); + + if (use_seed) + __fill_random_buf(p, len, seed); + else + io_u->rand_seed = fill_random_buf(&td->verify_state, p, len); + return; + } + + 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; + } + + fill_pattern(td, p, len, td->o.verify_pattern, td->o.verify_pattern_bytes); + + io_u->buf_filled_len = len; +} + 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) + if (td->o.verify_interval && td->o.verify_interval <= io_u->buflen) hdr_inc = td->o.verify_interval; return hdr_inc; @@ -91,7 +106,7 @@ static void fill_pattern_headers(struct thread_data *td, struct io_u *io_u, struct verify_header *hdr; void *p = io_u->buf; - fill_pattern(td, p, io_u->buflen, io_u, seed, use_seed); + fill_verify_pattern(td, p, io_u->buflen, io_u, seed, use_seed); hdr_inc = get_hdr_inc(td, io_u); header_num = 0; @@ -124,7 +139,7 @@ static void hexdump(void *buffer, int len) } /* - * Prepare for seperation of verify_header and checksum header + * Prepare for separation of verify_header and checksum header */ static inline unsigned int __hdr_size(int verify_type) { @@ -158,6 +173,9 @@ static inline unsigned int __hdr_size(int verify_type) case VERIFY_SHA512: len = sizeof(struct vhdr_sha512); break; + case VERIFY_XXHASH: + len = sizeof(struct vhdr_xxhash); + break; case VERIFY_META: len = sizeof(struct vhdr_meta); break; @@ -208,16 +226,32 @@ struct vcont { unsigned int crc_len; }; +#define DUMP_BUF_SZ 255 +static int dump_buf_warned; + static void dump_buf(char *buf, unsigned int len, unsigned long long offset, const char *type, struct fio_file *f) { - char *ptr, fname[256]; + char *ptr, fname[DUMP_BUF_SZ]; + size_t buf_left = DUMP_BUF_SZ; int ret, fd; ptr = strdup(f->file_name); - strcpy(fname, basename(ptr)); - sprintf(fname + strlen(fname), ".%llu.%s", offset, type); + fname[DUMP_BUF_SZ - 1] = '\0'; + strncpy(fname, basename(ptr), DUMP_BUF_SZ - 1); + + buf_left -= strlen(fname); + if (buf_left <= 0) { + if (!dump_buf_warned) { + log_err("fio: verify failure dump buffer too small\n"); + dump_buf_warned = 1; + } + free(ptr); + return; + } + + snprintf(fname + strlen(fname), buf_left, ".%llu.%s", offset, type); fd = open(fname, O_CREAT | O_TRUNC | O_WRONLY, 0644); if (fd < 0) { @@ -273,6 +307,7 @@ static void dump_verify_buffers(struct verify_header *hdr, struct vcont *vc) dummy.buf = buf; dummy.rand_seed = hdr->rand_seed; dummy.buf_filled_len = 0; + dummy.buflen = io_u->buflen; fill_pattern_headers(td, &dummy, hdr->rand_seed, 1); @@ -308,14 +343,6 @@ static inline void *io_u_verify_off(struct verify_header *hdr, struct vcont *vc) return vc->io_u->buf + vc->hdr_num * hdr->len + hdr_size(hdr); } -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; -} - static int verify_io_u_pattern(struct verify_header *hdr, struct vcont *vc) { struct thread_data *td = vc->td; @@ -337,7 +364,7 @@ static int verify_io_u_pattern(struct verify_header *hdr, struct vcont *vc) if (size > (len - i)) size = len - i; if (memcmp(buf + i, pattern + mod, size)) - // Let the slow compare find the first mismatch byte. + /* Let the slow compare find the first mismatch byte. */ break; mod = 0; } @@ -376,6 +403,20 @@ static int verify_io_u_meta(struct verify_header *hdr, struct vcont *vc) if (td->o.verify_pattern_bytes) ret |= verify_io_u_pattern(hdr, vc); + /* + * For read-only workloads, the program cannot be certain of the + * last numberio written to a block. Checking of numberio will be + * done only for workloads that write data. For verify_only, + * numberio will be checked in the last iteration when the correct + * state of numberio, that would have been written to each block + * in a previous run of fio, has been reached. + */ + if ((td_write(td) || td_rw(td)) && (td_min_bs(td) == td_max_bs(td)) && + !td->o.time_based) + if (!td->o.verify_only || td->o.loops == 0) + if (vh->numberio != io_u->numberio) + ret = EILSEQ; + if (!ret) return 0; @@ -384,19 +425,43 @@ static int verify_io_u_meta(struct verify_header *hdr, struct vcont *vc) return ret; } +static int verify_io_u_xxhash(struct verify_header *hdr, struct vcont *vc) +{ + void *p = io_u_verify_off(hdr, vc); + struct vhdr_xxhash *vh = hdr_priv(hdr); + uint32_t hash; + void *state; + + dprint(FD_VERIFY, "xxhash verify io_u %p, len %u\n", vc->io_u, hdr->len); + + state = XXH32_init(1); + XXH32_update(state, p, hdr->len - hdr_size(hdr)); + hash = XXH32_digest(state); + + if (vh->hash == hash) + return 0; + + vc->name = "xxhash"; + vc->good_crc = &vh->hash; + vc->bad_crc = &hash; + vc->crc_len = sizeof(hash); + log_verify_failure(hdr, vc); + return EILSEQ; +} + static int verify_io_u_sha512(struct verify_header *hdr, struct vcont *vc) { void *p = io_u_verify_off(hdr, vc); struct vhdr_sha512 *vh = hdr_priv(hdr); uint8_t sha512[128]; - struct sha512_ctx sha512_ctx = { + struct fio_sha512_ctx sha512_ctx = { .buf = sha512, }; dprint(FD_VERIFY, "sha512 verify io_u %p, len %u\n", vc->io_u, hdr->len); - sha512_init(&sha512_ctx); - sha512_update(&sha512_ctx, p, hdr->len - hdr_size(hdr)); + fio_sha512_init(&sha512_ctx); + fio_sha512_update(&sha512_ctx, p, hdr->len - hdr_size(hdr)); if (!memcmp(vh->sha512, sha512_ctx.buf, sizeof(sha512))) return 0; @@ -414,14 +479,14 @@ static int verify_io_u_sha256(struct verify_header *hdr, struct vcont *vc) void *p = io_u_verify_off(hdr, vc); struct vhdr_sha256 *vh = hdr_priv(hdr); uint8_t sha256[64]; - struct sha256_ctx sha256_ctx = { + struct fio_sha256_ctx sha256_ctx = { .buf = sha256, }; dprint(FD_VERIFY, "sha256 verify io_u %p, len %u\n", vc->io_u, hdr->len); - sha256_init(&sha256_ctx); - sha256_update(&sha256_ctx, p, hdr->len - hdr_size(hdr)); + fio_sha256_init(&sha256_ctx); + fio_sha256_update(&sha256_ctx, p, hdr->len - hdr_size(hdr)); if (!memcmp(vh->sha256, sha256_ctx.buf, sizeof(sha256))) return 0; @@ -439,14 +504,14 @@ static int verify_io_u_sha1(struct verify_header *hdr, struct vcont *vc) void *p = io_u_verify_off(hdr, vc); struct vhdr_sha1 *vh = hdr_priv(hdr); uint32_t sha1[5]; - struct sha1_ctx sha1_ctx = { + struct fio_sha1_ctx sha1_ctx = { .H = sha1, }; dprint(FD_VERIFY, "sha1 verify io_u %p, len %u\n", vc->io_u, hdr->len); - sha1_init(&sha1_ctx); - sha1_update(&sha1_ctx, p, hdr->len - hdr_size(hdr)); + fio_sha1_init(&sha1_ctx); + fio_sha1_update(&sha1_ctx, p, hdr->len - hdr_size(hdr)); if (!memcmp(vh->sha1, sha1_ctx.H, sizeof(sha1))) return 0; @@ -467,7 +532,7 @@ static int verify_io_u_crc7(struct verify_header *hdr, struct vcont *vc) dprint(FD_VERIFY, "crc7 verify io_u %p, len %u\n", vc->io_u, hdr->len); - c = crc7(p, hdr->len - hdr_size(hdr)); + c = fio_crc7(p, hdr->len - hdr_size(hdr)); if (c == vh->crc7) return 0; @@ -488,7 +553,7 @@ static int verify_io_u_crc16(struct verify_header *hdr, struct vcont *vc) dprint(FD_VERIFY, "crc16 verify io_u %p, len %u\n", vc->io_u, hdr->len); - c = crc16(p, hdr->len - hdr_size(hdr)); + c = fio_crc16(p, hdr->len - hdr_size(hdr)); if (c == vh->crc16) return 0; @@ -509,7 +574,7 @@ static int verify_io_u_crc64(struct verify_header *hdr, struct vcont *vc) dprint(FD_VERIFY, "crc64 verify io_u %p, len %u\n", vc->io_u, hdr->len); - c = crc64(p, hdr->len - hdr_size(hdr)); + c = fio_crc64(p, hdr->len - hdr_size(hdr)); if (c == vh->crc64) return 0; @@ -530,7 +595,7 @@ static int verify_io_u_crc32(struct verify_header *hdr, struct vcont *vc) dprint(FD_VERIFY, "crc32 verify io_u %p, len %u\n", vc->io_u, hdr->len); - c = crc32(p, hdr->len - hdr_size(hdr)); + c = fio_crc32(p, hdr->len - hdr_size(hdr)); if (c == vh->crc32) return 0; @@ -551,10 +616,7 @@ static int verify_io_u_crc32c(struct verify_header *hdr, struct vcont *vc) dprint(FD_VERIFY, "crc32c verify io_u %p, len %u\n", vc->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)); + c = fio_crc32c(p, hdr->len - hdr_size(hdr)); if (c == vh->crc32) return 0; @@ -572,14 +634,14 @@ static int verify_io_u_md5(struct verify_header *hdr, struct vcont *vc) void *p = io_u_verify_off(hdr, vc); struct vhdr_md5 *vh = hdr_priv(hdr); uint32_t hash[MD5_HASH_WORDS]; - struct md5_ctx md5_ctx = { + struct fio_md5_ctx md5_ctx = { .hash = hash, }; dprint(FD_VERIFY, "md5 verify io_u %p, len %u\n", vc->io_u, hdr->len); - md5_init(&md5_ctx); - md5_update(&md5_ctx, p, hdr->len - hdr_size(hdr)); + fio_md5_init(&md5_ctx); + fio_md5_update(&md5_ctx, p, hdr->len - hdr_size(hdr)); if (!memcmp(vh->md5_digest, md5_ctx.hash, sizeof(hash))) return 0; @@ -595,20 +657,21 @@ static int verify_io_u_md5(struct verify_header *hdr, struct vcont *vc) /* * Push IO verification to a separate thread */ -int verify_io_u_async(struct thread_data *td, struct io_u *io_u) +int verify_io_u_async(struct thread_data *td, struct io_u **io_u_ptr) { - if (io_u->file) - put_file_log(td, io_u->file); + struct io_u *io_u = *io_u_ptr; pthread_mutex_lock(&td->io_u_lock); + if (io_u->file) + put_file_log(td, io_u->file); + if (io_u->flags & IO_U_F_IN_CUR_DEPTH) { td->cur_depth--; io_u->flags &= ~IO_U_F_IN_CUR_DEPTH; } - flist_del(&io_u->list); - flist_add_tail(&io_u->list, &td->verify_list); - io_u->flags |= IO_U_F_FREE_DEF; + flist_add_tail(&io_u->verify_list, &td->verify_list); + *io_u_ptr = NULL; pthread_mutex_unlock(&td->io_u_lock); pthread_cond_signal(&td->verify_cond); @@ -649,28 +712,61 @@ static int verify_trimmed_io_u(struct thread_data *td, struct io_u *io_u) return ret; } -static int verify_hdr_crc(struct verify_header *hdr) +static int verify_header(struct io_u *io_u, struct verify_header *hdr, + unsigned int hdr_num, unsigned int hdr_len) { void *p = hdr; uint32_t crc; - crc = crc32(p, sizeof(*hdr) - sizeof(hdr->crc32)); - if (crc == hdr->crc32) - return 1; + if (hdr->magic != FIO_HDR_MAGIC) { + log_err("verify: bad magic header %x, wanted %x", + hdr->magic, FIO_HDR_MAGIC); + goto err; + } + if (hdr->len != hdr_len) { + log_err("verify: bad header length %u, wanted %u", + hdr->len, hdr_len); + goto err; + } + if (hdr->rand_seed != io_u->rand_seed) { + log_err("verify: bad header rand_seed %"PRIu64 + ", wanted %"PRIu64, + hdr->rand_seed, io_u->rand_seed); + goto err; + } - log_err("fio: verify header crc %x, calculated %x\n", hdr->crc32, crc); + crc = fio_crc32c(p, offsetof(struct verify_header, crc32)); + if (crc != hdr->crc32) { + log_err("verify: bad header crc %x, calculated %x", + hdr->crc32, crc); + goto err; + } return 0; + +err: + log_err(" at file %s offset %llu, length %u\n", + io_u->file->file_name, + io_u->offset + hdr_num * hdr_len, hdr_len); + return EILSEQ; } -int verify_io_u(struct thread_data *td, struct io_u *io_u) +int verify_io_u(struct thread_data *td, struct io_u **io_u_ptr) { struct verify_header *hdr; + struct io_u *io_u = *io_u_ptr; unsigned int header_size, hdr_inc, hdr_num = 0; void *p; int ret; if (td->o.verify == VERIFY_NULL || io_u->ddir != DDIR_READ) return 0; + /* + * If the IO engine is faking IO (like null), then just pretend + * we verified everything. + */ + if (td->io_ops->flags & FIO_FAKEIO) + return 0; + if (io_u->flags & IO_U_F_TRIMMED) { ret = verify_trimmed_io_u(td, io_u); goto done; @@ -686,6 +782,7 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u) .hdr_num = hdr_num, .td = td, }; + unsigned int verify_type; if (ret && td->o.verify_fatal) break; @@ -695,24 +792,23 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u) memswp(p, p + td->o.verify_offset, header_size); hdr = p; - if (hdr->fio_magic == FIO_HDR_MAGIC2) { - if (!verify_hdr_crc(hdr)) { - log_err("fio: bad crc on verify header.\n"); - return EILSEQ; - } - } else if (hdr->fio_magic == FIO_HDR_MAGIC) { - log_err("fio: v1 headers no longer supported.\n"); - log_err("fio: re-run the write workload.\n"); - return EILSEQ; - } else { - log_err("verify: bad magic header %x, wanted %x at file %s offset %llu, length %u\n", - hdr->fio_magic, FIO_HDR_MAGIC2, - io_u->file->file_name, - io_u->offset + hdr_num * hdr->len, hdr->len); - return EILSEQ; - } + /* + * Make rand_seed check pass when have verifysort or + * verify_backlog. + */ + if (td->o.verifysort || (td->flags & TD_F_VER_BACKLOG)) + io_u->rand_seed = hdr->rand_seed; + + ret = verify_header(io_u, hdr, hdr_num, hdr_inc); + if (ret) + return ret; + + if (td->o.verify != VERIFY_NONE) + verify_type = td->o.verify; + else + verify_type = hdr->verify_type; - switch (hdr->verify_type) { + switch (verify_type) { case VERIFY_MD5: ret = verify_io_u_md5(hdr, &vc); break; @@ -738,6 +834,9 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u) case VERIFY_SHA512: ret = verify_io_u_sha512(hdr, &vc); break; + case VERIFY_XXHASH: + ret = verify_io_u_xxhash(hdr, &vc); + break; case VERIFY_META: ret = verify_io_u_meta(hdr, &vc); break; @@ -751,11 +850,15 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u) log_err("Bad verify type %u\n", hdr->verify_type); ret = EINVAL; } + + if (ret && verify_type != hdr->verify_type) + log_err("fio: verify type mismatch (%u media, %u given)\n", + hdr->verify_type, verify_type); } done: if (ret && td->o.verify_fatal) - td->terminate = 1; + fio_mark_td_terminate(td); return ret; } @@ -770,91 +873,98 @@ static void fill_meta(struct verify_header *hdr, struct thread_data *td, 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->numberio = io_u->numberio; vh->offset = io_u->offset + header_num * td->o.verify_interval; } +static void fill_xxhash(struct verify_header *hdr, void *p, unsigned int len) +{ + struct vhdr_xxhash *vh = hdr_priv(hdr); + void *state; + + state = XXH32_init(1); + XXH32_update(state, p, len); + vh->hash = XXH32_digest(state); +} + 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 = { + struct fio_sha512_ctx sha512_ctx = { .buf = vh->sha512, }; - sha512_init(&sha512_ctx); - sha512_update(&sha512_ctx, p, len); + fio_sha512_init(&sha512_ctx); + fio_sha512_update(&sha512_ctx, p, 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 = { + struct fio_sha256_ctx sha256_ctx = { .buf = vh->sha256, }; - sha256_init(&sha256_ctx); - sha256_update(&sha256_ctx, p, len); + fio_sha256_init(&sha256_ctx); + fio_sha256_update(&sha256_ctx, p, len); } static void fill_sha1(struct verify_header *hdr, void *p, unsigned int len) { struct vhdr_sha1 *vh = hdr_priv(hdr); - struct sha1_ctx sha1_ctx = { + struct fio_sha1_ctx sha1_ctx = { .H = vh->sha1, }; - sha1_init(&sha1_ctx); - sha1_update(&sha1_ctx, p, len); + fio_sha1_init(&sha1_ctx); + fio_sha1_update(&sha1_ctx, p, len); } static void fill_crc7(struct verify_header *hdr, void *p, unsigned int len) { struct vhdr_crc7 *vh = hdr_priv(hdr); - vh->crc7 = crc7(p, len); + vh->crc7 = fio_crc7(p, len); } static void fill_crc16(struct verify_header *hdr, void *p, unsigned int len) { struct vhdr_crc16 *vh = hdr_priv(hdr); - vh->crc16 = crc16(p, len); + vh->crc16 = fio_crc16(p, len); } static void fill_crc32(struct verify_header *hdr, void *p, unsigned int len) { struct vhdr_crc32 *vh = hdr_priv(hdr); - vh->crc32 = crc32(p, len); + vh->crc32 = fio_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); + vh->crc32 = fio_crc32c(p, len); } static void fill_crc64(struct verify_header *hdr, void *p, unsigned int len) { struct vhdr_crc64 *vh = hdr_priv(hdr); - vh->crc64 = crc64(p, len); + vh->crc64 = fio_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 = { + struct fio_md5_ctx md5_ctx = { .hash = (uint32_t *) vh->md5_digest, }; - md5_init(&md5_ctx); - md5_update(&md5_ctx, p, len); + fio_md5_init(&md5_ctx); + fio_md5_update(&md5_ctx, p, len); } static void populate_hdr(struct thread_data *td, struct io_u *io_u, @@ -866,13 +976,11 @@ static void populate_hdr(struct thread_data *td, struct io_u *io_u, p = (void *) hdr; - hdr->fio_magic = FIO_HDR_MAGIC2; - hdr->len = header_len; + hdr->magic = FIO_HDR_MAGIC; hdr->verify_type = td->o.verify; - hdr->pad1 = 0; + hdr->len = header_len; hdr->rand_seed = io_u->rand_seed; - hdr->pad2 = 0; - hdr->crc32 = crc32(p, sizeof(*hdr) - sizeof(hdr->crc32)); + hdr->crc32 = fio_crc32c(p, offsetof(struct verify_header, crc32)); data_len = header_len - hdr_size(hdr); @@ -919,6 +1027,11 @@ static void populate_hdr(struct thread_data *td, struct io_u *io_u, io_u, hdr->len); fill_sha512(hdr, data, data_len); break; + case VERIFY_XXHASH: + dprint(FD_VERIFY, "fill xxhash io_u %p, len %u\n", + io_u, hdr->len); + fill_xxhash(hdr, data, data_len); + break; case VERIFY_META: dprint(FD_VERIFY, "fill meta io_u %p, len %u\n", io_u, hdr->len); @@ -949,6 +1062,8 @@ void populate_verify_io_u(struct thread_data *td, struct io_u *io_u) if (td->o.verify == VERIFY_NULL) return; + io_u->numberio = td->io_issues[io_u->ddir]; + fill_pattern_headers(td, io_u, 0, 0); } @@ -966,11 +1081,27 @@ int get_next_verify(struct thread_data *td, struct io_u *io_u) struct rb_node *n = rb_first(&td->io_hist_tree); ipo = rb_entry(n, struct io_piece, rb_node); + + /* + * Ensure that the associated IO has completed + */ + read_barrier(); + if (ipo->flags & IP_F_IN_FLIGHT) + goto nothing; + rb_erase(n, &td->io_hist_tree); assert(ipo->flags & IP_F_ONRB); ipo->flags &= ~IP_F_ONRB; } else if (!flist_empty(&td->io_hist_list)) { - ipo = flist_entry(td->io_hist_list.next, struct io_piece, list); + ipo = flist_first_entry(&td->io_hist_list, struct io_piece, list); + + /* + * Ensure that the associated IO has completed + */ + read_barrier(); + if (ipo->flags & IP_F_IN_FLIGHT) + goto nothing; + flist_del(&ipo->list); assert(ipo->flags & IP_F_ONLIST); ipo->flags &= ~IP_F_ONLIST; @@ -981,7 +1112,9 @@ int get_next_verify(struct thread_data *td, struct io_u *io_u) io_u->offset = ipo->offset; io_u->buflen = ipo->len; + io_u->numberio = ipo->numberio; io_u->file = ipo->file; + io_u->flags |= IO_U_F_VER_LIST; if (ipo->flags & IP_F_TRIMMED) io_u->flags |= IO_U_F_TRIMMED; @@ -1005,13 +1138,28 @@ int get_next_verify(struct thread_data *td, struct io_u *io_u) remove_trim_entry(td, ipo); free(ipo); dprint(FD_VERIFY, "get_next_verify: ret io_u %p\n", io_u); + + if (!td->o.verify_pattern_bytes) { + io_u->rand_seed = __rand(&td->verify_state); + if (sizeof(int) != sizeof(long *)) + io_u->rand_seed *= __rand(&td->verify_state); + } return 0; } +nothing: dprint(FD_VERIFY, "get_next_verify: empty\n"); return 1; } +void fio_verify_init(struct thread_data *td) +{ + if (td->o.verify == VERIFY_CRC32C_INTEL || + td->o.verify == VERIFY_CRC32C) { + crc32c_intel_probe(); + } +} + static void *verify_async_thread(void *data) { struct thread_data *td = data; @@ -1050,15 +1198,16 @@ static void *verify_async_thread(void *data) continue; while (!flist_empty(&list)) { - io_u = flist_entry(list.next, struct io_u, list); - flist_del_init(&io_u->list); + io_u = flist_first_entry(&list, struct io_u, verify_list); + flist_del_init(&io_u->verify_list); + + io_u->flags |= IO_U_F_NO_FILE_PUT; + ret = verify_io_u(td, &io_u); - ret = verify_io_u(td, io_u); put_io_u(td, io_u); if (!ret) continue; - if (td->o.continue_on_error & ERROR_TYPE_VERIFY && - td_non_fatal_error(ret)) { + if (td_non_fatal_error(td, ERROR_TYPE_VERIFY_BIT, ret)) { update_error_count(td, ret); td_clear_error(td); ret = 0; @@ -1069,7 +1218,7 @@ static void *verify_async_thread(void *data) if (ret) { td_verror(td, ret, "async_verify"); if (td->o.verify_fatal) - td->terminate = 1; + fio_mark_td_terminate(td); } done: