Fix offset retrieval problem for read and write having different bs ranges
"Zhang, Yanmin" <yanmin_zhang@linux.intel.com> reported that fio got
stuck with a job file that had different read and write block size
ranges. The problem is that get_next_offset() didn't take the data
direction into account, so when it generated an offset close to the
end of the file, it may not have been legal for that data direction.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
diff --git a/io_u.c b/io_u.c
index 511f2e9..8f10bfd 100644
--- a/io_u.c
+++ b/io_u.c
@@ -73,11 +73,12 @@
}
static inline unsigned long long last_block(struct thread_data *td,
- struct fio_file *f)
+ struct fio_file *f,
+ enum fio_ddir ddir)
{
unsigned long long max_blocks;
- max_blocks = f->io_size / td->o.rw_min_bs;
+ max_blocks = f->io_size / td->o.min_bs[ddir];
if (!max_blocks)
return 0;
@@ -88,7 +89,7 @@
* Return the next free block in the map.
*/
static int get_next_free_block(struct thread_data *td, struct fio_file *f,
- unsigned long long *b)
+ enum fio_ddir ddir, unsigned long long *b)
{
int i;
@@ -97,7 +98,7 @@
while ((*b) * td->o.rw_min_bs < f->real_file_size) {
if (f->file_map[i] != -1UL) {
*b += fio_ffz(f->file_map[i]);
- if (*b > last_block(td, f))
+ if (*b > last_block(td, f, ddir))
break;
f->last_free_lookup = i;
return 0;
@@ -112,14 +113,14 @@
}
static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
- unsigned long long *b)
+ enum fio_ddir ddir, unsigned long long *b)
{
unsigned long long r, rb;
int loops = 5;
do {
r = os_random_long(&td->random_state);
- *b = last_block(td, f);
+ *b = last_block(td, f, ddir);
/*
* if we are not maintaining a random map, we are done.
@@ -144,7 +145,7 @@
loops = 10;
do {
f->last_free_lookup = (f->num_maps - 1) * (r / (RAND_MAX+1.0));
- if (!get_next_free_block(td, f, b))
+ if (!get_next_free_block(td, f, ddir, b))
return 0;
r = os_random_long(&td->random_state);
@@ -154,7 +155,7 @@
* that didn't work either, try exhaustive search from the start
*/
f->last_free_lookup = 0;
- return get_next_free_block(td, f, b);
+ return get_next_free_block(td, f, ddir, b);
}
/*
@@ -166,21 +167,23 @@
{
struct fio_file *f = io_u->file;
unsigned long long b;
+ enum fio_ddir ddir = io_u->ddir;
if (td_random(td) && (td->o.ddir_nr && !--td->ddir_nr)) {
td->ddir_nr = td->o.ddir_nr;
- if (get_next_rand_offset(td, f, &b))
+ if (get_next_rand_offset(td, f, ddir, &b))
return 1;
} else {
if (f->last_pos >= f->real_file_size) {
- if (!td_random(td) || get_next_rand_offset(td, f, &b))
+ if (!td_random(td) ||
+ get_next_rand_offset(td, f, ddir, &b))
return 1;
} else
- b = (f->last_pos - f->file_offset) / td->o.rw_min_bs;
+ b = (f->last_pos - f->file_offset) / td->o.min_bs[ddir];
}
- io_u->offset = (b * td->o.rw_min_bs) + f->file_offset;
+ io_u->offset = (b * td->o.min_bs[ddir]) + f->file_offset;
if (io_u->offset >= f->real_file_size) {
dprint(FD_IO, "get_next_offset: offset %llu >= size %llu\n",
io_u->offset, f->real_file_size);
@@ -219,8 +222,11 @@
buflen = (buflen + td->o.min_bs[ddir] - 1) & ~(td->o.min_bs[ddir] - 1);
}
- if (io_u->offset + buflen > io_u->file->real_file_size)
+ if (io_u->offset + buflen > io_u->file->real_file_size) {
+ dprint(FD_IO, "lower buflen %u -> %u (ddir=%d)\n", buflen,
+ td->o.min_bs[ddir], ddir);
buflen = td->o.min_bs[ddir];
+ }
return buflen;
}
@@ -385,6 +391,8 @@
if (io_u->offset + io_u->buflen > io_u->file->real_file_size) {
dprint(FD_IO, "io_u %p, offset too large\n", io_u);
+ dprint(FD_IO, " off=%llu/%lu > %llu\n", io_u->offset,
+ io_u->buflen, io_u->file->real_file_size);
return 1;
}