diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2022-09-27 00:44:40 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-09-26 18:44:15 -0600 |
| commit | c278d9f8ac0db5590909e6d9e85b5ca2b786704f (patch) | |
| tree | 5958db703e17e7b72d7c8e482d063a3678720e66 /io_uring | |
| parent | bf68b5b34311ee57ed40749a1257a30b46127556 (diff) | |
| download | lwn-c278d9f8ac0db5590909e6d9e85b5ca2b786704f.tar.gz lwn-c278d9f8ac0db5590909e6d9e85b5ca2b786704f.zip | |
io_uring/rw: don't lose short results on io_setup_async_rw()
If a retry io_setup_async_rw() fails we lose result from the first
io_iter_do_read(), which is a problem mostly for streams/sockets.
Cc: stable@vger.kernel.org
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/0e8d20cebe5fc9c96ed268463c394237daabc384.1664235732.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/rw.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/io_uring/rw.c b/io_uring/rw.c index ed14322aadb9..1ae1e52ab4cb 100644 --- a/io_uring/rw.c +++ b/io_uring/rw.c @@ -764,10 +764,12 @@ int io_read(struct io_kiocb *req, unsigned int issue_flags) iov_iter_restore(&s->iter, &s->iter_state); ret2 = io_setup_async_rw(req, iovec, s, true); - if (ret2) - return ret2; - iovec = NULL; + if (ret2) { + ret = ret > 0 ? ret : ret2; + goto done; + } + io = req->async_data; s = &io->s; /* |