mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 06:10:56 +00:00
Code Issues Releases Wiki Activity

io_uring: carve io_poll_check_events fast path

Browse source 
The fast path in io_poll_check_events() is when we have only one
(i.e. master) reference. Move all verification, cancellations
checks, edge case handling and so on under a common if.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/8c21c5d5e027e32dc553705e88796dec79ff6f93.1669821213.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2022-11-30 15:21:52 +00:00 committed by Jens Axboe
parent f6f7f903e7
commit 9805fa2d94
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
io_uring/poll.c
View file

@ -247,27 +247,30 @@ static int io_poll_check_events(struct io_kiocb *req, bool *locked)
do { do {
v = atomic_read(&req->poll_refs); v = atomic_read(&req->poll_refs);
/* tw handler should be the owner, and so have some references */ if (unlikely(v != 1)) {
if (WARN_ON_ONCE(!(v & IO_POLL_REF_MASK))) /* tw should be the owner and so have some refs */
return IOU_POLL_DONE; if (WARN_ON_ONCE(!(v & IO_POLL_REF_MASK)))
if (v & IO_POLL_CANCEL_FLAG) return IOU_POLL_DONE;
return -ECANCELED; if (v & IO_POLL_CANCEL_FLAG)
/* return -ECANCELED;
* cqe.res contains only events of the first wake up
* and all others are be lost. Redo vfs_poll() to get
* up to date state.
*/
if ((v & IO_POLL_REF_MASK) != 1)
req->cqe.res = 0;
if (v & IO_POLL_RETRY_FLAG) {
req->cqe.res = 0;
/* /*
* We won't find new events that came in between * cqe.res contains only events of the first wake up
* vfs_poll and the ref put unless we clear the flag * and all others are to be lost. Redo vfs_poll() to get
* in advance. * up to date state.
*/ */
atomic_andnot(IO_POLL_RETRY_FLAG, &req->poll_refs); if ((v & IO_POLL_REF_MASK) != 1)
v &= ~IO_POLL_RETRY_FLAG; req->cqe.res = 0;
if (v & IO_POLL_RETRY_FLAG) {
req->cqe.res = 0;
/*
* We won't find new events that came in between
* vfs_poll and the ref put unless we clear the
* flag in advance.
*/
atomic_andnot(IO_POLL_RETRY_FLAG, &req->poll_refs);
v &= ~IO_POLL_RETRY_FLAG;
}
} }
/* the mask was stashed in __io_poll_execute */ /* the mask was stashed in __io_poll_execute */