Commit 005308f7 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring/poll: clear single/double poll flags on poll arming 



Unless we have at least one entry queued, then don't call into
io_poll_remove_entries(). Normally this isn't possible, but if we
retry poll then we can have ->nr_entries cleared again as we're
setting it up. If this happens for a poll retry, then we'll still have
at least REQ_F_SINGLE_POLL set. io_poll_remove_entries() then thinks
it has entries to remove.

Clear REQ_F_SINGLE_POLL and REQ_F_DOUBLE_POLL unconditionally when
arming a poll request.

Fixes: c16bda37 ("io_uring/poll: allow some retries for poll triggering spuriously")
Cc: stable@vger.kernel.org
Reported-by: default avatarPengfei Xu <pengfei.xu@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 02a4d923

io_uring/poll.c

+1 −0
Original line number Diff line number Diff line
@@ -726,6 +726,7 @@ int io_arm_poll_handler(struct io_kiocb *req, unsigned issue_flags) 
	apoll = io_req_alloc_apoll(req, issue_flags);

	if (!apoll)

		return IO_APOLL_ABORTED;

	req->flags &= ~(REQ_F_SINGLE_POLL | REQ_F_DOUBLE_POLL);

	req->flags |= REQ_F_POLLED;

	ipt.pt._qproc = io_async_queue_proc;