diff options
| author | Bijan Mottahedeh <bijan.mottahedeh@oracle.com> | 2020-01-15 18:37:45 -0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-01-15 21:36:13 -0700 |
| commit | 797f3f535d59f05ad12c629338beef6cb801d19e (patch) | |
| tree | a0789204f588efa9b836fc8400d36071050a1e53 /fs | |
| parent | 78912934f4f7dd7a424159c69bf9bdd46e823781 (diff) | |
| download | linux-stable-797f3f535d59f05ad12c629338beef6cb801d19e.tar.gz linux-stable-797f3f535d59f05ad12c629338beef6cb801d19e.tar.bz2 linux-stable-797f3f535d59f05ad12c629338beef6cb801d19e.zip | |
io_uring: clear req->result always before issuing a read/write request
req->result is cleared when io_issue_sqe() calls io_read/write_pre()
routines. Those routines however are not called when the sqe
argument is NULL, which is the case when io_issue_sqe() is called from
io_wq_submit_work(). io_issue_sqe() may then examine a stale result if
a polled request had previously failed with -EAGAIN:
if (ctx->flags & IORING_SETUP_IOPOLL) {
if (req->result == -EAGAIN)
return -EAGAIN;
io_iopoll_req_issued(req);
}
and in turn cause a subsequently completed request to be re-issued in
io_wq_submit_work().
Signed-off-by: Bijan Mottahedeh <bijan.mottahedeh@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index e32268ce38a5..3130ed16456e 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1843,6 +1843,7 @@ static int io_read(struct io_kiocb *req, struct io_kiocb **nxt, if (!force_nonblock) req->rw.kiocb.ki_flags &= ~IOCB_NOWAIT; + req->result = 0; io_size = ret; if (req->flags & REQ_F_LINK) req->result = io_size; @@ -1930,6 +1931,7 @@ static int io_write(struct io_kiocb *req, struct io_kiocb **nxt, if (!force_nonblock) req->rw.kiocb.ki_flags &= ~IOCB_NOWAIT; + req->result = 0; io_size = ret; if (req->flags & REQ_F_LINK) req->result = io_size; |