}
}
-static void memswp(void* buf1, void* buf2, unsigned int len)
+static void memswp(void *buf1, void *buf2, unsigned int len)
{
char swap[200];
log_err("meta: verify failed at %llu/%u\n",
io_u->offset + header_num * hdr->len,
hdr->len);
- return 1;
+ return EIO;
}
return 0;
hdr->len);
hexdump(vh->sha512, sizeof(vh->sha512));
hexdump(sha512_ctx.buf, sizeof(sha512));
- return 1;
+ return EIO;
}
return 0;
hdr->len);
hexdump(vh->sha256, sizeof(vh->sha256));
hexdump(sha256_ctx.buf, sizeof(sha256));
- return 1;
+ return EIO;
}
return 0;
io_u->offset + header_num * hdr->len,
hdr->len);
log_err("crc7: wanted %x, got %x\n", vh->crc7, c);
- return 1;
+ return EIO;
}
return 0;
io_u->offset + header_num * hdr->len,
hdr->len);
log_err("crc16: wanted %x, got %x\n", vh->crc16, c);
- return 1;
+ return EIO;
}
return 0;
io_u->offset + header_num * hdr->len,
hdr->len);
log_err("crc64: wanted %llx, got %llx\n", (unsigned long long) vh->crc64, c);
- return 1;
+ return EIO;
}
return 0;
io_u->offset + header_num * hdr->len,
hdr->len);
log_err("crc32: wanted %x, got %x\n", vh->crc32, c);
- return 1;
+ return EIO;
}
return 0;
hdr->len);
hexdump(vh->md5_digest, sizeof(vh->md5_digest));
hexdump(md5_ctx.hash, sizeof(hash));
- return 1;
+ return EIO;
}
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)
+ char *buf, unsigned int len, unsigned int mod)
{
unsigned int i;
char split_pattern[4];
}
for (i = 0; i < len; i++) {
- if (buf[i] != split_pattern[mod])
- return 1;
+ 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 EIO;
+ }
mod++;
if (mod == pattern_size)
mod = 0;
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 = p;
+ if (hdr->fio_magic != FIO_HDR_MAGIC) {
+ log_err("Bad verify header %x\n", hdr->fio_magic);
+ return EIO;
+ }
+
if (td->o.verify_pattern_bytes) {
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("pattern: verify failed at %llu/%u\n",
+ if (ret)
+ log_err("fio: verify failed at %llu/%u\n",
io_u->offset + hdr_num * hdr->len,
- hdr->len);
- return ret;
- }
- }
-
- if (hdr->fio_magic != FIO_HDR_MAGIC) {
- log_err("Bad verify header %x\n", hdr->fio_magic);
- return EIO;
+ hdr->len);
+ continue;
}
switch (hdr->verify_type) {
break;
default:
log_err("Bad verify type %u\n", hdr->verify_type);
- ret = 1;
+ ret = EINVAL;
}
- hdr_num++;
}
- return 0;
+ return ret;
}
static void fill_meta(struct verify_header *hdr, struct thread_data *td,