X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=ioengines.c;h=b3c2e51f952c735cc81879214598d0c8c1b62879;hb=750db473abdebdbf3ddfc8556a9873762c9db8f4;hp=4c609f2b88ae4c537dc90489241808acd711fa1f;hpb=0329ecda39a8ed42e173d25e16d39c968568d783;p=fio.git diff --git a/ioengines.c b/ioengines.c index 4c609f2b..b3c2e51f 100644 --- a/ioengines.c +++ b/ioengines.c @@ -208,6 +208,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 +234,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; @@ -278,6 +288,7 @@ 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"); } @@ -349,14 +360,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. */ @@ -521,7 +532,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;