#include <string.h>
#include <assert.h>
#include <pthread.h>
+#include <libgen.h>
#include "fio.h"
#include "verify.h"
#include "smalloc.h"
+#include "trim.h"
#include "lib/rand.h"
#include "crc/md5.h"
#include "crc/sha512.h"
#include "crc/sha1.h"
-static void fill_pattern(struct thread_data *td, void *p, unsigned int len)
+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)
{
switch (td->o.verify_pattern_bytes) {
case 0:
dprint(FD_VERIFY, "fill random bytes len=%u\n", len);
- fill_random_buf(p, len);
+ if (use_seed)
+ __fill_random_buf(p, len, seed);
+ else
+ io_u->rand_seed = fill_random_buf(&td->buf_state, p, len);
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;
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);
memcpy(b+i, td->o.verify_pattern, size);
i += size;
}
+ 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 && td->o.verify_interval <= io_u->buflen)
+ 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];
*/
static inline unsigned int __hdr_size(int verify_type)
{
- unsigned int len = len;
+ unsigned int len = 0;
switch (verify_type) {
case VERIFY_NONE:
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);
*/
struct io_u *io_u;
unsigned int hdr_num;
+ struct thread_data *td;
/*
* Output, only valid in case of error
unsigned int crc_len;
};
+static void dump_buf(char *buf, unsigned int len, unsigned long long offset,
+ const char *type, struct fio_file *f)
+{
+ char *ptr, fname[256];
+ int ret, fd;
+
+ 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) {
+ perror("open verify buf file");
+ return;
+ }
+
+ while (len) {
+ ret = write(fd, buf, len);
+ if (!ret)
+ break;
+ else if (ret < 0) {
+ perror("write verify buf file");
+ break;
+ }
+ len -= ret;
+ buf += ret;
+ }
+
+ close(fd);
+ 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;
+ struct io_u dummy;
+ void *buf;
+
+ if (!td->o.verify_dump)
+ return;
+
+ /*
+ * Dump the contents we just read off disk
+ */
+ hdr_offset = vc->hdr_num * hdr->len;
+
+ dump_buf(io_u->buf + hdr_offset, hdr->len, io_u->offset + hdr_offset,
+ "received", vc->io_u->file);
+
+ /*
+ * Allocate a new buf and re-generate the original data
+ */
+ buf = malloc(io_u->buflen);
+ dummy = *io_u;
+ dummy.buf = buf;
+ dummy.rand_seed = hdr->rand_seed;
+ dummy.buf_filled_len = 0;
+
+ fill_pattern_headers(td, &dummy, hdr->rand_seed, 1);
+
+ dump_buf(buf + hdr_offset, hdr->len, io_u->offset + hdr_offset,
+ "expected", vc->io_u->file);
+ free(buf);
+}
+
static void log_verify_failure(struct verify_header *hdr, struct vcont *vc)
{
unsigned long long offset;
log_err(" Received CRC: ");
hexdump(vc->bad_crc, vc->crc_len);
}
+
+ dump_verify_buffers(hdr, vc);
}
/*
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, size, pattern_size;
+
+ pattern = td->o.verify_pattern;
+ pattern_size = td->o.verify_pattern_bytes;
+ if (pattern_size <= 1)
+ pattern_size = MAX_PATTERN_SIZE;
+ buf = (void *) hdr + header_size;
+ len = get_hdr_inc(td, io_u) - header_size;
+ mod = header_size % pattern_size;
+
+ for (i = 0; i < len; i += size) {
+ size = pattern_size - mod;
+ if (size > (len - i))
+ size = len - i;
+ if (memcmp(buf + i, pattern + mod, size))
+ /* Let the slow compare find the first mismatch byte. */
+ break;
+ mod = 0;
+ }
+
+ for (; 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)
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;
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;
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;
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;
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;
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;
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;
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;
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;
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
*/
if (io_u->file)
put_file_log(td, io_u->file);
- io_u->file = NULL;
-
pthread_mutex_lock(&td->io_u_lock);
-
+
if (io_u->flags & IO_U_F_IN_CUR_DEPTH) {
td->cur_depth--;
io_u->flags &= ~IO_U_F_IN_CUR_DEPTH;
return 0;
}
+static int verify_trimmed_io_u(struct thread_data *td, struct io_u *io_u)
+{
+ static char zero_buf[1024];
+ unsigned int this_len, len;
+ int ret = 0;
+ void *p;
+
+ if (!td->o.trim_zero)
+ return 0;
+
+ len = io_u->buflen;
+ p = io_u->buf;
+ do {
+ this_len = sizeof(zero_buf);
+ if (this_len > len)
+ this_len = len;
+ if (memcmp(p, zero_buf, this_len)) {
+ ret = EILSEQ;
+ break;
+ }
+ len -= this_len;
+ p += this_len;
+ } while (len);
+
+ if (!ret)
+ return 0;
+
+ log_err("trim: verify failed at file %s offset %llu, length %lu"
+ ", block offset %lu\n",
+ io_u->file->file_name, io_u->offset, io_u->buflen,
+ (unsigned long) (p - io_u->buf));
+ return ret;
+}
+
+static int verify_header(struct io_u *io_u, struct verify_header *hdr)
+{
+ 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;
+ }
+
+ 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);
+ return 0;
+}
+
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;
if (td->o.verify == VERIFY_NULL || io_u->ddir != DDIR_READ)
return 0;
+ if (io_u->flags & IO_U_F_TRIMMED) {
+ ret = verify_trimmed_io_u(td, io_u);
+ 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;
struct vcont vc = {
.io_u = io_u,
.hdr_num = hdr_num,
+ .td = td,
};
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) {
- log_err("verify: bad magic header %x, wanted %x at file %s offset %llu, length %u\n",
- hdr->fio_magic, FIO_HDR_MAGIC,
+ 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;
}
- 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;
}
}
+done:
if (ret && td->o.verify_fatal)
td->terminate = 1;
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,
+ struct verify_header *hdr, unsigned int header_num,
+ unsigned int header_len)
+{
+ unsigned int data_len;
+ void *data, *p;
+
+ p = (void *) hdr;
+
+ hdr->magic = FIO_HDR_MAGIC;
+ hdr->verify_type = td->o.verify;
+ hdr->len = header_len;
+ hdr->rand_seed = io_u->rand_seed;
+ hdr->crc32 = fio_crc32c(p, offsetof(struct verify_header, crc32));
+
+ data_len = header_len - hdr_size(hdr);
+
+ data = p + hdr_size(hdr);
+ switch (td->o.verify) {
+ case VERIFY_MD5:
+ dprint(FD_VERIFY, "fill md5 io_u %p, len %u\n",
+ io_u, hdr->len);
+ fill_md5(hdr, data, data_len);
+ break;
+ case VERIFY_CRC64:
+ dprint(FD_VERIFY, "fill crc64 io_u %p, len %u\n",
+ io_u, hdr->len);
+ fill_crc64(hdr, data, data_len);
+ break;
+ case VERIFY_CRC32C:
+ case VERIFY_CRC32C_INTEL:
+ dprint(FD_VERIFY, "fill crc32c io_u %p, len %u\n",
+ io_u, hdr->len);
+ fill_crc32c(hdr, data, data_len);
+ break;
+ case VERIFY_CRC32:
+ dprint(FD_VERIFY, "fill crc32 io_u %p, len %u\n",
+ io_u, hdr->len);
+ fill_crc32(hdr, data, data_len);
+ break;
+ case VERIFY_CRC16:
+ dprint(FD_VERIFY, "fill crc16 io_u %p, len %u\n",
+ io_u, hdr->len);
+ fill_crc16(hdr, data, data_len);
+ break;
+ case VERIFY_CRC7:
+ dprint(FD_VERIFY, "fill crc7 io_u %p, len %u\n",
+ io_u, hdr->len);
+ fill_crc7(hdr, data, data_len);
+ break;
+ case VERIFY_SHA256:
+ dprint(FD_VERIFY, "fill sha256 io_u %p, len %u\n",
+ io_u, hdr->len);
+ fill_sha256(hdr, data, data_len);
+ break;
+ case VERIFY_SHA512:
+ dprint(FD_VERIFY, "fill sha512 io_u %p, len %u\n",
+ io_u, hdr->len);
+ fill_sha512(hdr, data, data_len);
+ break;
+ case VERIFY_META:
+ dprint(FD_VERIFY, "fill meta io_u %p, len %u\n",
+ io_u, hdr->len);
+ fill_meta(hdr, td, io_u, header_num);
+ break;
+ case VERIFY_SHA1:
+ dprint(FD_VERIFY, "fill sha1 io_u %p, len %u\n",
+ 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);
+ }
+ if (td->o.verify_offset)
+ memswp(p, p + td->o.verify_offset, hdr_size(hdr));
}
/*
* 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;
- void *p = io_u->buf, *data;
- unsigned int hdr_inc, data_len, header_num = 0;
-
if (td->o.verify == VERIFY_NULL)
return;
- fill_pattern(td, p, io_u->buflen);
-
- 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;
-
- hdr->fio_magic = FIO_HDR_MAGIC;
- hdr->verify_type = td->o.verify;
- hdr->len = hdr_inc;
- data_len = hdr_inc - hdr_size(hdr);
-
- data = p + hdr_size(hdr);
- switch (td->o.verify) {
- case VERIFY_MD5:
- dprint(FD_VERIFY, "fill md5 io_u %p, len %u\n",
- io_u, hdr->len);
- fill_md5(hdr, data, data_len);
- break;
- case VERIFY_CRC64:
- dprint(FD_VERIFY, "fill crc64 io_u %p, len %u\n",
- io_u, hdr->len);
- fill_crc64(hdr, data, data_len);
- break;
- case VERIFY_CRC32C:
- case VERIFY_CRC32C_INTEL:
- dprint(FD_VERIFY, "fill crc32c io_u %p, len %u\n",
- io_u, hdr->len);
- fill_crc32c(hdr, data, data_len);
- break;
- case VERIFY_CRC32:
- dprint(FD_VERIFY, "fill crc32 io_u %p, len %u\n",
- io_u, hdr->len);
- fill_crc32(hdr, data, data_len);
- break;
- case VERIFY_CRC16:
- dprint(FD_VERIFY, "fill crc16 io_u %p, len %u\n",
- io_u, hdr->len);
- fill_crc16(hdr, data, data_len);
- break;
- case VERIFY_CRC7:
- dprint(FD_VERIFY, "fill crc7 io_u %p, len %u\n",
- io_u, hdr->len);
- fill_crc7(hdr, data, data_len);
- break;
- case VERIFY_SHA256:
- dprint(FD_VERIFY, "fill sha256 io_u %p, len %u\n",
- io_u, hdr->len);
- fill_sha256(hdr, data, data_len);
- break;
- case VERIFY_SHA512:
- dprint(FD_VERIFY, "fill sha512 io_u %p, len %u\n",
- io_u, hdr->len);
- fill_sha512(hdr, data, data_len);
- break;
- case VERIFY_META:
- dprint(FD_VERIFY, "fill meta io_u %p, len %u\n",
- io_u, hdr->len);
- fill_meta(hdr, td, io_u, header_num);
- break;
- case VERIFY_SHA1:
- dprint(FD_VERIFY, "fill sha1 io_u %p, len %u\n",
- io_u, hdr->len);
- fill_sha1(hdr, data, data_len);
- break;
- default:
- log_err("fio: bad verify type: %d\n", td->o.verify);
- assert(0);
- }
- if (td->o.verify_offset)
- memswp(p, p + td->o.verify_offset, hdr_size(hdr));
- header_num++;
- }
+ fill_pattern_headers(td, io_u, 0, 0);
}
int get_next_verify(struct thread_data *td, struct io_u *io_u)
ipo = rb_entry(n, struct io_piece, rb_node);
rb_erase(n, &td->io_hist_tree);
- td->io_hist_len--;
+ 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);
- td->io_hist_len--;
flist_del(&ipo->list);
+ assert(ipo->flags & IP_F_ONLIST);
+ ipo->flags &= ~IP_F_ONLIST;
}
if (ipo) {
+ td->io_hist_len--;
+
io_u->offset = ipo->offset;
io_u->buflen = ipo->len;
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;
if (!fio_file_open(io_u->file)) {
int r = td_io_open_file(td, io_u->file);
io_u->ddir = DDIR_READ;
io_u->xfer_buf = io_u->buf;
io_u->xfer_buflen = io_u->buflen;
+
+ remove_trim_entry(td, ipo);
free(ipo);
dprint(FD_VERIFY, "get_next_verify: ret io_u %p\n", io_u);
return 0;
put_io_u(td, io_u);
if (!ret)
continue;
- if (td->o.continue_on_error &&
+ if (td->o.continue_on_error & ERROR_TYPE_VERIFY &&
td_non_fatal_error(ret)) {
update_error_count(td, ret);
td_clear_error(td);
int verify_async_init(struct thread_data *td)
{
int i, ret;
+ pthread_attr_t attr;
+
+ pthread_attr_init(&attr);
+ pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN);
td->verify_thread_exit = 0;
td->verify_threads = malloc(sizeof(pthread_t) * td->o.verify_async);
for (i = 0; i < td->o.verify_async; i++) {
- ret = pthread_create(&td->verify_threads[i], NULL,
+ ret = pthread_create(&td->verify_threads[i], &attr,
verify_async_thread, td);
if (ret) {
log_err("fio: async verify creation failed: %s\n",
td->nr_verify_threads++;
}
+ pthread_attr_destroy(&attr);
+
if (i != td->o.verify_async) {
log_err("fio: only %d verify threads started, exiting\n", i);
td->verify_thread_exit = 1;
projects / fio.git / blobdiff