hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

io_uring/rw: commit provided buffer state on async

Browse Source 
When we get -EIOCBQUEUED, we need to ensure that the buffer is consumed
from the provided buffer ring, which can be done with io_kbuf_recycle()
+ REQ_F_PARTIAL_IO.

Reported-by: Muhammad Ramdhan <ramdhan@starlabs.sg>
Reported-by: Bing-Jhong Billy Jheng <billy@starlabs.sg>
Reported-by: Jacob Soo <jacob.soo@starlabs.sg>
Fixes: c7fb19428d ("io_uring: add support for ring mapped supplied buffers")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Pavel Begunkov 2025-02-10 17:27:56 +00:00 committed by Greg Kroah-Hartman
parent a1b17713b3
commit 58d38d3245
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
io_uring/rw.c
View File

@ -772,6 +772,8 @@ static int __io_read(struct io_kiocb *req, unsigned int issue_flags)
goto done; goto done;
ret = 0; ret = 0;
} else if (ret == -EIOCBQUEUED) { } else if (ret == -EIOCBQUEUED) {
req->flags |= REQ_F_PARTIAL_IO;
io_kbuf_recycle(req, issue_flags);
if (iovec) if (iovec)
kfree(iovec); kfree(iovec);
return IOU_ISSUE_SKIP_COMPLETE; return IOU_ISSUE_SKIP_COMPLETE;
@ -795,6 +797,9 @@ static int __io_read(struct io_kiocb *req, unsigned int issue_flags)
goto done; goto done;
} }
req->flags |= REQ_F_PARTIAL_IO;
io_kbuf_recycle(req, issue_flags);
io = req->async_data; io = req->async_data;
s = &io->s; s = &io->s;
/* /*
@ -935,6 +940,11 @@ int io_write(struct io_kiocb *req, unsigned int issue_flags)
else else
ret2 = -EINVAL; ret2 = -EINVAL;
if (ret2 == -EIOCBQUEUED) {
req->flags |= REQ_F_PARTIAL_IO;
io_kbuf_recycle(req, issue_flags);
}
if (req->flags & REQ_F_REISSUE) { if (req->flags & REQ_F_REISSUE) {
req->flags &= ~REQ_F_REISSUE; req->flags &= ~REQ_F_REISSUE;
ret2 = -EAGAIN; ret2 = -EAGAIN;