Skip to content

Commit 3a96378

Browse files
isilenceaxboe
authored andcommitted
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: 17add5c ("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>
1 parent d9b4418 commit 3a96378

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

io_uring/net.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ static inline bool io_check_multishot(struct io_kiocb *req,
8787
* generic paths but multipoll may decide to post extra cqes.
8888
*/
8989
return !(issue_flags & IO_URING_F_IOWQ) ||
90-
!(issue_flags & IO_URING_F_MULTISHOT) ||
90+
!(req->flags & REQ_F_APOLL_MULTISHOT) ||
9191
!req->ctx->task_complete;
9292
}
9393

0 commit comments

Comments
 (0)