diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2022-12-07 06:53:27 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-12-31 15:33:12 +0300 |
| commit | e2c22a38fe299c4ed58aa4606fd435048c662a3a (patch) | |
| tree | 47876c6e95e68e4ff08fd3c331670b25c48f7a60 /io_uring | |
| parent | f6a5cada4ff62dd13b92ef7d6964307fcbdf6779 (diff) | |
| download | linux-e2c22a38fe299c4ed58aa4606fd435048c662a3a.tar.xz | |
io_uring: improve io_double_lock_ctx fail handling
commit 4c979eaefa4356d385b7c7d2877dc04d7fe88969 upstream.
msg_ring will fail the request if it can't lock rings, instead punt it
to io-wq as was originally intended.
Cc: stable@vger.kernel.org
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/4697f05afcc37df5c8f89e2fe6d9c7c19f0241f9.1670384893.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/msg_ring.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/io_uring/msg_ring.c b/io_uring/msg_ring.c index d8aeac776438..a49ccab262d5 100644 --- a/io_uring/msg_ring.c +++ b/io_uring/msg_ring.c @@ -164,6 +164,8 @@ int io_msg_ring(struct io_kiocb *req, unsigned int issue_flags) } done: + if (ret == -EAGAIN) + return -EAGAIN; if (ret < 0) req_set_fail(req); io_req_set_res(req, ret, 0); |