#include <fcntl.h>
#include <string.h>
#include <assert.h>
+#include <pthread.h>
#include "fio.h"
+#include "verify.h"
+#include "smalloc.h"
+#include "lib/rand.h"
#include "crc/md5.h"
#include "crc/crc64.h"
#include "crc/crc32.h"
+#include "crc/crc32c.h"
#include "crc/crc16.h"
#include "crc/crc7.h"
#include "crc/sha256.h"
#include "crc/sha512.h"
-
-static void fill_random_bytes(struct thread_data *td, void *p, unsigned int len)
-{
- unsigned int todo;
- int r;
-
- while (len) {
- r = os_random_long(&td->verify_state);
-
- /*
- * lrand48_r seems to be broken and only fill the bottom
- * 32-bits, even on 64-bit archs with 64-bit longs
- */
- todo = sizeof(r);
- if (todo > len)
- todo = len;
-
- memcpy(p, &r, todo);
-
- len -= todo;
- p += todo;
- }
-}
+#include "crc/sha1.h"
static void fill_pattern(struct thread_data *td, void *p, unsigned int len)
{
switch (td->o.verify_pattern_bytes) {
case 0:
dprint(FD_VERIFY, "fill random bytes len=%u\n", len);
- fill_random_bytes(td, p, len);
+ fill_random_buf(p, len);
break;
case 1:
dprint(FD_VERIFY, "fill verify pattern b=0 len=%u\n", len);
- memset(p, td->o.verify_pattern, len);
+ memset(p, td->o.verify_pattern[0], len);
break;
- case 2:
- case 3:
- case 4: {
- unsigned int pattern = td->o.verify_pattern;
- unsigned int i = 0;
- unsigned char c1, c2, c3, c4;
+ default: {
+ unsigned int i = 0, size = 0;
unsigned char *b = p;
dprint(FD_VERIFY, "fill verify pattern b=%d len=%u\n",
td->o.verify_pattern_bytes, len);
- c1 = pattern & 0xff;
- pattern >>= 8;
- c2 = pattern & 0xff;
- pattern >>= 8;
- c3 = pattern & 0xff;
- pattern >>= 8;
- c4 = pattern & 0xff;
-
while (i < len) {
- b[i++] = c1;
- if (i == len)
- break;
- b[i++] = c2;
- if (td->o.verify_pattern_bytes == 2 || i == len)
- continue;
- b[i++] = c3;
- if (td->o.verify_pattern_bytes == 3 || i == len)
- continue;
- b[i++] = c4;
+ size = td->o.verify_pattern_bytes;
+ if (size > (len - i))
+ size = len - i;
+ memcpy(b+i, td->o.verify_pattern, size);
+ i += size;
}
break;
}
int i;
for (i = 0; i < len; i++)
- log_info("%02x", p[i]);
- log_info("\n");
+ log_err("%02x", p[i]);
+ log_err("\n");
}
/*
case VERIFY_CRC64:
len = sizeof(struct vhdr_crc64);
break;
+ case VERIFY_CRC32C:
case VERIFY_CRC32:
+ case VERIFY_CRC32C_INTEL:
len = sizeof(struct vhdr_crc32);
break;
case VERIFY_CRC16:
case VERIFY_META:
len = sizeof(struct vhdr_meta);
break;
+ case VERIFY_SHA1:
+ len = sizeof(struct vhdr_sha1);
+ break;
default:
log_err("fio: unknown verify header!\n");
assert(0);
return priv + sizeof(struct verify_header);
}
+/*
+ * Verify container, pass info to verify handlers and allow them to
+ * pass info back in case of error
+ */
+struct vcont {
+ /*
+ * Input
+ */
+ struct io_u *io_u;
+ unsigned int hdr_num;
+
+ /*
+ * Output, only valid in case of error
+ */
+ const char *name;
+ void *good_crc;
+ void *bad_crc;
+ unsigned int crc_len;
+};
+
+static void log_verify_failure(struct verify_header *hdr, struct vcont *vc)
+{
+ unsigned long long offset;
+
+ offset = vc->io_u->offset;
+ offset += vc->hdr_num * hdr->len;
+ log_err("%.8s: verify failed at file %s offset %llu, length %u\n",
+ vc->name, vc->io_u->file->file_name, offset, hdr->len);
+
+ if (vc->good_crc && vc->bad_crc) {
+ log_err(" Expected CRC: ");
+ hexdump(vc->good_crc, vc->crc_len);
+ log_err(" Received CRC: ");
+ hexdump(vc->bad_crc, vc->crc_len);
+ }
+}
+
/*
* Return data area 'header_num'
*/
-static inline void *io_u_verify_off(struct verify_header *hdr,
- struct io_u *io_u, unsigned char header_num)
+static inline void *io_u_verify_off(struct verify_header *hdr, struct vcont *vc)
{
- return io_u->buf + header_num * hdr->len + hdr_size(hdr);
+ 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 io_u *io_u, unsigned int header_num)
+ struct vcont *vc)
{
struct vhdr_meta *vh = hdr_priv(hdr);
+ struct io_u *io_u = vc->io_u;
dprint(FD_VERIFY, "meta verify io_u %p, len %u\n", io_u, hdr->len);
- if (vh->offset != io_u->offset + header_num * td->o.verify_interval) {
- log_err("meta: verify failed at %llu/%u\n",
- io_u->offset + header_num * hdr->len, hdr->len);
- return EIO;
- }
+ if (vh->offset == io_u->offset + vc->hdr_num * td->o.verify_interval)
+ return 0;
- return 0;
+ vc->name = "meta";
+ log_verify_failure(hdr, vc);
+ return EILSEQ;
}
-static int verify_io_u_sha512(struct verify_header *hdr, struct io_u *io_u,
- unsigned int header_num)
+static int verify_io_u_sha512(struct verify_header *hdr, struct vcont *vc)
{
- void *p = io_u_verify_off(hdr, io_u, header_num);
+ void *p = io_u_verify_off(hdr, vc);
struct vhdr_sha512 *vh = hdr_priv(hdr);
uint8_t sha512[128];
struct sha512_ctx sha512_ctx = {
.buf = sha512,
};
- dprint(FD_VERIFY, "sha512 verify io_u %p, len %u\n", io_u, hdr->len);
+ 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));
- if (memcmp(vh->sha512, sha512_ctx.buf, sizeof(sha512))) {
- log_err("sha512: verify failed at %llu/%u\n",
- io_u->offset + header_num * hdr->len, hdr->len);
- hexdump(vh->sha512, sizeof(vh->sha512));
- hexdump(sha512_ctx.buf, sizeof(sha512));
- return EIO;
- }
+ if (!memcmp(vh->sha512, sha512_ctx.buf, sizeof(sha512)))
+ return 0;
- return 0;
+ vc->name = "sha512";
+ vc->good_crc = vh->sha512;
+ vc->bad_crc = sha512_ctx.buf;
+ vc->crc_len = sizeof(vh->sha512);
+ log_verify_failure(hdr, vc);
+ return EILSEQ;
}
-static int verify_io_u_sha256(struct verify_header *hdr, struct io_u *io_u,
- unsigned int header_num)
+static int verify_io_u_sha256(struct verify_header *hdr, struct vcont *vc)
{
- void *p = io_u_verify_off(hdr, io_u, header_num);
+ void *p = io_u_verify_off(hdr, vc);
struct vhdr_sha256 *vh = hdr_priv(hdr);
- uint8_t sha256[128];
+ uint8_t sha256[64];
struct sha256_ctx sha256_ctx = {
.buf = sha256,
};
- dprint(FD_VERIFY, "sha256 verify io_u %p, len %u\n", io_u, hdr->len);
+ 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));
- if (memcmp(vh->sha256, sha256_ctx.buf, sizeof(sha256))) {
- log_err("sha256: verify failed at %llu/%u\n",
- io_u->offset + header_num * hdr->len, hdr->len);
- hexdump(vh->sha256, sizeof(vh->sha256));
- hexdump(sha256_ctx.buf, sizeof(sha256));
- return EIO;
- }
+ if (!memcmp(vh->sha256, sha256_ctx.buf, sizeof(sha256)))
+ return 0;
- return 0;
+ vc->name = "sha256";
+ vc->good_crc = vh->sha256;
+ vc->bad_crc = sha256_ctx.buf;
+ vc->crc_len = sizeof(vh->sha256);
+ log_verify_failure(hdr, vc);
+ return EILSEQ;
}
-static int verify_io_u_crc7(struct verify_header *hdr, struct io_u *io_u,
- unsigned char header_num)
+static int verify_io_u_sha1(struct verify_header *hdr, struct vcont *vc)
{
- void *p = io_u_verify_off(hdr, io_u, header_num);
+ void *p = io_u_verify_off(hdr, vc);
+ struct vhdr_sha1 *vh = hdr_priv(hdr);
+ uint32_t sha1[5];
+ struct 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));
+
+ if (!memcmp(vh->sha1, sha1_ctx.H, sizeof(sha1)))
+ return 0;
+
+ vc->name = "sha1";
+ vc->good_crc = vh->sha1;
+ vc->bad_crc = sha1_ctx.H;
+ vc->crc_len = sizeof(vh->sha1);
+ log_verify_failure(hdr, vc);
+ return EILSEQ;
+}
+
+static int verify_io_u_crc7(struct verify_header *hdr, struct vcont *vc)
+{
+ void *p = io_u_verify_off(hdr, vc);
struct vhdr_crc7 *vh = hdr_priv(hdr);
unsigned char c;
- dprint(FD_VERIFY, "crc7 verify io_u %p, len %u\n", io_u, hdr->len);
+ dprint(FD_VERIFY, "crc7 verify io_u %p, len %u\n", vc->io_u, hdr->len);
c = crc7(p, hdr->len - hdr_size(hdr));
- if (c != vh->crc7) {
- log_err("crc7: verify failed at %llu/%u\n",
- io_u->offset + header_num * hdr->len, hdr->len);
- log_err("crc7: wanted %x, got %x\n", vh->crc7, c);
- return EIO;
- }
+ if (c == vh->crc7)
+ return 0;
- return 0;
+ vc->name = "crc7";
+ vc->good_crc = &vh->crc7;
+ vc->bad_crc = &c;
+ vc->crc_len = 1;
+ log_verify_failure(hdr, vc);
+ return EILSEQ;
}
-static int verify_io_u_crc16(struct verify_header *hdr, struct io_u *io_u,
- unsigned int header_num)
+static int verify_io_u_crc16(struct verify_header *hdr, struct vcont *vc)
{
- void *p = io_u_verify_off(hdr, io_u, header_num);
+ void *p = io_u_verify_off(hdr, vc);
struct vhdr_crc16 *vh = hdr_priv(hdr);
unsigned short c;
- dprint(FD_VERIFY, "crc16 verify io_u %p, len %u\n", io_u, hdr->len);
+ dprint(FD_VERIFY, "crc16 verify io_u %p, len %u\n", vc->io_u, hdr->len);
c = crc16(p, hdr->len - hdr_size(hdr));
- if (c != vh->crc16) {
- log_err("crc16: verify failed at %llu/%u\n",
- io_u->offset + header_num * hdr->len, hdr->len);
- log_err("crc16: wanted %x, got %x\n", vh->crc16, c);
- return EIO;
- }
+ if (c == vh->crc16)
+ return 0;
- return 0;
+ vc->name = "crc16";
+ vc->good_crc = &vh->crc16;
+ vc->bad_crc = &c;
+ vc->crc_len = 2;
+ log_verify_failure(hdr, vc);
+ return EILSEQ;
}
-static int verify_io_u_crc64(struct verify_header *hdr, struct io_u *io_u,
- unsigned int header_num)
+static int verify_io_u_crc64(struct verify_header *hdr, struct vcont *vc)
{
- void *p = io_u_verify_off(hdr, io_u, header_num);
+ void *p = io_u_verify_off(hdr, vc);
struct vhdr_crc64 *vh = hdr_priv(hdr);
unsigned long long c;
- dprint(FD_VERIFY, "crc64 verify io_u %p, len %u\n", io_u, hdr->len);
+ dprint(FD_VERIFY, "crc64 verify io_u %p, len %u\n", vc->io_u, hdr->len);
c = crc64(p, hdr->len - hdr_size(hdr));
- if (c != vh->crc64) {
- log_err("crc64: verify failed at %llu/%u\n",
- io_u->offset + header_num * hdr->len,
- hdr->len);
- log_err("crc64: wanted %llx, got %llx\n",
- (unsigned long long) vh->crc64, c);
- return EIO;
- }
+ if (c == vh->crc64)
+ return 0;
- return 0;
+ vc->name = "crc64";
+ vc->good_crc = &vh->crc64;
+ vc->bad_crc = &c;
+ vc->crc_len = 8;
+ log_verify_failure(hdr, vc);
+ return EILSEQ;
}
-static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u,
- unsigned int header_num)
+static int verify_io_u_crc32(struct verify_header *hdr, struct vcont *vc)
{
- void *p = io_u_verify_off(hdr, io_u, header_num);
+ void *p = io_u_verify_off(hdr, vc);
struct vhdr_crc32 *vh = hdr_priv(hdr);
uint32_t c;
- dprint(FD_VERIFY, "crc32 verify io_u %p, len %u\n", io_u, hdr->len);
+ dprint(FD_VERIFY, "crc32 verify io_u %p, len %u\n", vc->io_u, hdr->len);
c = crc32(p, hdr->len - hdr_size(hdr));
- if (c != vh->crc32) {
- log_err("crc32: verify failed at %llu/%u\n",
- io_u->offset + header_num * hdr->len, hdr->len);
- log_err("crc32: wanted %x, got %x\n", vh->crc32, c);
- return EIO;
- }
+ if (c == vh->crc32)
+ return 0;
- return 0;
+ vc->name = "crc32";
+ vc->good_crc = &vh->crc32;
+ vc->bad_crc = &c;
+ vc->crc_len = 4;
+ log_verify_failure(hdr, vc);
+ return EILSEQ;
}
-static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u,
- unsigned int header_num)
+static int verify_io_u_crc32c(struct verify_header *hdr, struct vcont *vc)
{
- void *p = io_u_verify_off(hdr, io_u, header_num);
+ void *p = io_u_verify_off(hdr, vc);
+ struct vhdr_crc32 *vh = hdr_priv(hdr);
+ uint32_t c;
+
+ 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));
+
+ if (c == vh->crc32)
+ return 0;
+
+ vc->name = "crc32c";
+ vc->good_crc = &vh->crc32;
+ vc->bad_crc = &c;
+ vc->crc_len = 4;
+ log_verify_failure(hdr, vc);
+ return EILSEQ;
+}
+
+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 = {
.hash = hash,
};
- dprint(FD_VERIFY, "md5 verify io_u %p, len %u\n", io_u, hdr->len);
+ 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));
- if (memcmp(vh->md5_digest, md5_ctx.hash, sizeof(hash))) {
- log_err("md5: verify failed at %llu/%u\n",
- io_u->offset + header_num * hdr->len, hdr->len);
- hexdump(vh->md5_digest, sizeof(vh->md5_digest));
- hexdump(md5_ctx.hash, sizeof(hash));
- return EIO;
- }
+ if (!memcmp(vh->md5_digest, md5_ctx.hash, sizeof(hash)))
+ return 0;
- return 0;
+ vc->name = "md5";
+ vc->good_crc = vh->md5_digest;
+ vc->bad_crc = md5_ctx.hash;
+ vc->crc_len = sizeof(hash);
+ log_verify_failure(hdr, vc);
+ return EILSEQ;
}
static unsigned int hweight8(unsigned int w)
return (res + (res >> 4)) & 0x0F;
}
-int verify_io_u_pattern(unsigned long pattern, unsigned long pattern_size,
+int verify_io_u_pattern(char *pattern, unsigned long pattern_size,
char *buf, unsigned int len, unsigned int mod)
{
unsigned int i;
- char split_pattern[4];
-
- for (i = 0; i < 4; i++) {
- split_pattern[i] = pattern & 0xff;
- pattern >>= 8;
- }
for (i = 0; i < len; i++) {
- if (buf[i] != split_pattern[mod]) {
+ if (buf[i] != pattern[mod]) {
unsigned int bits;
- bits = hweight8(buf[i] ^ split_pattern[mod]);
+ bits = hweight8(buf[i] ^ pattern[mod]);
log_err("fio: got pattern %x, wanted %x. Bad bits %d\n",
- buf[i], split_pattern[mod], bits);
+ buf[i], pattern[mod], bits);
log_err("fio: bad pattern block offset %u\n", i);
- return EIO;
+ return EILSEQ;
}
mod++;
if (mod == pattern_size)
return 0;
}
+/*
+ * Push IO verification to a separate thread
+ */
+int verify_io_u_async(struct thread_data *td, struct io_u *io_u)
+{
+ 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;
+ }
+ flist_del(&io_u->list);
+ flist_add_tail(&io_u->list, &td->verify_list);
+ io_u->flags |= IO_U_F_FREE_DEF;
+ pthread_mutex_unlock(&td->io_u_lock);
+
+ pthread_cond_signal(&td->verify_cond);
+ return 0;
+}
+
int verify_io_u(struct thread_data *td, struct io_u *io_u)
{
struct verify_header *hdr;
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;
+ struct vcont vc = {
+ .io_u = io_u,
+ .hdr_num = hdr_num,
+ };
+
+ if (ret && td->o.verify_fatal)
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;
+ log_err("verify: bad magic header %x, wanted %x at file %s offset %llu, length %u\n",
+ hdr->fio_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 % 4);
- if (ret)
- log_err("fio: verify failed at %llu/%u\n",
+ 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, io_u, hdr_num);
+ ret = verify_io_u_md5(hdr, &vc);
break;
case VERIFY_CRC64:
- ret = verify_io_u_crc64(hdr, io_u, hdr_num);
+ ret = verify_io_u_crc64(hdr, &vc);
+ break;
+ case VERIFY_CRC32C:
+ case VERIFY_CRC32C_INTEL:
+ ret = verify_io_u_crc32c(hdr, &vc);
break;
case VERIFY_CRC32:
- ret = verify_io_u_crc32(hdr, io_u, hdr_num);
+ ret = verify_io_u_crc32(hdr, &vc);
break;
case VERIFY_CRC16:
- ret = verify_io_u_crc16(hdr, io_u, hdr_num);
+ ret = verify_io_u_crc16(hdr, &vc);
break;
case VERIFY_CRC7:
- ret = verify_io_u_crc7(hdr, io_u, hdr_num);
+ ret = verify_io_u_crc7(hdr, &vc);
break;
case VERIFY_SHA256:
- ret = verify_io_u_sha256(hdr, io_u, hdr_num);
+ ret = verify_io_u_sha256(hdr, &vc);
break;
case VERIFY_SHA512:
- ret = verify_io_u_sha512(hdr, io_u, hdr_num);
+ ret = verify_io_u_sha512(hdr, &vc);
break;
case VERIFY_META:
- ret = verify_io_u_meta(hdr, td, io_u, hdr_num);
+ ret = verify_io_u_meta(hdr, td, &vc);
+ break;
+ case VERIFY_SHA1:
+ ret = verify_io_u_sha1(hdr, &vc);
break;
default:
log_err("Bad verify type %u\n", hdr->verify_type);
}
}
+ if (ret && td->o.verify_fatal)
+ td->terminate = 1;
+
return ret;
}
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 = {
+ .H = vh->sha1,
+ };
+
+ sha1_init(&sha1_ctx);
+ 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->crc32 = 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);
+}
+
static void fill_crc64(struct verify_header *hdr, void *p, unsigned int len)
{
struct vhdr_crc64 *vh = hdr_priv(hdr);
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);
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);
ipo = rb_entry(n, struct io_piece, rb_node);
rb_erase(n, &td->io_hist_tree);
+ td->io_hist_len--;
} 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);
}
io_u->buflen = ipo->len;
io_u->file = ipo->file;
- if ((io_u->file->flags & FIO_FILE_OPEN) == 0) {
+ if (!fio_file_open(io_u->file)) {
int r = td_io_open_file(td, io_u->file);
if (r) {
}
get_file(ipo->file);
- assert(io_u->file->flags & FIO_FILE_OPEN);
+ assert(fio_file_open(io_u->file));
io_u->ddir = DDIR_READ;
io_u->xfer_buf = io_u->buf;
io_u->xfer_buflen = io_u->buflen;
dprint(FD_VERIFY, "get_next_verify: empty\n");
return 1;
}
+
+static void *verify_async_thread(void *data)
+{
+ struct thread_data *td = data;
+ struct io_u *io_u;
+ int ret = 0;
+
+ if (td->o.verify_cpumask_set &&
+ fio_setaffinity(td->pid, td->o.verify_cpumask)) {
+ log_err("fio: failed setting verify thread affinity\n");
+ goto done;
+ }
+
+ do {
+ FLIST_HEAD(list);
+
+ read_barrier();
+ if (td->verify_thread_exit)
+ break;
+
+ pthread_mutex_lock(&td->io_u_lock);
+
+ while (flist_empty(&td->verify_list) &&
+ !td->verify_thread_exit) {
+ ret = pthread_cond_wait(&td->verify_cond,
+ &td->io_u_lock);
+ if (ret) {
+ pthread_mutex_unlock(&td->io_u_lock);
+ break;
+ }
+ }
+
+ flist_splice_init(&td->verify_list, &list);
+ pthread_mutex_unlock(&td->io_u_lock);
+
+ if (flist_empty(&list))
+ continue;
+
+ while (!flist_empty(&list)) {
+ io_u = flist_entry(list.next, struct io_u, list);
+ flist_del_init(&io_u->list);
+
+ ret = verify_io_u(td, io_u);
+ put_io_u(td, io_u);
+ if (!ret)
+ continue;
+ if (td->o.continue_on_error &&
+ td_non_fatal_error(ret)) {
+ update_error_count(td, ret);
+ td_clear_error(td);
+ ret = 0;
+ }
+ }
+ } while (!ret);
+
+ if (ret) {
+ td_verror(td, ret, "async_verify");
+ if (td->o.verify_fatal)
+ td->terminate = 1;
+ }
+
+done:
+ pthread_mutex_lock(&td->io_u_lock);
+ td->nr_verify_threads--;
+ pthread_mutex_unlock(&td->io_u_lock);
+
+ pthread_cond_signal(&td->free_cond);
+ return NULL;
+}
+
+int verify_async_init(struct thread_data *td)
+{
+ int i, ret;
+
+ 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,
+ verify_async_thread, td);
+ if (ret) {
+ log_err("fio: async verify creation failed: %s\n",
+ strerror(ret));
+ break;
+ }
+ ret = pthread_detach(td->verify_threads[i]);
+ if (ret) {
+ log_err("fio: async verify thread detach failed: %s\n",
+ strerror(ret));
+ break;
+ }
+ td->nr_verify_threads++;
+ }
+
+ if (i != td->o.verify_async) {
+ log_err("fio: only %d verify threads started, exiting\n", i);
+ td->verify_thread_exit = 1;
+ write_barrier();
+ pthread_cond_broadcast(&td->verify_cond);
+ return 1;
+ }
+
+ return 0;
+}
+
+void verify_async_exit(struct thread_data *td)
+{
+ td->verify_thread_exit = 1;
+ write_barrier();
+ pthread_cond_broadcast(&td->verify_cond);
+
+ pthread_mutex_lock(&td->io_u_lock);
+
+ while (td->nr_verify_threads)
+ pthread_cond_wait(&td->free_cond, &td->io_u_lock);
+
+ pthread_mutex_unlock(&td->io_u_lock);
+ free(td->verify_threads);
+ td->verify_threads = NULL;
+}