X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=io_u.c;h=6290ebbc6ffda5757ac686859cffb4d17ea18e7f;hp=647751385e35c613ab821a5a2fe7d61aa7a924cd;hb=163be7e4813e139652c52bf333ff9ad488cd121f;hpb=2dc1bbeb58edc85f2829eed6729862c438ea2353 diff --git a/io_u.c b/io_u.c index 64775138..6290ebbc 100644 --- a/io_u.c +++ b/io_u.c @@ -6,7 +6,6 @@ #include #include "fio.h" -#include "os.h" /* * Change this define to play with the timeout handling @@ -52,7 +51,11 @@ static void mark_random_map(struct thread_data *td, struct io_u *io_u) while (blocks < nr_blocks) { unsigned int idx, bit; - if (!random_map_free(td, f, block)) + /* + * If we have a mixed random workload, we may + * encounter blocks we already did IO to. + */ + if (!td->o.ddir_nr && !random_map_free(td, f, block)) break; idx = RAND_MAP_IDX(td, f, block); @@ -81,7 +84,7 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f, *b = (i * BLOCKS_PER_MAP); while ((*b) * td->o.rw_min_bs < f->real_file_size) { if (f->file_map[i] != -1UL) { - *b += ffz(f->file_map[i]); + *b += fio_ffz(f->file_map[i]); f->last_free_lookup = i; return 0; } @@ -93,6 +96,55 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f, return 1; } +static int get_next_rand_offset(struct thread_data *td, struct fio_file *f, + int ddir, unsigned long long *b) +{ + unsigned long long max_blocks = f->io_size / td->o.min_bs[ddir]; + unsigned long long r, rb; + int loops = 5; + + do { + r = os_random_long(&td->random_state); + if (!max_blocks) + *b = 0; + else + *b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0)); + /* + * if we are not maintaining a random map, we are done. + */ + if (td->o.norandommap) + return 0; + + /* + * calculate map offset and chec if it's free + */ + rb = *b + (f->file_offset / td->o.min_bs[ddir]); + if (random_map_free(td, f, rb)) + return 0; + + } while (--loops); + + /* + * we get here, if we didn't suceed in looking up a block. generate + * a random start offset into the filemap, and find the first free + * block from there. + */ + loops = 10; + do { + f->last_free_lookup = (f->num_maps - 1) * (r / (RAND_MAX+1.0)); + if (!get_next_free_block(td, f, b)) + return 0; + + r = os_random_long(&td->random_state); + } while (--loops); + + /* + * that didn't work either, try exhaustive search from the start + */ + f->last_free_lookup = 0; + return get_next_free_block(td, f, b); +} + /* * For random io, generate a random new block and see if it's used. Repeat * until we find a free one. For sequential io, just return the end of @@ -102,33 +154,19 @@ static int get_next_offset(struct thread_data *td, struct io_u *io_u) { struct fio_file *f = io_u->file; const int ddir = io_u->ddir; - unsigned long long b, rb; - long r; + unsigned long long b; - if (td_random(td)) { - unsigned long long max_blocks = f->file_size / td->o.min_bs[ddir]; - int loops = 5; - - do { - r = os_random_long(&td->random_state); - if (!max_blocks) - b = 0; - else - b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0)); - if (td->o.norandommap) - break; - rb = b + (f->file_offset / td->o.min_bs[ddir]); - loops--; - } while (!random_map_free(td, f, rb) && loops); + if (td_random(td) && (td->o.ddir_nr && !--td->ddir_nr)) { + td->ddir_nr = td->o.ddir_nr; - /* - * if we failed to retrieve a truly random offset within - * the loops assigned, see if there are free ones left at all - */ - if (!loops && get_next_free_block(td, f, &b)) + if (get_next_rand_offset(td, f, ddir, &b)) + return 1; + } else { + if (f->last_pos >= f->real_file_size) return 1; - } else + b = f->last_pos / td->o.min_bs[ddir]; + } io_u->offset = (b * td->o.min_bs[ddir]) + f->file_offset; if (io_u->offset >= f->real_file_size) @@ -139,7 +177,6 @@ static int get_next_offset(struct thread_data *td, struct io_u *io_u) static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u) { - struct fio_file *f = io_u->file; const int ddir = io_u->ddir; unsigned int buflen; long r; @@ -153,20 +190,36 @@ static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u) buflen = (buflen + td->o.min_bs[ddir] - 1) & ~(td->o.min_bs[ddir] - 1); } - while (buflen + io_u->offset > f->real_file_size) { - if (buflen == td->o.min_bs[ddir]) { - if (!td->o.odirect) { - assert(io_u->offset <= f->real_file_size); - buflen = f->real_file_size - io_u->offset; - return buflen; - } - return 0; - } + return buflen; +} - buflen = td->o.min_bs[ddir]; - } +static void set_rwmix_bytes(struct thread_data *td) +{ + unsigned long long rbytes; + unsigned int diff; - return buflen; + /* + * we do time or byte based switch. this is needed because + * buffered writes may issue a lot quicker than they complete, + * whereas reads do not. + */ + rbytes = td->io_bytes[td->rwmix_ddir] - td->rwmix_bytes; + diff = td->o.rwmix[td->rwmix_ddir ^ 1]; + + td->rwmix_bytes = td->io_bytes[td->rwmix_ddir] + (rbytes * ((100 - diff)) / diff); +} + +static inline enum fio_ddir get_rand_ddir(struct thread_data *td) +{ + unsigned int v; + long r; + + r = os_random_long(&td->rwmix_state); + v = 1 + (int) (100.0 * (r / (RAND_MAX + 1.0))); + if (v < td->o.rwmix[DDIR_READ]) + return DDIR_READ; + + return DDIR_WRITE; } /* @@ -179,23 +232,45 @@ static enum fio_ddir get_rw_ddir(struct thread_data *td) if (td_rw(td)) { struct timeval now; unsigned long elapsed; + unsigned int cycle; fio_gettime(&now, NULL); elapsed = mtime_since_now(&td->rwmix_switch); + /* + * if this is the first cycle, make it shorter + */ + cycle = td->o.rwmixcycle; + if (!td->rwmix_bytes) + cycle /= 10; + /* * Check if it's time to seed a new data direction. */ - if (elapsed >= td->o.rwmixcycle) { - unsigned int v; - long r; - - r = os_random_long(&td->rwmix_state); - v = 1 + (int) (100.0 * (r / (RAND_MAX + 1.0))); - if (v < td->o.rwmixread) - td->rwmix_ddir = DDIR_READ; - else - td->rwmix_ddir = DDIR_WRITE; + if (elapsed >= cycle || + td->io_bytes[td->rwmix_ddir] >= td->rwmix_bytes) { + unsigned long long max_bytes; + enum fio_ddir ddir; + + /* + * Put a top limit on how many bytes we do for + * one data direction, to avoid overflowing the + * ranges too much + */ + ddir = get_rand_ddir(td); + max_bytes = td->this_io_bytes[ddir]; + if (max_bytes >= (td->o.size * td->o.rwmix[ddir] / 100)) { + if (!td->rw_end_set[ddir]) { + td->rw_end_set[ddir] = 1; + memcpy(&td->rw_end[ddir], &now, sizeof(now)); + } + ddir ^= 1; + } + + if (ddir != td->rwmix_ddir) + set_rwmix_bytes(td); + + td->rwmix_ddir = ddir; memcpy(&td->rwmix_switch, &now, sizeof(now)); } return td->rwmix_ddir; @@ -210,6 +285,9 @@ void put_io_u(struct thread_data *td, struct io_u *io_u) assert((io_u->flags & IO_U_F_FREE) == 0); io_u->flags |= IO_U_F_FREE; + if (io_u->file) + put_file(td, io_u->file); + io_u->file = NULL; list_del(&io_u->list); list_add(&io_u->list, &td->io_u_freelist); @@ -234,7 +312,7 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u) /* * If using an iolog, grab next piece if any available. */ - if (td->o.read_iolog) + if (td->o.read_iolog_file) return read_iolog_get(td, io_u); /* @@ -244,7 +322,7 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u) !(td->io_issues[DDIR_WRITE] % td->o.fsync_blocks) && td->io_issues[DDIR_WRITE] && should_fsync(td)) { io_u->ddir = DDIR_SYNC; - return 0; + goto out; } io_u->ddir = get_rw_ddir(td); @@ -263,12 +341,13 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u) /* * mark entry before potentially trimming io_u */ - if (!td->o.read_iolog && td_random(td) && !td->o.norandommap) + if (td_random(td) && !td->o.norandommap) mark_random_map(td, io_u); /* * If using a write iolog, store this entry. */ +out: if (td->o.write_iolog_file) write_iolog_put(td, io_u); @@ -351,6 +430,8 @@ static struct fio_file *get_next_file_rand(struct thread_data *td, int goodf, fno = (unsigned int) ((double) td->o.nr_files * (r / (RAND_MAX + 1.0))); f = &td->files[fno]; + if (f->flags & FIO_FILE_DONE) + continue; if ((!goodf || (f->flags & goodf)) && !(f->flags & badf)) return f; @@ -373,6 +454,11 @@ static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf, if (td->next_file >= td->o.nr_files) td->next_file = 0; + if (f->flags & FIO_FILE_DONE) { + f = NULL; + continue; + } + if ((!goodf || (f->flags & goodf)) && !(f->flags & badf)) break; @@ -388,7 +474,7 @@ static struct fio_file *get_next_file(struct thread_data *td) assert(td->o.nr_files <= td->files_index); - if (!td->nr_open_files) + if (!td->nr_open_files || td->nr_done_files >= td->o.nr_files) return NULL; f = td->file_service_file; @@ -409,6 +495,9 @@ static struct fio_file *find_next_new_file(struct thread_data *td) { struct fio_file *f; + if (!td->nr_open_files || td->nr_done_files >= td->o.nr_files) + return NULL; + if (td->o.file_service_type == FIO_FSERVICE_RR) f = get_next_file_rr(td, 0, FIO_FILE_OPEN); else @@ -474,15 +563,19 @@ struct io_u *get_io_u(struct thread_data *td) set_file: io_u->file = f; + get_file(f); if (!fill_io_u(td, io_u)) break; /* - * No more to do for this file, close it + * td_io_close() does a put_file() as well, so no need to + * do that here. */ io_u->file = NULL; td_io_close_file(td, f); + f->flags |= FIO_FILE_DONE; + td->nr_done_files++; /* * probably not the right place to do this, but see @@ -500,20 +593,13 @@ set_file: } } while (1); + assert(io_u->file->flags & FIO_FILE_OPEN); + if (td->zone_bytes >= td->o.zone_size) { td->zone_bytes = 0; f->last_pos += td->o.zone_skip; } - if (io_u->buflen + io_u->offset > f->real_file_size) { - if (td->io_ops->flags & FIO_RAWIO) { - put_io_u(td, io_u); - return NULL; - } - - io_u->buflen = f->real_file_size - io_u->offset; - } - if (io_u->ddir != DDIR_SYNC) { if (!io_u->buflen) { put_io_u(td, io_u); @@ -529,6 +615,7 @@ set_file: /* * Set io data pointers. */ + io_u->endpos = io_u->offset + io_u->buflen; out: io_u->xfer_buf = io_u->buf; io_u->xfer_buflen = io_u->buflen; @@ -567,8 +654,6 @@ static void io_completed(struct thread_data *td, struct io_u *io_u, assert(io_u->flags & IO_U_F_FLIGHT); io_u->flags &= ~IO_U_F_FLIGHT; - put_file(td, io_u->file); - if (io_u->ddir == DDIR_SYNC) { td->last_was_sync = 1; return; @@ -586,7 +671,7 @@ static void io_completed(struct thread_data *td, struct io_u *io_u, td->zone_bytes += bytes; td->this_io_bytes[idx] += bytes; - io_u->file->last_completed_pos = io_u->offset + io_u->buflen; + io_u->file->last_completed_pos = io_u->endpos; msec = mtime_since(&io_u->issue_time, &icd->time); @@ -594,13 +679,14 @@ static void io_completed(struct thread_data *td, struct io_u *io_u, add_bw_sample(td, idx, &icd->time); io_u_mark_latency(td, msec); - if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE) + if (td_write(td) && idx == DDIR_WRITE && + td->o.verify != VERIFY_NONE) log_io_piece(td, io_u); icd->bytes_done[idx] += bytes; if (io_u->end_io) { - ret = io_u->end_io(io_u); + ret = io_u->end_io(td, io_u); if (ret && !icd->error) icd->error = ret; } @@ -660,12 +746,10 @@ long io_u_queued_complete(struct thread_data *td, int min_events) struct io_completion_data icd; struct timespec *tvp = NULL; int ret; + struct timespec ts = { .tv_sec = 0, .tv_nsec = 0, }; - if (!min_events) { - struct timespec ts = { .tv_sec = 0, .tv_nsec = 0, }; - + if (!min_events) tvp = &ts; - } ret = td_io_getevents(td, min_events, td->cur_depth, tvp); if (ret < 0) { @@ -754,7 +838,7 @@ static void io_u_timeout_handler(int fio_unused sig) return; } - log_err("fio: io_u timeout: job=%s, pid=%d\n", td->name, td->pid); + log_err("fio: io_u timeout: job=%s, pid=%d\n", td->o.name, td->pid); list_for_each(entry, &td->io_u_busylist) { io_u = list_entry(entry, struct io_u, list);