diff options
| author | Jens Axboe <axboe@kernel.dk> | 2022-03-18 11:28:13 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-03-18 11:42:48 -0600 |
| commit | 5e929367468c8f97cd1ffb0417316cecfebef94b (patch) | |
| tree | d91130d04ab34d254377cab86f374a9ede91a5da | |
| parent | adf3a9e9f556613197583a1884f0de40a8bb6fb9 (diff) | |
io_uring: terminate manual loop iterator loop correctly for non-vecsfor-5.18/io_uring-2022-03-18
The fix for not advancing the iterator if we're using fixed buffers is
broken in that it can hit a condition where we don't terminate the loop.
This results in io-wq looping forever, asking to read (or write) 0 bytes
for every subsequent loop.
Reported-by: Joel Jaeschke <joel.jaeschke@gmail.com>
Link: https://github.com/axboe/liburing/issues/549
Fixes: 16c8d2df7ec0 ("io_uring: ensure symmetry in handling iter types in loop_rw_iter()")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | fs/io_uring.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 2d6ab732f940..5fa736344b67 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -3612,13 +3612,15 @@ static ssize_t loop_rw_iter(int rw, struct io_kiocb *req, struct iov_iter *iter) ret = nr; break; } + ret += nr; if (!iov_iter_is_bvec(iter)) { iov_iter_advance(iter, nr); } else { - req->rw.len -= nr; req->rw.addr += nr; + req->rw.len -= nr; + if (!req->rw.len) + break; } - ret += nr; if (nr != iovec.iov_len) break; } |