#include "fio.h"
#include "verify.h"
-#include "smalloc.h"
#include "trim.h"
#include "lib/rand.h"
+#include "lib/hweight.h"
#include "crc/md5.h"
#include "crc/crc64.h"
unsigned int hdr_inc;
hdr_inc = io_u->buflen;
- if (td->o.verify_interval)
+ if (td->o.verify_interval && td->o.verify_interval <= io_u->buflen)
hdr_inc = td->o.verify_interval;
return hdr_inc;
}
/*
- * Prepare for seperation of verify_header and checksum header
+ * Prepare for separation of verify_header and checksum header
*/
static inline unsigned int __hdr_size(int verify_type)
{
dummy.buf = buf;
dummy.rand_seed = hdr->rand_seed;
dummy.buf_filled_len = 0;
+ dummy.buflen = io_u->buflen;
fill_pattern_headers(td, &dummy, hdr->rand_seed, 1);
return vc->io_u->buf + vc->hdr_num * hdr->len + hdr_size(hdr);
}
-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;
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);
- 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;
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);
+ flist_add_tail(&io_u->verify_list, &td->verify_list);
io_u->flags |= IO_U_F_FREE_DEF;
pthread_mutex_unlock(&td->io_u_lock);
return ret;
}
-static int verify_header(struct verify_header *hdr)
+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 = crc32c(p, offsetof(struct verify_header, crc32));
+ crc = fio_crc32c(p, offsetof(struct verify_header, crc32));
if (crc == hdr->crc32)
return 1;
.hdr_num = hdr_num,
.td = td,
};
+ unsigned int verify_type;
if (ret && td->o.verify_fatal)
break;
memswp(p, p + td->o.verify_offset, header_size);
hdr = p;
- if (!verify_header(hdr)) {
+ 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,
return EILSEQ;
}
- switch (hdr->verify_type) {
+ if (td->o.verify != VERIFY_NONE)
+ verify_type = td->o.verify;
+ else
+ verify_type = hdr->verify_type;
+
+ switch (verify_type) {
case VERIFY_MD5:
ret = verify_io_u_md5(hdr, &vc);
break;
log_err("Bad verify type %u\n", hdr->verify_type);
ret = EINVAL;
}
+
+ if (ret && verify_type != hdr->verify_type)
+ log_err("fio: verify type mismatch (%u media, %u given)\n",
+ hdr->verify_type, verify_type);
}
done:
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);
- 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,
hdr->verify_type = td->o.verify;
hdr->len = header_len;
hdr->rand_seed = io_u->rand_seed;
- hdr->crc32 = crc32c(p, offsetof(struct verify_header, crc32));
+ hdr->crc32 = fio_crc32c(p, offsetof(struct verify_header, crc32));
data_len = header_len - hdr_size(hdr);
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;
return 1;
}
+void fio_verify_init(struct thread_data *td)
+{
+ if (td->o.verify == VERIFY_CRC32C_INTEL ||
+ td->o.verify == VERIFY_CRC32C) {
+ crc32c_intel_probe();
+ }
+}
+
static void *verify_async_thread(void *data)
{
struct thread_data *td = data;
continue;
while (!flist_empty(&list)) {
- io_u = flist_entry(list.next, struct io_u, list);
- flist_del_init(&io_u->list);
+ io_u = flist_entry(list.next, struct io_u, verify_list);
+ flist_del(&io_u->verify_list);
ret = verify_io_u(td, io_u);
put_io_u(td, io_u);
if (!ret)
continue;
- if (td->o.continue_on_error & ERROR_TYPE_VERIFY &&
- td_non_fatal_error(ret)) {
+ if (td_non_fatal_error(td, ERROR_TYPE_VERIFY_BIT, ret)) {
update_error_count(td, ret);
td_clear_error(td);
ret = 0;
projects / fio.git / blobdiff