X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=backend.c;h=218ae2545db8fbf5e29a89ef43f954ac6f25bc9c;hp=225d8a36ec66a427a996a8f14fe48717fba67b6f;hb=7496ea3e7fb234a1c92067301c028934c325daad;hpb=5d879392c0e4025e508cce8118f6fc13ee57cc0e diff --git a/backend.c b/backend.c index 225d8a36..218ae254 100644 --- a/backend.c +++ b/backend.c @@ -50,6 +50,8 @@ #include "lib/rand.h" #include "memalign.h" #include "server.h" +#include "lib/getrusage.h" +#include "idletime.h" static pthread_t disk_util_thread; static struct fio_mutex *disk_thread_mutex; @@ -216,7 +218,7 @@ static int __check_min_rate(struct thread_data *td, struct timeval *now, } static int check_min_rate(struct thread_data *td, struct timeval *now, - unsigned long *bytes_done) + uint64_t *bytes_done) { int ret = 0; @@ -393,8 +395,9 @@ static int break_on_this_error(struct thread_data *td, enum fio_ddir ddir, * The main verify engine. Runs over the writes we previously submitted, * reads the blocks back in, and checks the crc/md5 of the data. */ -static void do_verify(struct thread_data *td) +static void do_verify(struct thread_data *td, uint64_t verify_bytes) { + uint64_t bytes_done[DDIR_RWDIR_CNT] = { 0, 0, 0 }; struct fio_file *f; struct io_u *io_u; int ret, min_events; @@ -422,6 +425,7 @@ static void do_verify(struct thread_data *td) io_u = NULL; while (!td->terminate) { + enum fio_ddir ddir; int ret2, full; update_tv_cache(td); @@ -437,18 +441,53 @@ static void do_verify(struct thread_data *td) if (flow_threshold_exceeded(td)) continue; - io_u = __get_io_u(td); - if (!io_u) - break; + if (!td->o.experimental_verify) { + io_u = __get_io_u(td); + if (!io_u) + break; - if (get_next_verify(td, io_u)) { - put_io_u(td, io_u); - break; - } + if (get_next_verify(td, io_u)) { + put_io_u(td, io_u); + break; + } - if (td_io_prep(td, io_u)) { - put_io_u(td, io_u); - break; + if (td_io_prep(td, io_u)) { + put_io_u(td, io_u); + break; + } + } else { + if (ddir_rw_sum(bytes_done) + td->o.rw_min_bs > verify_bytes) + break; + + while ((io_u = get_io_u(td)) != NULL) { + /* + * We are only interested in the places where + * we wrote or trimmed IOs. Turn those into + * reads for verification purposes. + */ + if (io_u->ddir == DDIR_READ) { + /* + * Pretend we issued it for rwmix + * accounting + */ + td->io_issues[DDIR_READ]++; + put_io_u(td, io_u); + continue; + } else if (io_u->ddir == DDIR_TRIM) { + io_u->ddir = DDIR_READ; + io_u->flags |= IO_U_F_TRIMMED; + break; + } else if (io_u->ddir == DDIR_WRITE) { + io_u->ddir = DDIR_READ; + break; + } else { + put_io_u(td, io_u); + continue; + } + } + + if (!io_u) + break; } if (td->o.verify_async) @@ -456,6 +495,8 @@ static void do_verify(struct thread_data *td) else io_u->end_io = verify_io_u; + ddir = io_u->ddir; + ret = td_io_queue(td, io_u); switch (ret) { case FIO_Q_COMPLETED: @@ -488,7 +529,7 @@ static void do_verify(struct thread_data *td) requeue_io_u(td, &io_u); } else { sync_done: - ret = io_u_sync_complete(td, io_u, NULL); + ret = io_u_sync_complete(td, io_u, bytes_done); if (ret < 0) break; } @@ -507,7 +548,7 @@ sync_done: break; } - if (break_on_this_error(td, io_u->ddir, &ret)) + if (break_on_this_error(td, ddir, &ret)) break; /* @@ -531,7 +572,7 @@ sync_done: * and do the verification on them through * the callback handler */ - if (io_u_queued_complete(td, min_events, NULL) < 0) { + if (io_u_queued_complete(td, min_events, bytes_done) < 0) { ret = -1; break; } @@ -573,9 +614,12 @@ static int io_bytes_exceeded(struct thread_data *td) /* * Main IO worker function. It retrieves io_u's to process and queues * and reaps them, checking for rate and errors along the way. + * + * Returns number of bytes written and trimmed. */ -static void do_io(struct thread_data *td) +static uint64_t do_io(struct thread_data *td) { + uint64_t bytes_done[DDIR_RWDIR_CNT] = { 0, 0, 0 }; unsigned int i; int ret = 0; @@ -588,7 +632,6 @@ static void do_io(struct thread_data *td) (!flist_empty(&td->trim_list)) || !io_bytes_exceeded(td) || td->o.time_based) { struct timeval comp_time; - unsigned long bytes_done[DDIR_RWDIR_CNT] = { 0, 0, 0 }; int min_evts = 0; struct io_u *io_u; int ret2, full; @@ -792,6 +835,8 @@ sync_done: */ if (!ddir_rw_sum(td->this_io_bytes)) td->done = 1; + + return bytes_done[DDIR_WRITE] + bytes_done[DDIR_TRIM]; } static void cleanup_io_u(struct thread_data *td) @@ -1022,6 +1067,7 @@ static void *thread_main(void *data) INIT_FLIST_HEAD(&td->io_hist_list); INIT_FLIST_HEAD(&td->verify_list); INIT_FLIST_HEAD(&td->trim_list); + INIT_FLIST_HEAD(&td->next_rand_list); pthread_mutex_init(&td->io_u_lock, NULL); td->io_hist_tree = RB_ROOT; @@ -1071,7 +1117,7 @@ static void *thread_main(void *data) goto err; } -#ifdef FIO_HAVE_LIBNUMA +#ifdef CONFIG_LIBNUMA /* numa node setup */ if (td->o.numa_cpumask_set || td->o.numa_memmask_set) { int ret; @@ -1166,10 +1212,11 @@ static void *thread_main(void *data) } fio_gettime(&td->epoch, NULL); - getrusage(RUSAGE_SELF, &td->ru_start); - + fio_getrusage(&td->ru_start); clear_state = 0; while (keep_running(td)) { + uint64_t verify_bytes; + fio_gettime(&td->start, NULL); memcpy(&td->bw_sample_time, &td->start, sizeof(td->start)); memcpy(&td->iops_sample_time, &td->start, sizeof(td->start)); @@ -1190,7 +1237,7 @@ static void *thread_main(void *data) prune_io_piece_log(td); - do_io(td); + verify_bytes = do_io(td); clear_state = 1; @@ -1219,7 +1266,7 @@ static void *thread_main(void *data) fio_gettime(&td->start, NULL); - do_verify(td); + do_verify(td, verify_bytes); td->ts.runtime[DDIR_READ] += utime_since_now(&td->start); @@ -1453,6 +1500,8 @@ static void run_threads(void) if (fio_gtod_offload && fio_start_gtod_thread()) return; + + fio_idle_prof_init(); set_sig_handlers(); @@ -1510,6 +1559,9 @@ static void run_threads(void) } } + /* start idle threads before io threads start to run */ + fio_idle_prof_start(); + set_genesis_time(); while (todo) { @@ -1672,6 +1724,8 @@ static void run_threads(void) usleep(10000); } + fio_idle_prof_stop(); + update_io_ticks(); fio_unpin_memory(); }