#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,
if (use_seed)
__fill_random_buf(p, len, seed);
else
- io_u->rand_seed = fill_random_buf(&td->buf_state, p, len);
+ 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);
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;
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) {
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)))
+ if (!td->o.verify_only || td->o.loops == 0)
+ if (vh->numberio != io_u->numberio)
+ ret = EILSEQ;
+
if (!ret)
return 0;
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);
/*
* 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_add_tail(&io_u->verify_list, &td->verify_list);
- io_u->flags |= IO_U_F_FREE_DEF;
+ *io_u_ptr = NULL;
pthread_mutex_unlock(&td->io_u_lock);
pthread_cond_signal(&td->verify_cond);
return ret;
}
-static int verify_header(struct io_u *io_u, 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;
- if (hdr->magic != FIO_HDR_MAGIC)
- return 0;
- if (hdr->len > io_u->buflen) {
- log_err("fio: verify header exceeds buffer length (%u > %lu)\n", hdr->len, io_u->buflen);
- return 0;
+ 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;
}
crc = fio_crc32c(p, offsetof(struct verify_header, crc32));
- if (crc == hdr->crc32)
- return 1;
-
- log_err("fio: verify header crc %x, calculated %x\n", hdr->crc32, crc);
+ 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;
memswp(p, p + td->o.verify_offset, header_size);
hdr = p;
- if (!verify_header(io_u, hdr)) {
- 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;
- }
+ /*
+ * 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;
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;
done:
if (ret && td->o.verify_fatal)
- td->terminate = 1;
+ fio_mark_td_terminate(td);
return ret;
}
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);
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);
if (td->o.verify == VERIFY_NULL)
return;
+ io_u->numberio = td->io_issues[io_u->ddir];
+
fill_pattern_headers(td, io_u, 0, 0);
}
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;
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;
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;
}
continue;
while (!flist_empty(&list)) {
- io_u = flist_entry(list.next, struct io_u, verify_list);
- flist_del(&io_u->verify_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 (ret) {
td_verror(td, ret, "async_verify");
if (td->o.verify_fatal)
- td->terminate = 1;
+ fio_mark_td_terminate(td);
}
done:
projects / fio.git / blobdiff