diff options
| author | Hao Xu <haoxu@linux.alibaba.com> | 2021-09-22 18:12:37 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-30 10:13:03 +0200 |
| commit | 24d38dcce407cc6c2e76efd127a27db89cf26203 (patch) | |
| tree | 78ee03f6e5ef7e082444a990029379f83932b0fb /fs | |
| parent | 4e81f12cc00ccf63ed6b1d7a993d6befe65a1783 (diff) | |
io_uring: fix missing set of EPOLLONESHOT for CQ ring overflow
[ Upstream commit a62682f92eedb41c1cd8290fa875a4b85624fb9a ]
We should set EPOLLONESHOT if cqring_fill_event() returns false since
io_poll_add() decides to put req or not by it.
Fixes: 5082620fb2ca ("io_uring: terminate multishot poll for CQ ring overflow")
Signed-off-by: Hao Xu <haoxu@linux.alibaba.com>
Link: https://lore.kernel.org/r/20210922101238.7177-3-haoxu@linux.alibaba.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 27a1c813f1e1..739e58ccc982 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -4968,8 +4968,10 @@ static bool io_poll_complete(struct io_kiocb *req, __poll_t mask) } if (req->poll.events & EPOLLONESHOT) flags = 0; - if (!io_cqring_fill_event(ctx, req->user_data, error, flags)) + if (!io_cqring_fill_event(ctx, req->user_data, error, flags)) { + req->poll.events |= EPOLLONESHOT; flags = 0; + } if (flags & IORING_CQE_F_MORE) ctx->cq_extra++; |