diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2024-03-08 13:55:56 +0000 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-03-08 07:58:23 -0700 |
| commit | 3a96378e22cc46c7c49b5911f6c8631527a133a9 (patch) | |
| tree | c7bfba6010f9a36312ac72ea63c321a5ac989242 /io_uring | |
| parent | d9b441889c3595aa18f89ee42c6d22bb62234343 (diff) | |
| download | linux-3a96378e22cc46c7c49b5911f6c8631527a133a9.tar.gz | |
io_uring: fix mshot io-wq checks
When checking for concurrent CQE posting, we're not only interested in
requests running from the poll handler but also strayed requests ended
up in normal io-wq execution. We're disallowing multishots in general
from io-wq, not only when they came in a certain way.
Cc: stable@vger.kernel.org
Fixes: 17add5cea2bba ("io_uring: force multishot CQEs into task context")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/d8c5b36a39258036f93301cd60d3cd295e40653d.1709905727.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index f70e657b6f73cc..62a5819779b5aa 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -87,7 +87,7 @@ static inline bool io_check_multishot(struct io_kiocb *req, * generic paths but multipoll may decide to post extra cqes. */ return !(issue_flags & IO_URING_F_IOWQ) || - !(issue_flags & IO_URING_F_MULTISHOT) || + !(req->flags & REQ_F_APOLL_MULTISHOT) || !req->ctx->task_complete; } |