X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=verify.c;h=568bae85cd167836e9e756067fecd90ff0fa666e;hp=696aff762abce69849e254cce47b6accd4fa9dd7;hb=e9e177cce9df45eca77a4a0822a8247e60f2680b;hpb=d3a173a927084660c365d6aa162016ebb0746946 diff --git a/verify.c b/verify.c index 696aff76..568bae85 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" @@ -28,57 +28,71 @@ 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->buf_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 +105,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 +138,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) { @@ -273,6 +287,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 +323,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 +344,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 +383,19 @@ 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)) + if (!td->o.verify_only || td->o.loops == 0) + if (vh->numberio != io_u->numberio) + ret = EILSEQ; + if (!ret) return 0; @@ -389,14 +409,14 @@ 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 +434,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 +459,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 +487,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 +508,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 +529,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 +550,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,7 +571,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); - c = crc32c(p, hdr->len - hdr_size(hdr)); + c = fio_crc32c(p, hdr->len - hdr_size(hdr)); if (c == vh->crc32) return 0; @@ -569,14 +589,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; @@ -603,8 +623,7 @@ int verify_io_u_async(struct thread_data *td, struct io_u *io_u) 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); + flist_add_tail(&io_u->verify_list, &td->verify_list); io_u->flags |= IO_U_F_FREE_DEF; pthread_mutex_unlock(&td->io_u_lock); @@ -646,17 +665,23 @@ 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) { void *p = hdr; uint32_t crc; - crc = crc32c(p, sizeof(*hdr) - sizeof(hdr->crc32)); - if (crc == hdr->crc32) + if (hdr->magic != FIO_HDR_MAGIC) return 1; + if (hdr->len > io_u->buflen) + return 2; + if (hdr->rand_seed != io_u->rand_seed) + return 3; + crc = fio_crc32c(p, offsetof(struct verify_header, crc32)); + if (crc == hdr->crc32) + return 0; log_err("fio: verify header crc %x, calculated %x\n", hdr->crc32, crc); - return 0; + return 4; } int verify_io_u(struct thread_data *td, struct io_u *io_u) @@ -683,6 +708,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; @@ -692,15 +718,49 @@ 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->magic != FIO_HDR_MAGIC || !verify_hdr_crc(hdr)) { - log_err("verify: bad magic header %x, wanted %x at file %s offset %llu, length %u\n", + ret = verify_header(io_u, hdr); + switch (ret) { + case 0: + break; + case 1: + log_err("verify: bad magic header %x, wanted %x at " + "file %s offset %llu, length %u\n", hdr->magic, FIO_HDR_MAGIC, io_u->file->file_name, io_u->offset + hdr_num * hdr->len, hdr->len); return EILSEQ; + break; + case 2: + log_err("fio: verify header exceeds buffer length (%u " + "> %lu)\n", hdr->len, io_u->buflen); + return EILSEQ; + break; + case 3: + log_err("verify: bad header rand_seed %"PRIu64 + ", wanted %"PRIu64" at file %s offset %llu, " + "length %u\n", + hdr->rand_seed, io_u->rand_seed, + io_u->file->file_name, + io_u->offset + hdr_num * hdr->len, hdr->len); + return EILSEQ; + break; + case 4: + return EILSEQ; + break; + default: + log_err("verify: unknown header error at file %s " + "offset %llu, length %u\n", + io_u->file->file_name, + io_u->offset + hdr_num * hdr->len, hdr->len); + return EILSEQ; } - switch (hdr->verify_type) { + if (td->o.verify != VERIFY_NONE) + verify_type = td->o.verify; + else + verify_type = hdr->verify_type; + + switch (verify_type) { case VERIFY_MD5: ret = verify_io_u_md5(hdr, &vc); break; @@ -739,6 +799,10 @@ 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: @@ -758,7 +822,7 @@ 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; } @@ -766,80 +830,80 @@ static void fill_meta(struct verify_header *hdr, struct thread_data *td, 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); - 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, @@ -855,7 +919,7 @@ static void populate_hdr(struct thread_data *td, struct io_u *io_u, hdr->verify_type = td->o.verify; hdr->len = header_len; hdr->rand_seed = io_u->rand_seed; - hdr->crc32 = crc32c(p, sizeof(*hdr) - sizeof(hdr->crc32)); + hdr->crc32 = fio_crc32c(p, offsetof(struct verify_header, crc32)); data_len = header_len - hdr_size(hdr); @@ -932,6 +996,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); } @@ -964,7 +1030,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; @@ -995,6 +1063,14 @@ int get_next_verify(struct thread_data *td, struct io_u *io_u) 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; @@ -1033,15 +1109,14 @@ 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_entry(list.next, struct io_u, verify_list); + flist_del(&io_u->verify_list); 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;