Commit 4061f0ef authored by Jens Axboe's avatar Jens Axboe
Browse files

Revert "io_uring: disallow self-propelled ring polling" 



This reverts commit 7fdbc5f0.

This patch dealt with a subset of the real problem, which is a potential
circular dependency on the wakup path for io_uring itself. Outside of
io_uring, eventfd can also trigger this (see details in 03e02acd)
and so can epoll (see details in caf1aeaf). Now that we have a
generic solution to this problem, get rid of the io_uring specific
work-around.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 44648532

io_uring/poll.c

+0 −2
Original line number Diff line number Diff line
@@ -246,8 +246,6 @@ static int io_poll_check_events(struct io_kiocb *req, bool *locked) 
			continue;

		if (req->apoll_events & EPOLLONESHOT)

			return IOU_POLL_DONE;

		if (io_is_uring_fops(req->file))

			return IOU_POLL_DONE;



		/* multishot, just fill a CQE and proceed */

		if (!(req->flags & REQ_F_APOLL_MULTISHOT)) {