Skip to content

Commit

Permalink
Revert "io_uring: disallow self-propelled ring polling"
Browse files Browse the repository at this point in the history
This reverts commit 7fdbc5f.

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 03e02ac)
and so can epoll (see details in caf1aea). Now that we have a
generic solution to this problem, get rid of the io_uring specific
work-around.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
axboe committed Nov 22, 2022
1 parent 4464853 commit 4061f0e
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions io_uring/poll.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down

0 comments on commit 4061f0e

Please sign in to comment.