mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
io_uring: fix mshot io-wq checks
[ Upstream commit3a96378e22
] 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:17add5cea2
("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
847937bb9f
commit
10c1fa97d4
1 changed files with 1 additions and 1 deletions
|
@ -87,7 +87,7 @@ static inline bool io_check_multishot(struct io_kiocb *req,
|
||||||
* generic paths but multipoll may decide to post extra cqes.
|
* generic paths but multipoll may decide to post extra cqes.
|
||||||
*/
|
*/
|
||||||
return !(issue_flags & IO_URING_F_IOWQ) ||
|
return !(issue_flags & IO_URING_F_IOWQ) ||
|
||||||
!(issue_flags & IO_URING_F_MULTISHOT) ||
|
!(req->flags & REQ_F_APOLL_MULTISHOT) ||
|
||||||
!req->ctx->task_complete;
|
!req->ctx->task_complete;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue