projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fine-grained job level numa control
[fio.git]
/
verify.c
diff --git
a/verify.c
b/verify.c
index 5621db2a5b222e2b00afa354382ca38ee84a1cb7..f246dc8f9ba0cfe3f4a9e2b43316f398b75cb4b1 100644
(file)
--- a/
verify.c
+++ b/
verify.c
@@
-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;
@@
-646,13
+646,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)
@@
-695,7
+699,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,
@@
-969,6
+973,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
+1049,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;