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>

diff --git a/io_uring/net.c b/io_uring/net.c
index f70e657b6f73ccf2a730cbcecd80228d78e3b95d..62a5819779b5aa4a33b6624b2d0f552715a3a255 100644 (file)
--- 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;
 }