| From 2c762be5b798c443612c1bb9b011de4fdaebd1c5 Mon Sep 17 00:00:00 2001 |
| From: Olivier Langlois <olivier@trillion01.com> |
| Date: Mon, 29 Jul 2024 19:03:33 -0400 |
| Subject: io_uring: keep multishot request NAPI timeout current |
| |
| From: Olivier Langlois <olivier@trillion01.com> |
| |
| commit 2c762be5b798c443612c1bb9b011de4fdaebd1c5 upstream. |
| |
| This refresh statement was originally present in the original patch: |
| https://lore.kernel.org/netdev/20221121191437.996297-2-shr@devkernel.io/ |
| |
| It has been removed with no explanation in v6: |
| https://lore.kernel.org/netdev/20230201222254.744422-2-shr@devkernel.io/ |
| |
| It is important to make the refresh for multishot requests, because if no |
| new requests using the same NAPI device are added to the ring, the entry |
| will become stale and be removed silently. The unsuspecting user will |
| not know that their ring had busy polling for only 60 seconds before |
| being pruned. |
| |
| Signed-off-by: Olivier Langlois <olivier@trillion01.com> |
| Reviewed-by: Pavel Begunkov <asml.silence@gmail.com> |
| Fixes: 8d0c12a80cdeb ("io-uring: add napi busy poll support") |
| Cc: stable@vger.kernel.org |
| Link: https://lore.kernel.org/r/0fe61a019ec61e5708cd117cb42ed0dab95e1617.1722294646.git.olivier@trillion01.com |
| Signed-off-by: Jens Axboe <axboe@kernel.dk> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| io_uring/poll.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/io_uring/poll.c b/io_uring/poll.c |
| index 0a8e02944689..1f63b60e85e7 100644 |
| --- a/io_uring/poll.c |
| +++ b/io_uring/poll.c |
| @@ -347,6 +347,7 @@ static int io_poll_check_events(struct io_kiocb *req, struct io_tw_state *ts) |
| v &= IO_POLL_REF_MASK; |
| } while (atomic_sub_return(v, &req->poll_refs) & IO_POLL_REF_MASK); |
| |
| + io_napi_add(req); |
| return IOU_POLL_NO_ACTION; |
| } |
| |
| -- |
| 2.46.0 |
| |
