#include <string.h>
#include <assert.h>
#include <pthread.h>
+#include <libgen.h>
#include "fio.h"
#include "verify.h"
if (use_seed)
__fill_random_buf(p, len, seed);
else
- io_u->rand_seed = fill_random_buf(p, len);
+ io_u->rand_seed = fill_random_buf(&td->buf_state, p, len);
break;
case 1:
+ /*
+ * See below write barrier comment
+ */
+#if 0
+ read_barrier();
if (io_u->buf_filled_len >= len) {
dprint(FD_VERIFY, "using already filled verify pattern b=0 len=%u\n", len);
return;
}
+#endif
dprint(FD_VERIFY, "fill verify pattern b=0 len=%u\n", len);
memset(p, td->o.verify_pattern[0], len);
+ /*
+ * We need to ensure that the pattern stores are seen before
+ * the fill length store, or we could observe headers that
+ * aren't valid to the extent notified by the fill length
+ */
+ write_barrier();
io_u->buf_filled_len = len;
break;
default: {
unsigned int i = 0, size = 0;
unsigned char *b = p;
+#if 0
+ read_barrier();
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;
}
+#endif
dprint(FD_VERIFY, "fill verify pattern b=%d len=%u\n",
td->o.verify_pattern_bytes, len);
memcpy(b+i, td->o.verify_pattern, size);
i += size;
}
+ write_barrier();
io_u->buf_filled_len = len;
break;
}
}
}
+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)
+ hdr_inc = td->o.verify_interval;
+
+ return hdr_inc;
+}
+
+static void fill_pattern_headers(struct thread_data *td, struct io_u *io_u,
+ unsigned long seed, int use_seed)
+{
+ unsigned int hdr_inc, header_num;
+ struct verify_header *hdr;
+ void *p = io_u->buf;
+
+ fill_pattern(td, p, io_u->buflen, io_u, seed, use_seed);
+
+ hdr_inc = get_hdr_inc(td, io_u);
+ header_num = 0;
+ for (; p < io_u->buf + io_u->buflen; p += hdr_inc) {
+ hdr = p;
+ populate_hdr(td, io_u, hdr, header_num, hdr_inc);
+ header_num++;
+ }
+}
+
static void memswp(void *buf1, void *buf2, unsigned int len)
{
char swap[200];
case VERIFY_SHA1:
len = sizeof(struct vhdr_sha1);
break;
+ case VERIFY_PATTERN:
+ len = 0;
+ break;
default:
log_err("fio: unknown verify header!\n");
assert(0);
unsigned int crc_len;
};
-static void dump_buf(char *buf, unsigned int len, const char *name,
- unsigned long long offset)
+static void dump_buf(char *buf, unsigned int len, unsigned long long offset,
+ const char *type, struct fio_file *f)
{
- char fname[80];
+ char *ptr, fname[256];
int ret, fd;
- sprintf(fname, "%llu.%s", offset, name);
+ ptr = strdup(f->file_name);
+ strcpy(fname, basename(ptr));
+
+ sprintf(fname + strlen(fname), ".%llu.%s", offset, type);
fd = open(fname, O_CREAT | O_TRUNC | O_WRONLY, 0644);
if (fd < 0) {
}
close(fd);
- log_err(" %s data dumped as %s\n", name, fname);
+ log_err(" %s data dumped as %s\n", type, fname);
+ free(ptr);
}
+/*
+ * Dump the contents of the read block and re-generate the correct data
+ * and dump that too.
+ */
static void dump_verify_buffers(struct verify_header *hdr, struct vcont *vc)
{
struct thread_data *td = vc->td;
struct io_u *io_u = vc->io_u;
unsigned long hdr_offset;
- unsigned int hdr_inc, header_num;
struct io_u dummy;
- void *buf, *p;
+ void *buf;
+ /*
+ * Dump the contents we just read off disk
+ */
hdr_offset = vc->hdr_num * hdr->len;
- dump_buf(io_u->buf + hdr_offset, hdr->len, "received",
- io_u->offset + hdr_offset);
+ dump_buf(io_u->buf + hdr_offset, hdr->len, io_u->offset + hdr_offset,
+ "received", vc->io_u->file);
- buf = p = malloc(io_u->buflen);
+ /*
+ * Allocate a new buf and re-generate the original data
+ */
+ buf = malloc(io_u->buflen);
dummy = *io_u;
- fill_pattern(td, p, io_u->buflen, &dummy, hdr->rand_seed, 1);
+ dummy.buf = buf;
+ dummy.rand_seed = hdr->rand_seed;
+ dummy.buf_filled_len = 0;
- hdr_inc = io_u->buflen;
- if (td->o.verify_interval)
- hdr_inc = td->o.verify_interval;
+ fill_pattern_headers(td, &dummy, hdr->rand_seed, 1);
- header_num = 0;
- for (; p < buf + io_u->buflen; p += hdr_inc) {
- hdr = p;
- populate_hdr(td, io_u, hdr, header_num, hdr_inc);
- header_num++;
- }
-
- dump_buf(buf + hdr_offset, hdr->len, "expected",
- io_u->offset + hdr_offset);
+ dump_buf(buf + hdr_offset, hdr->len, io_u->offset + hdr_offset,
+ "expected", vc->io_u->file);
free(buf);
}
return vc->io_u->buf + vc->hdr_num * hdr->len + hdr_size(hdr);
}
-static int verify_io_u_meta(struct verify_header *hdr, struct thread_data *td,
- struct vcont *vc)
+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;
+ struct io_u *io_u = vc->io_u;
+ char *buf, *pattern;
+ unsigned int header_size = __hdr_size(td->o.verify);
+ unsigned int len, mod, i;
+
+ pattern = td->o.verify_pattern;
+ buf = (void *) hdr + header_size;
+ len = get_hdr_inc(td, io_u) - header_size;
+ mod = header_size % td->o.verify_pattern_bytes;
+
+ for (i = 0; i < len; i++) {
+ if (buf[i] != pattern[mod]) {
+ unsigned int bits;
+
+ bits = hweight8(buf[i] ^ pattern[mod]);
+ log_err("fio: got pattern %x, wanted %x. Bad bits %d\n",
+ buf[i], pattern[mod], bits);
+ log_err("fio: bad pattern block offset %u\n", i);
+ dump_verify_buffers(hdr, vc);
+ return EILSEQ;
+ }
+ mod++;
+ if (mod == td->o.verify_pattern_bytes)
+ mod = 0;
+ }
+
+ return 0;
+}
+
+static int verify_io_u_meta(struct verify_header *hdr, struct vcont *vc)
+{
+ struct thread_data *td = vc->td;
struct vhdr_meta *vh = hdr_priv(hdr);
struct io_u *io_u = vc->io_u;
+ int ret = EILSEQ;
dprint(FD_VERIFY, "meta verify io_u %p, len %u\n", io_u, hdr->len);
if (vh->offset == io_u->offset + vc->hdr_num * td->o.verify_interval)
+ ret = 0;
+
+ if (td->o.verify_pattern_bytes)
+ ret |= verify_io_u_pattern(hdr, vc);
+
+ if (!ret)
return 0;
vc->name = "meta";
log_verify_failure(hdr, vc);
- return EILSEQ;
+ return ret;
}
static int verify_io_u_sha512(struct verify_header *hdr, struct vcont *vc)
return EILSEQ;
}
-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(char *pattern, unsigned long pattern_size,
- char *buf, unsigned int len, unsigned int mod)
-{
- unsigned int i;
-
- for (i = 0; i < len; i++) {
- if (buf[i] != pattern[mod]) {
- unsigned int bits;
-
- bits = hweight8(buf[i] ^ pattern[mod]);
- log_err("fio: got pattern %x, wanted %x. Bad bits %d\n",
- buf[i], pattern[mod], bits);
- log_err("fio: bad pattern block offset %u\n", i);
- return EILSEQ;
- }
- mod++;
- if (mod == pattern_size)
- mod = 0;
- }
-
- return 0;
-}
-
/*
* Push IO verification to a separate thread
*/
int verify_io_u(struct thread_data *td, struct io_u *io_u)
{
struct verify_header *hdr;
- unsigned int hdr_size, hdr_inc, hdr_num = 0;
+ unsigned int header_size, hdr_inc, hdr_num = 0;
void *p;
int ret;
goto done;
}
- hdr_inc = io_u->buflen;
- if (td->o.verify_interval)
- hdr_inc = td->o.verify_interval;
+ hdr_inc = get_hdr_inc(td, io_u);
ret = 0;
for (p = io_u->buf; p < io_u->buf + io_u->buflen;
if (ret && td->o.verify_fatal)
break;
- hdr_size = __hdr_size(td->o.verify);
+ header_size = __hdr_size(td->o.verify);
if (td->o.verify_offset)
- memswp(p, p + td->o.verify_offset, hdr_size);
+ memswp(p, p + td->o.verify_offset, header_size);
hdr = p;
if (hdr->fio_magic != FIO_HDR_MAGIC) {
return EILSEQ;
}
- if (td->o.verify_pattern_bytes) {
- dprint(FD_VERIFY, "pattern verify io_u %p, len %u\n",
- io_u, hdr->len);
- ret = verify_io_u_pattern(td->o.verify_pattern,
- td->o.verify_pattern_bytes,
- p + hdr_size,
- hdr_inc - hdr_size,
- hdr_size % td->o.verify_pattern_bytes);
-
- if (ret) {
- log_err("pattern: verify failed at file %s offset %llu, length %u\n",
- io_u->file->file_name,
- io_u->offset + hdr_num * hdr->len,
- hdr->len);
- }
-
- /*
- * Also verify the meta data, if applicable
- */
- if (hdr->verify_type == VERIFY_META)
- ret |= verify_io_u_meta(hdr, td, &vc);
- continue;
- }
-
switch (hdr->verify_type) {
case VERIFY_MD5:
ret = verify_io_u_md5(hdr, &vc);
ret = verify_io_u_sha512(hdr, &vc);
break;
case VERIFY_META:
- ret = verify_io_u_meta(hdr, td, &vc);
+ ret = verify_io_u_meta(hdr, &vc);
break;
case VERIFY_SHA1:
ret = verify_io_u_sha1(hdr, &vc);
break;
+ case VERIFY_PATTERN:
+ ret = verify_io_u_pattern(hdr, &vc);
+ break;
default:
log_err("Bad verify type %u\n", hdr->verify_type);
ret = EINVAL;
io_u, hdr->len);
fill_sha1(hdr, data, data_len);
break;
+ case VERIFY_PATTERN:
+ /* nothing to do here */
+ break;
default:
log_err("fio: bad verify type: %d\n", td->o.verify);
assert(0);
/*
* fill body of io_u->buf with random data and add a header with the
- * crc32 or md5 sum of that data.
+ * checksum of choice
*/
void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
{
- struct verify_header *hdr;
- unsigned int hdr_inc, header_num = 0;
- void *p = io_u->buf;
-
if (td->o.verify == VERIFY_NULL)
return;
- fill_pattern(td, p, io_u->buflen, io_u, 0, 0);
-
- hdr_inc = io_u->buflen;
- if (td->o.verify_interval)
- hdr_inc = td->o.verify_interval;
-
- for (; p < io_u->buf + io_u->buflen; p += hdr_inc) {
- hdr = p;
- populate_hdr(td, io_u, hdr, header_num, hdr_inc);
- header_num++;
- }
+ fill_pattern_headers(td, io_u, 0, 0);
}
int get_next_verify(struct thread_data *td, struct io_u *io_u)