| Message ID | 1bfc9990fe435f1fc6152ca9efeba5eb3e68339c.1738025570.git.asml.silence@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/1] io_uring: fix multishots with selected buffers | expand |
On Tue, 28 Jan 2025 00:55:24 +0000, Pavel Begunkov wrote: > We do io_kbuf_recycle() when arming a poll but every iteration of a > multishot can grab more buffers, which is why we need to flush the kbuf > ring state before continuing with waiting. > > Applied, thanks! [1/1] io_uring: fix multishots with selected buffers commit: d63b0e8a628e62ca85a0f7915230186bb92f8bb4 Best regards,
diff --git a/io_uring/poll.c b/io_uring/poll.c index cc01c40b43d31..f12a857bb8555 100644 --- a/io_uring/poll.c +++ b/io_uring/poll.c @@ -315,8 +315,10 @@ void io_poll_task_func(struct io_kiocb *req, struct io_tw_state *ts) ret = io_poll_check_events(req, ts); if (ret == IOU_POLL_NO_ACTION) { + io_kbuf_recycle(req, 0); return; } else if (ret == IOU_POLL_REQUEUE) { + io_kbuf_recycle(req, 0); __io_poll_execute(req, 0); return; }
We do io_kbuf_recycle() when arming a poll but every iteration of a multishot can grab more buffers, which is why we need to flush the kbuf ring state before continuing with waiting. Cc: stable@vger.kernel.org Fixes: b3fdea6ecb55c ("io_uring: multishot recv") Reported-by: Muhammad Ramdhan <ramdhan@starlabs.sg> Reported-by: Bing-Jhong Billy Jheng <billy@starlabs.sg> Reported-by: Jacob Soo <jacob.soo@starlabs.sg> Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> --- io_uring/poll.c | 2 ++ 1 file changed, 2 insertions(+)