X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=ioengines.c;h=56149381894abfb56e9bd7a47368cc2773278fde;hp=4c609f2b88ae4c537dc90489241808acd711fa1f;hb=effd6ff0d9f701a64d6bc46509eedfdcfd12f553;hpb=0329ecda39a8ed42e173d25e16d39c968568d783 diff --git a/ioengines.c b/ioengines.c index 4c609f2b..56149381 100644 --- a/ioengines.c +++ b/ioengines.c @@ -104,7 +104,23 @@ static struct ioengine_ops *dlopen_ioengine(struct thread_data *td, * Unlike the included modules, external engines should have a * non-static ioengine structure that we can reference. */ - ops = dlsym(dlhandle, "ioengine"); + ops = dlsym(dlhandle, engine_lib); + if (!ops) + ops = dlsym(dlhandle, "ioengine"); + + /* + * For some external engines (like C++ ones) it is not that trivial + * to provide a non-static ionengine structure that we can reference. + * Instead we call a method which allocates the required ioengine + * structure. + */ + if (!ops) { + get_ioengine_t get_ioengine = dlsym(dlhandle, "get_ioengine"); + + if (get_ioengine) + get_ioengine(&ops); + } + if (!ops) { td_vmsg(td, -1, dlerror(), "dlsym"); dlclose(dlhandle); @@ -208,6 +224,16 @@ int td_io_getevents(struct thread_data *td, unsigned int min, unsigned int max, { int r = 0; + /* + * For ioengine=rdma one side operation RDMA_WRITE or RDMA_READ, + * server side gets a message from the client + * side that the task is finished, and + * td->done is set to 1 after td_io_commit(). In this case, + * there is no need to reap complete event in server side. + */ + if (td->done) + return 0; + if (min > 0 && td->io_ops->commit) { r = td->io_ops->commit(td); if (r < 0) @@ -224,7 +250,7 @@ int td_io_getevents(struct thread_data *td, unsigned int min, unsigned int max, out: if (r >= 0) { /* - * Reflect that our submitted requests were retrieved with + * Reflect that our submitted requests were retrieved with * whatever OS async calls are in the underlying engine. */ td->io_u_in_flight -= r; @@ -248,6 +274,11 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u) assert(fio_file_open(io_u->file)); + /* + * If using a write iolog, store this entry. + */ + log_io_u(td, io_u); + io_u->error = 0; io_u->resid = 0; @@ -263,13 +294,20 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u) sizeof(struct timeval)); } - if (ddir_rw(io_u->ddir)) - td->io_issues[io_u->ddir]++; + if (ddir_rw(acct_ddir(io_u))) + td->io_issues[acct_ddir(io_u)]++; ret = td->io_ops->queue(td, io_u); unlock_file(td, io_u->file); + /* + * If an error was seen and the io engine didn't propagate it + * back to 'td', do so. + */ + if (io_u->error && !td->error) + td_verror(td, io_u->error, "td_io_queue"); + /* * Add warning for O_DIRECT so that users have an easier time * spotting potentially bad alignment. If this triggers for the first @@ -278,11 +316,12 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u) */ if (io_u->error == EINVAL && td->io_issues[io_u->ddir & 1] == 1 && td->o.odirect) { + log_info("fio: first direct IO errored. File system may not " "support direct IO, or iomem_align= is bad.\n"); } - if (!td->io_ops->commit) { + if (!td->io_ops->commit || ddir_trim(io_u->ddir)) { io_u_mark_submit(td, 1); io_u_mark_complete(td, 1); } @@ -291,8 +330,7 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u) if (ddir_rw(io_u->ddir)) { io_u_mark_depth(td, 1); td->ts.total_io_u[io_u->ddir]++; - } else if (io_u->ddir == DDIR_TRIM) - td->ts.total_io_u[2]++; + } } else if (ret == FIO_Q_QUEUED) { int r; @@ -337,6 +375,9 @@ int td_io_init(struct thread_data *td) td->error = ret; } + if (!ret && (td->io_ops->flags & FIO_NOIO)) + td->flags |= TD_F_NOIO; + return ret; } @@ -349,14 +390,14 @@ int td_io_commit(struct thread_data *td) if (!td->cur_depth || !td->io_u_queued) return 0; - io_u_mark_depth(td, td->io_u_queued); + io_u_mark_depth(td, td->io_u_queued); if (td->io_ops->commit) { ret = td->io_ops->commit(td); if (ret) td_verror(td, -ret, "io commit"); } - + /* * Reflect that events were submitted as async IO requests. */ @@ -385,7 +426,7 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f) return 1; } - fio_file_reset(f); + fio_file_reset(td, f); fio_file_set_open(f); fio_file_clear_closing(f); disk_util_inc(f->du); @@ -458,11 +499,21 @@ int td_io_close_file(struct thread_data *td, struct fio_file *f) fio_file_set_closing(f); disk_util_dec(f->du); - unlock_file_all(td, f); + + if (td->o.file_lock_mode != FILE_LOCK_NONE) + unlock_file_all(td, f); return put_file(td, f); } +int td_io_unlink_file(struct thread_data *td, struct fio_file *f) +{ + if (td->io_ops->unlink_file) + return td->io_ops->unlink_file(td, f); + else + return unlink(f->file_name); +} + int td_io_get_file_size(struct thread_data *td, struct fio_file *f) { if (!td->io_ops->get_file_size) @@ -471,7 +522,8 @@ int td_io_get_file_size(struct thread_data *td, struct fio_file *f) return td->io_ops->get_file_size(td, f); } -static int do_sync_file_range(struct thread_data *td, struct fio_file *f) +static int do_sync_file_range(const struct thread_data *td, + struct fio_file *f) { off64_t offset, nbytes; @@ -484,14 +536,14 @@ static int do_sync_file_range(struct thread_data *td, struct fio_file *f) return sync_file_range(f->fd, offset, nbytes, td->o.sync_file_range); } -int do_io_u_sync(struct thread_data *td, struct io_u *io_u) +int do_io_u_sync(const struct thread_data *td, struct io_u *io_u) { int ret; if (io_u->ddir == DDIR_SYNC) { ret = fsync(io_u->file->fd); } else if (io_u->ddir == DDIR_DATASYNC) { -#ifdef FIO_HAVE_FDATASYNC +#ifdef CONFIG_FDATASYNC ret = fdatasync(io_u->file->fd); #else ret = io_u->xfer_buflen; @@ -510,7 +562,7 @@ int do_io_u_sync(struct thread_data *td, struct io_u *io_u) return ret; } -int do_io_u_trim(struct thread_data *td, struct io_u *io_u) +int do_io_u_trim(const struct thread_data *td, struct io_u *io_u) { #ifndef FIO_HAVE_TRIM io_u->error = EINVAL; @@ -521,7 +573,7 @@ int do_io_u_trim(struct thread_data *td, struct io_u *io_u) ret = os_trim(f->fd, io_u->offset, io_u->xfer_buflen); if (!ret) - return io_u->xfer_buflen;; + return io_u->xfer_buflen; io_u->error = ret; return 0;