#include "trim.h"
#include "lib/rand.h"
#include "lib/axmap.h"
+#include "err.h"
struct io_completion_data {
int nr; /* input */
dprint(FD_RANDOM, "off rand %llu\n", (unsigned long long) r);
- *b = (lastb - 1) * (r / ((uint64_t) rmax + 1.0));
+ *b = lastb * (r / ((uint64_t) rmax + 1.0));
} else {
uint64_t off = 0;
if (!flist_empty(&td->next_rand_list)) {
struct rand_off *r;
fetch:
- r = flist_entry(td->next_rand_list.next, struct rand_off, list);
+ r = flist_first_entry(&td->next_rand_list, struct rand_off, list);
flist_del(&r->list);
*b = r->off;
free(r);
{
assert(ddir_rw(ddir));
- if (f->last_pos >= f->io_size + get_start_offset(td) && td->o.time_based)
+ if (f->last_pos >= f->io_size + get_start_offset(td, f) && td->o.time_based)
f->last_pos = f->last_pos - f->io_size;
if (f->last_pos < f->real_file_size) {
{
struct fio_file *f = io_u->file;
- return io_u->offset + buflen <= f->io_size + get_start_offset(td);
+ return io_u->offset + buflen <= f->io_size + get_start_offset(td, f);
}
static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u,
unsigned int minbs, maxbs;
unsigned long r, rand_max;
- assert(ddir_rw(io_u->ddir));
+ assert(ddir_rw(ddir));
if (td->o.bs_is_seq_rand)
ddir = is_random ? DDIR_WRITE: DDIR_READ;
- else
- ddir = io_u->ddir;
minbs = td->o.min_bs[ddir];
maxbs = td->o.max_bs[ddir];
void put_file_log(struct thread_data *td, struct fio_file *f)
{
- int ret = put_file(td, f);
+ unsigned int ret = put_file(td, f);
if (ret)
td_verror(td, ret, "file close");
{
td_io_u_lock(td);
- if (io_u->file && !(io_u->flags & IO_U_F_FREE_DEF))
+ if (io_u->file && !(io_u->flags & IO_U_F_NO_FILE_PUT))
put_file_log(td, io_u->file);
+
io_u->file = NULL;
- io_u->flags &= ~IO_U_F_FREE_DEF;
io_u->flags |= IO_U_F_FREE;
if (io_u->flags & IO_U_F_IN_CUR_DEPTH)
if (!fio_file_open(f)) {
int err;
+ if (td->nr_open_files >= td->o.open_files)
+ return ERR_PTR(-EBUSY);
+
err = td_io_open_file(td, f);
if (err)
continue;
if (!fio_file_open(f)) {
int err;
+ if (td->nr_open_files >= td->o.open_files)
+ return ERR_PTR(-EBUSY);
+
err = td_io_open_file(td, f);
if (err) {
dprint(FD_FILE, "error %d on open of %s\n",
else
f = get_next_file_rand(td, FIO_FILE_open, FIO_FILE_closing);
+ if (IS_ERR(f))
+ return f;
+
td->file_service_file = f;
td->file_service_left = td->file_service_nr - 1;
out:
- dprint(FD_FILE, "get_next_file: %p [%s]\n", f, f->file_name);
+ if (f)
+ dprint(FD_FILE, "get_next_file: %p [%s]\n", f, f->file_name);
+ else
+ dprint(FD_FILE, "get_next_file: NULL\n");
return f;
}
static struct fio_file *get_next_file(struct thread_data *td)
{
- if (!(td->flags & TD_F_PROFILE_OPS)) {
+ if (td->flags & TD_F_PROFILE_OPS) {
struct prof_io_ops *ops = &td->prof_io_ops;
if (ops->get_next_file)
return __get_next_file(td);
}
-static int set_io_u_file(struct thread_data *td, struct io_u *io_u)
+static long set_io_u_file(struct thread_data *td, struct io_u *io_u)
{
struct fio_file *f;
do {
f = get_next_file(td);
- if (!f)
- return 1;
+ if (IS_ERR_OR_NULL(f))
+ return PTR_ERR(f);
io_u->file = f;
get_file(f);
return 1;
td->latency_qd_high = td->latency_qd;
+
+ if (td->latency_qd == td->latency_qd_low)
+ td->latency_qd_low--;
+
td->latency_qd = (td->latency_qd + td->latency_qd_low) / 2;
dprint(FD_RATE, "Ramped down: %d %d %d\n", td->latency_qd_low, td->latency_qd, td->latency_qd_high);
void lat_target_init(struct thread_data *td)
{
+ td->latency_end_run = 0;
+
if (td->o.latency_target) {
dprint(FD_RATE, "Latency target=%llu\n", td->o.latency_target);
fio_gettime(&td->latency_ts, NULL);
td->latency_qd = td->o.iodepth;
}
+void lat_target_reset(struct thread_data *td)
+{
+ if (!td->latency_end_run)
+ lat_target_init(td);
+}
+
static void lat_target_success(struct thread_data *td)
{
const unsigned int qd = td->latency_qd;
+ struct thread_options *o = &td->o;
td->latency_qd_low = td->latency_qd;
* of bisecting from highest possible queue depth. If we have set
* a limit other than td->o.iodepth, bisect between that.
*/
- if (td->latency_qd_high != td->o.iodepth)
+ if (td->latency_qd_high != o->iodepth)
td->latency_qd = (td->latency_qd + td->latency_qd_high) / 2;
else
td->latency_qd *= 2;
- if (td->latency_qd > td->o.iodepth)
- td->latency_qd = td->o.iodepth;
+ if (td->latency_qd > o->iodepth)
+ td->latency_qd = o->iodepth;
dprint(FD_RATE, "Ramped up: %d %d %d\n", td->latency_qd_low, td->latency_qd, td->latency_qd_high);
+
/*
- * Same as last one, we are done
+ * Same as last one, we are done. Let it run a latency cycle, so
+ * we get only the results from the targeted depth.
*/
- if (td->latency_qd == qd)
- td->done = 1;
+ if (td->latency_qd == qd) {
+ if (td->latency_end_run) {
+ dprint(FD_RATE, "We are done\n");
+ td->done = 1;
+ } else {
+ dprint(FD_RATE, "Quiesce and final run\n");
+ io_u_quiesce(td);
+ td->latency_end_run = 1;
+ reset_all_stats(td);
+ reset_io_stats(td);
+ }
+ }
lat_new_cycle(td);
}
struct io_u *__get_io_u(struct thread_data *td)
{
- struct io_u *io_u;
+ struct io_u *io_u = NULL;
td_io_u_lock(td);
else if (!queue_full(td)) {
io_u = io_u_qpop(&td->io_u_freelist);
+ io_u->file = NULL;
io_u->buflen = 0;
io_u->resid = 0;
- io_u->file = NULL;
io_u->end_io = NULL;
}
if (io_u) {
assert(io_u->flags & IO_U_F_FREE);
- io_u->flags &= ~(IO_U_F_FREE | IO_U_F_FREE_DEF);
- io_u->flags &= ~(IO_U_F_TRIMMED | IO_U_F_BARRIER);
- io_u->flags &= ~IO_U_F_VER_LIST;
+ io_u->flags &= ~(IO_U_F_FREE | IO_U_F_NO_FILE_PUT |
+ IO_U_F_TRIMMED | IO_U_F_BARRIER |
+ IO_U_F_VER_LIST);
io_u->error = 0;
io_u->acct_ddir = -1;
td->cur_depth++;
io_u->flags |= IO_U_F_IN_CUR_DEPTH;
+ io_u->ipo = NULL;
} else if (td->o.verify_async) {
/*
* We ran out, wait for async verify threads to finish and
struct fio_file *f;
struct io_u *io_u;
int do_scramble = 0;
+ long ret = 0;
io_u = __get_io_u(td);
if (!io_u) {
if (read_iolog_get(td, io_u))
goto err_put;
} else if (set_io_u_file(td, io_u)) {
+ ret = -EBUSY;
dprint(FD_IO, "io_u %p, setting file failed\n", io_u);
goto err_put;
}
f = io_u->file;
+ if (!f) {
+ dprint(FD_IO, "io_u %p, setting file failed\n", io_u);
+ goto err_put;
+ }
+
assert(fio_file_open(f));
if (ddir_rw(io_u->ddir)) {
if (td->flags & TD_F_REFILL_BUFFERS) {
io_u_fill_buffer(td, io_u,
io_u->xfer_buflen, io_u->xfer_buflen);
- } else if (td->flags & TD_F_SCRAMBLE_BUFFERS)
+ } else if ((td->flags & TD_F_SCRAMBLE_BUFFERS) &&
+ !(td->flags & TD_F_COMPRESS))
do_scramble = 1;
if (td->flags & TD_F_VER_NONE) {
populate_verify_io_u(td, io_u);
err_put:
dprint(FD_IO, "get_io_u failed\n");
put_io_u(td, io_u);
- return NULL;
+ return ERR_PTR(ret);
}
void io_u_log_error(struct thread_data *td, struct io_u *io_u)
td_verror(td, io_u->error, "io_u error");
}
+static inline int gtod_reduce(struct thread_data *td)
+{
+ return td->o.disable_clat && td->o.disable_lat && td->o.disable_slat
+ && td->o.disable_bw;
+}
+
static void account_io_completion(struct thread_data *td, struct io_u *io_u,
struct io_completion_data *icd,
const enum fio_ddir idx, unsigned int bytes)
{
unsigned long lusec = 0;
- if (!td->o.disable_clat || !td->o.disable_bw)
+ if (!gtod_reduce(td))
lusec = utime_since(&io_u->issue_time, &icd->time);
if (!td->o.disable_lat) {
unsigned long tusec;
tusec = utime_since(&io_u->start_time, &icd->time);
- add_lat_sample(td, idx, tusec, bytes);
+ add_lat_sample(td, idx, tusec, bytes, io_u->offset);
if (td->flags & TD_F_PROFILE_OPS) {
struct prof_io_ops *ops = &td->prof_io_ops;
}
if (!td->o.disable_clat) {
- add_clat_sample(td, idx, lusec, bytes);
+ add_clat_sample(td, idx, lusec, bytes, io_u->offset);
io_u_mark_latency(td, lusec);
}
if (!td->o.disable_bw)
add_bw_sample(td, idx, bytes, &icd->time);
- add_iops_sample(td, idx, bytes, &icd->time);
-
- if (td->o.number_ios && !--td->o.number_ios)
- td->done = 1;
+ if (!gtod_reduce(td))
+ add_iops_sample(td, idx, bytes, &icd->time);
}
static long long usec_for_io(struct thread_data *td, enum fio_ddir ddir)
return remainder * 1000000 / bps + secs * 1000000;
}
-static void io_completed(struct thread_data *td, struct io_u *io_u,
+static void io_completed(struct thread_data *td, struct io_u **io_u_ptr,
struct io_completion_data *icd)
{
- struct fio_file *f;
+ struct io_u *io_u = *io_u_ptr;
+ enum fio_ddir ddir = io_u->ddir;
+ struct fio_file *f = io_u->file;
dprint_io_u(io_u, "io complete");
td_io_u_lock(td);
assert(io_u->flags & IO_U_F_FLIGHT);
io_u->flags &= ~(IO_U_F_FLIGHT | IO_U_F_BUSY_OK);
+
+ /*
+ * Mark IO ok to verify
+ */
+ if (io_u->ipo) {
+ /*
+ * Remove errored entry from the verification list
+ */
+ if (io_u->error)
+ unlog_io_piece(td, io_u);
+ else {
+ io_u->ipo->flags &= ~IP_F_IN_FLIGHT;
+ write_barrier();
+ }
+ }
+
td_io_u_unlock(td);
- if (ddir_sync(io_u->ddir)) {
+ if (ddir_sync(ddir)) {
td->last_was_sync = 1;
- f = io_u->file;
if (f) {
f->first_write = -1ULL;
f->last_write = -1ULL;
}
td->last_was_sync = 0;
- td->last_ddir = io_u->ddir;
+ td->last_ddir = ddir;
- if (!io_u->error && ddir_rw(io_u->ddir)) {
+ if (!io_u->error && ddir_rw(ddir)) {
unsigned int bytes = io_u->buflen - io_u->resid;
- const enum fio_ddir idx = io_u->ddir;
- const enum fio_ddir odx = io_u->ddir ^ 1;
+ const enum fio_ddir oddir = ddir ^ 1;
int ret;
- td->io_blocks[idx]++;
- td->this_io_blocks[idx]++;
- td->io_bytes[idx] += bytes;
+ td->io_blocks[ddir]++;
+ td->this_io_blocks[ddir]++;
+ td->io_bytes[ddir] += bytes;
if (!(io_u->flags & IO_U_F_VER_LIST))
- td->this_io_bytes[idx] += bytes;
-
- if (idx == DDIR_WRITE) {
- f = io_u->file;
- if (f) {
- if (f->first_write == -1ULL ||
- io_u->offset < f->first_write)
- f->first_write = io_u->offset;
- if (f->last_write == -1ULL ||
- ((io_u->offset + bytes) > f->last_write))
- f->last_write = io_u->offset + bytes;
- }
+ td->this_io_bytes[ddir] += bytes;
+
+ if (ddir == DDIR_WRITE && f) {
+ if (f->first_write == -1ULL ||
+ io_u->offset < f->first_write)
+ f->first_write = io_u->offset;
+ if (f->last_write == -1ULL ||
+ ((io_u->offset + bytes) > f->last_write))
+ f->last_write = io_u->offset + bytes;
}
if (ramp_time_over(td) && (td->runstate == TD_RUNNING ||
td->runstate == TD_VERIFYING)) {
- account_io_completion(td, io_u, icd, idx, bytes);
+ account_io_completion(td, io_u, icd, ddir, bytes);
- if (__should_check_rate(td, idx)) {
- td->rate_pending_usleep[idx] =
- (usec_for_io(td, idx) -
+ if (__should_check_rate(td, ddir)) {
+ td->rate_pending_usleep[ddir] =
+ (usec_for_io(td, ddir) -
utime_since_now(&td->start));
}
- if (idx != DDIR_TRIM && __should_check_rate(td, odx))
- td->rate_pending_usleep[odx] =
- (usec_for_io(td, odx) -
+ if (ddir != DDIR_TRIM &&
+ __should_check_rate(td, oddir)) {
+ td->rate_pending_usleep[oddir] =
+ (usec_for_io(td, oddir) -
utime_since_now(&td->start));
+ }
}
- /*
- * Verify_backlog enable: We need to log the write job after
- * finishing it to prevent verifying before finish writing.
- */
- if (td_write(td) && idx == DDIR_WRITE &&
- td->o.do_verify &&
- td->o.verify != VERIFY_NONE &&
- !td->o.experimental_verify &&
- (td->flags & TD_F_VER_BACKLOG))
- log_io_piece(td, io_u);
-
- icd->bytes_done[idx] += bytes;
+ icd->bytes_done[ddir] += bytes;
if (io_u->end_io) {
- ret = io_u->end_io(td, io_u);
+ ret = io_u->end_io(td, io_u_ptr);
+ io_u = *io_u_ptr;
if (ret && !icd->error)
icd->error = ret;
}
io_u_log_error(td, io_u);
}
if (icd->error) {
- enum error_type_bit eb = td_error_type(io_u->ddir, icd->error);
+ enum error_type_bit eb = td_error_type(ddir, icd->error);
+
if (!td_non_fatal_error(td, eb, icd->error))
return;
+
/*
* If there is a non_fatal error, then add to the error count
* and clear all the errors.
update_error_count(td, icd->error);
td_clear_error(td);
icd->error = 0;
- io_u->error = 0;
+ if (io_u)
+ io_u->error = 0;
}
}
int nr)
{
int ddir;
- if (!td->o.disable_clat || !td->o.disable_bw)
+
+ if (!gtod_reduce(td))
fio_gettime(&icd->time, NULL);
icd->nr = nr;
for (i = 0; i < icd->nr; i++) {
io_u = td->io_ops->event(td, i);
- io_completed(td, io_u, icd);
+ io_completed(td, &io_u, icd);
- if (!(io_u->flags & IO_U_F_FREE_DEF))
+ if (io_u)
put_io_u(td, io_u);
}
}
struct io_completion_data icd;
init_icd(td, &icd, 1);
- io_completed(td, io_u, &icd);
+ io_completed(td, &io_u, &icd);
- if (!(io_u->flags & IO_U_F_FREE_DEF))
+ if (io_u)
put_io_u(td, io_u);
if (icd.error) {
unsigned long slat_time;
slat_time = utime_since(&io_u->start_time, &io_u->issue_time);
- add_slat_sample(td, io_u->ddir, slat_time, io_u->xfer_buflen);
+ add_slat_sample(td, io_u->ddir, slat_time, io_u->xfer_buflen,
+ io_u->offset);
}
}
projects / fio.git / blobdiff