X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=backend.c;h=c9875f480c726ec814ed916d02491a4dce442faf;hp=bc2e3eb50e37a501ae89f89dcac767f1023fa616;hb=2466096336bd0fbc1a94811aa338926af6baf42f;hpb=5bb79f69c2d9dc8542c25af96f040d1884230688 diff --git a/backend.c b/backend.c index bc2e3eb5..c9875f48 100644 --- a/backend.c +++ b/backend.c @@ -54,9 +54,9 @@ #include "lib/getrusage.h" #include "idletime.h" #include "err.h" -#include "lib/tp.h" #include "workqueue.h" #include "lib/mountcheck.h" +#include "rate-submit.h" static pthread_t helper_thread; static pthread_mutex_t helper_lock; @@ -934,13 +934,10 @@ static uint64_t do_io(struct thread_data *td) if (td->error) break; - ret = workqueue_enqueue(&td->io_wq, &io_u->work); - if (ret) - ret = FIO_Q_QUEUED; - else - ret = FIO_Q_BUSY; + workqueue_enqueue(&td->io_wq, &io_u->work); + ret = FIO_Q_QUEUED; - if (ret == FIO_Q_QUEUED && ddir_rw(ddir)) { + if (ddir_rw(ddir)) { td->io_issues[ddir]++; td->io_issue_bytes[ddir] += blen; td->rate_io_issue_bytes[ddir] += blen; @@ -977,7 +974,7 @@ reap: if (!in_ramp_time(td) && should_check_rate(td)) { if (check_min_rate(td, &comp_time)) { - if (exitall_on_terminate) + if (exitall_on_terminate || td->o.exitall_error) fio_terminate_threads(td->groupid); td_verror(td, EIO, "check_min_rate"); break; @@ -1361,73 +1358,9 @@ static uint64_t do_dry_run(struct thread_data *td) return td->bytes_done[DDIR_WRITE] + td->bytes_done[DDIR_TRIM]; } -static void io_workqueue_fn(struct thread_data *td, struct workqueue_work *work) -{ - struct io_u *io_u = container_of(work, struct io_u, work); - const enum fio_ddir ddir = io_u->ddir; - int ret; - - dprint(FD_RATE, "io_u %p queued by %u\n", io_u, gettid()); - - io_u_set(io_u, IO_U_F_NO_FILE_PUT); - - td->cur_depth++; - - do { - ret = td_io_queue(td, io_u); - if (ret != FIO_Q_BUSY) - break; - ret = io_u_queued_complete(td, 1); - if (ret > 0) - td->cur_depth -= ret; - io_u_clear(io_u, IO_U_F_FLIGHT); - } while (1); - - dprint(FD_RATE, "io_u %p ret %d by %u\n", io_u, ret, gettid()); - - io_queue_event(td, io_u, &ret, ddir, NULL, 0, NULL); - - if (ret == FIO_Q_COMPLETED) - td->cur_depth--; - else if (ret == FIO_Q_QUEUED) { - unsigned int min_evts; - - if (td->o.iodepth == 1) - min_evts = 1; - else - min_evts = 0; - - ret = io_u_queued_complete(td, min_evts); - if (ret > 0) - td->cur_depth -= ret; - } else if (ret == FIO_Q_BUSY) { - ret = io_u_queued_complete(td, td->cur_depth); - if (ret > 0) - td->cur_depth -= ret; - } -} - -static bool io_workqueue_pre_sleep_flush_fn(struct thread_data *td) -{ - if (td->io_u_queued || td->cur_depth || td->io_u_in_flight) - return true; - - return false; -} - -static void io_workqueue_pre_sleep_fn(struct thread_data *td) -{ - int ret; - - ret = io_u_quiesce(td); - if (ret > 0) - td->cur_depth -= ret; -} - -struct workqueue_ops rated_wq_ops = { - .fn = io_workqueue_fn, - .pre_sleep_flush_fn = io_workqueue_pre_sleep_flush_fn, - .pre_sleep_fn = io_workqueue_pre_sleep_fn, +struct fork_data { + struct thread_data *td; + struct sk_out *sk_out; }; /* @@ -1436,13 +1369,18 @@ struct workqueue_ops rated_wq_ops = { */ static void *thread_main(void *data) { + struct fork_data *fd = data; unsigned long long elapsed_us[DDIR_RWDIR_CNT] = { 0, }; - struct thread_data *td = data; + struct thread_data *td = fd->td; struct thread_options *o = &td->o; + struct sk_out *sk_out = fd->sk_out; pthread_condattr_t attr; int clear_state; int ret; + sk_out_assign(sk_out); + free(fd); + if (!o->use_thread) { setsid(); td->pid = getpid(); @@ -1622,13 +1560,12 @@ static void *thread_main(void *data) goto err; } - if (td->flags & TD_F_COMPRESS_LOG) - tp_init(&td->tp_data); + if (iolog_compress_init(td, sk_out)) + goto err; fio_verify_init(td); - if ((o->io_submit_mode == IO_MODE_OFFLOAD) && - workqueue_init(td, &td->io_wq, &rated_wq_ops, td->o.iodepth)) + if (rate_submit_init(td, sk_out)) goto err; fio_gettime(&td->epoch, NULL); @@ -1660,8 +1597,11 @@ static void *thread_main(void *data) if (td->o.verify_only && (td_write(td) || td_rw(td))) verify_bytes = do_dry_run(td); - else + else { verify_bytes = do_io(td); + if (!verify_bytes) + fio_mark_td_terminate(td); + } clear_state = 1; @@ -1726,16 +1666,13 @@ static void *thread_main(void *data) fio_writeout_logs(td); - if (o->io_submit_mode == IO_MODE_OFFLOAD) - workqueue_exit(&td->io_wq); - - if (td->flags & TD_F_COMPRESS_LOG) - tp_exit(&td->tp_data); + iolog_compress_exit(td); + rate_submit_exit(td); if (o->exec_postrun) exec_string(o, o->exec_postrun, (const char *)"postrun"); - if (exitall_on_terminate) + if (exitall_on_terminate || (o->exitall_error && td->error)) fio_terminate_threads(td->groupid); err: @@ -1775,6 +1712,7 @@ err: */ check_update_rusage(td); + sk_out_drop(); return (void *) (uintptr_t) td->error; } @@ -1783,9 +1721,9 @@ err: * We cannot pass the td data into a forked process, so attach the td and * pass it to the thread worker. */ -static int fork_main(int shmid, int offset) +static int fork_main(struct sk_out *sk_out, int shmid, int offset) { - struct thread_data *td; + struct fork_data *fd; void *data, *ret; #if !defined(__hpux) && !defined(CONFIG_NO_SHM) @@ -1803,8 +1741,10 @@ static int fork_main(int shmid, int offset) data = threads; #endif - td = data + offset * sizeof(struct thread_data); - ret = thread_main(td); + fd = calloc(1, sizeof(*fd)); + fd->td = data + offset * sizeof(struct thread_data); + fd->sk_out = sk_out; + ret = thread_main(fd); shmdt(data); return (int) (uintptr_t) ret; } @@ -2029,7 +1969,7 @@ mounted: /* * Main function for kicking off and reaping jobs, as needed. */ -static void run_threads(void) +static void run_threads(struct sk_out *sk_out) { struct thread_data *td; unsigned int i, todo, nr_running, m_rate, t_rate, nr_started; @@ -2163,14 +2103,20 @@ reap: nr_started++; if (td->o.use_thread) { + struct fork_data *fd; int ret; + fd = calloc(1, sizeof(*fd)); + fd->td = td; + fd->sk_out = sk_out; + dprint(FD_PROCESS, "will pthread_create\n"); ret = pthread_create(&td->thread, NULL, - thread_main, td); + thread_main, fd); if (ret) { log_err("pthread_create: %s\n", strerror(ret)); + free(fd); nr_started--; break; } @@ -2183,14 +2129,14 @@ reap: dprint(FD_PROCESS, "will fork\n"); pid = fork(); if (!pid) { - int ret = fork_main(shm_id, i); + int ret = fork_main(sk_out, shm_id, i); _exit(ret); } else if (i == fio_debug_jobno) *fio_debug_jobp = pid; } dprint(FD_MUTEX, "wait on startup_mutex\n"); - if (fio_mutex_down_timeout(startup_mutex, 10)) { + if (fio_mutex_down_timeout(startup_mutex, 10000)) { log_err("fio: job startup hung? exiting.\n"); fio_terminate_threads(TERMINATE_ALL); fio_abort = 1; @@ -2293,8 +2239,11 @@ static void free_disk_util(void) static void *helper_thread_main(void *data) { + struct sk_out *sk_out = data; int ret = 0; + sk_out_assign(sk_out); + fio_mutex_up(startup_mutex); while (!ret) { @@ -2325,10 +2274,11 @@ static void *helper_thread_main(void *data) print_thread_status(); } + sk_out_drop(); return NULL; } -static int create_helper_thread(void) +static int create_helper_thread(struct sk_out *sk_out) { int ret; @@ -2337,7 +2287,7 @@ static int create_helper_thread(void) pthread_cond_init(&helper_cond, NULL); pthread_mutex_init(&helper_lock, NULL); - ret = pthread_create(&helper_thread, NULL, helper_thread_main, NULL); + ret = pthread_create(&helper_thread, NULL, helper_thread_main, sk_out); if (ret) { log_err("Can't create helper thread: %s\n", strerror(ret)); return 1; @@ -2349,7 +2299,7 @@ static int create_helper_thread(void) return 0; } -int fio_backend(void) +int fio_backend(struct sk_out *sk_out) { struct thread_data *td; int i; @@ -2379,12 +2329,12 @@ int fio_backend(void) set_genesis_time(); stat_init(); - create_helper_thread(); + create_helper_thread(sk_out); cgroup_list = smalloc(sizeof(*cgroup_list)); INIT_FLIST_HEAD(cgroup_list); - run_threads(); + run_threads(sk_out); wait_for_helper_thread_exit();