projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
README: kill reference to non-functional SUSE package page
[fio.git]
/
verify.c
diff --git
a/verify.c
b/verify.c
index 5621db2a5b222e2b00afa354382ca38ee84a1cb7..daa2f04a7419146dbf98b74b68fcf432860a0abe 100644
(file)
--- a/
verify.c
+++ b/
verify.c
@@
-10,9
+10,9
@@
#include "fio.h"
#include "verify.h"
#include "fio.h"
#include "verify.h"
-#include "smalloc.h"
#include "trim.h"
#include "lib/rand.h"
#include "trim.h"
#include "lib/rand.h"
+#include "lib/hweight.h"
#include "crc/md5.h"
#include "crc/crc64.h"
#include "crc/md5.h"
#include "crc/crc64.h"
@@
-78,7
+78,7
@@
static unsigned int get_hdr_inc(struct thread_data *td, struct io_u *io_u)
unsigned int hdr_inc;
hdr_inc = io_u->buflen;
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;
hdr_inc = td->o.verify_interval;
return hdr_inc;
@@
-308,14
+308,6
@@
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);
}
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;
static int verify_io_u_pattern(struct verify_header *hdr, struct vcont *vc)
{
struct thread_data *td = vc->td;
@@
-646,13
+638,17
@@
static int verify_trimmed_io_u(struct thread_data *td, struct io_u *io_u)
return ret;
}
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;
{
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)
crc = fio_crc32c(p, offsetof(struct verify_header, crc32));
if (crc == hdr->crc32)
@@
-686,6
+682,7
@@
int verify_io_u(struct thread_data *td, struct io_u *io_u)
.hdr_num = hdr_num,
.td = td,
};
.hdr_num = hdr_num,
.td = td,
};
+ unsigned int verify_type;
if (ret && td->o.verify_fatal)
break;
if (ret && td->o.verify_fatal)
break;
@@
-695,7
+692,7
@@
int verify_io_u(struct thread_data *td, struct io_u *io_u)
memswp(p, p + td->o.verify_offset, header_size);
hdr = p;
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,
log_err("verify: bad magic header %x, wanted %x at "
"file %s offset %llu, length %u\n",
hdr->magic, FIO_HDR_MAGIC,
@@
-704,7
+701,12
@@
int verify_io_u(struct thread_data *td, struct io_u *io_u)
return EILSEQ;
}
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;
case VERIFY_MD5:
ret = verify_io_u_md5(hdr, &vc);
break;
@@
-743,6
+745,10
@@
int verify_io_u(struct thread_data *td, struct io_u *io_u)
log_err("Bad verify type %u\n", hdr->verify_type);
ret = EINVAL;
}
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:
}
done:
@@
-969,6
+975,7
@@
int get_next_verify(struct thread_data *td, struct io_u *io_u)
io_u->offset = ipo->offset;
io_u->buflen = ipo->len;
io_u->file = ipo->file;
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 (ipo->flags & IP_F_TRIMMED)
io_u->flags |= IO_U_F_TRIMMED;
@@
-1044,8
+1051,7
@@
static void *verify_async_thread(void *data)
put_io_u(td, io_u);
if (!ret)
continue;
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;
update_error_count(td, ret);
td_clear_error(td);
ret = 0;