summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-01-14 21:20:42 +0100
committerJens Axboe <jaxboe@fusionio.com>2011-01-14 21:20:42 +0100
commit92bf48d530ab09bae4058df711c4723c73da51b9 (patch)
treec8e57d1b74c0d2b620b0e7d57bc78561f7512b00
parent964f5b9b267e3c87035309b9838c357613bfa209 (diff)
downloadfio-92bf48d530ab09bae4058df711c4723c73da51b9.tar.gz
fio-92bf48d530ab09bae4058df711c4723c73da51b9.tar.bz2
Streamline pattern/meta verifies instead of special casing them
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r--options.c5
-rw-r--r--verify.c123
-rw-r--r--verify.h1
3 files changed, 66 insertions, 63 deletions
diff --git a/options.c b/options.c
index 37e68d26..163e5089 100644
--- a/options.c
+++ b/options.c
@@ -675,6 +675,11 @@ static int str_verify_pattern_cb(void *data, const char *input)
}
}
td->o.verify_pattern_bytes = i;
+ /*
+ * VERIFY_META could already be set
+ */
+ if (td->o.verify == VERIFY_NONE)
+ td->o.verify = VERIFY_PATTERN;
return 0;
}
diff --git a/verify.c b/verify.c
index 66b3ef0d..3eac9cab 100644
--- a/verify.c
+++ b/verify.c
@@ -179,6 +179,9 @@ static inline unsigned int __hdr_size(int verify_type)
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);
@@ -317,20 +320,67 @@ static inline void *io_u_verify_off(struct verify_header *hdr, struct vcont *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 hdr_size = __hdr_size(td->o.verify);
+ unsigned int len, mod, i;
+
+ pattern = td->o.verify_pattern;
+ buf = (void *) hdr + hdr_size;
+ len = get_hdr_inc(td, io_u) - hdr_size;
+ mod = hdr_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)
@@ -541,46 +591,6 @@ static int verify_io_u_md5(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(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 hdr_size = __hdr_size(td->o.verify);
- unsigned int len, mod, i;
-
- pattern = td->o.verify_pattern;
- buf = (void *) hdr + hdr_size;
- len = get_hdr_inc(td, io_u) - hdr_size;
- mod = hdr_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;
-}
-
/*
* Push IO verification to a separate thread
*/
@@ -681,25 +691,6 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
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(hdr, &vc);
- 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);
@@ -727,11 +718,14 @@ int verify_io_u(struct thread_data *td, struct io_u *io_u)
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;
@@ -910,6 +904,9 @@ static void populate_hdr(struct thread_data *td, struct io_u *io_u,
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);
diff --git a/verify.h b/verify.h
index d5a906e4..49ce417c 100644
--- a/verify.h
+++ b/verify.h
@@ -18,6 +18,7 @@ enum {
VERIFY_SHA512, /* sha512 sum data blocks */
VERIFY_META, /* block_num, timestamp etc. */
VERIFY_SHA1, /* sha1 sum data blocks */
+ VERIFY_PATTERN, /* verify specific patterns */
VERIFY_NULL, /* pretend to verify */
};