From: "Clément Léger" <cleger@meta.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: "Clément Léger" <cleger@meta.com>,
io-uring@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] io_uring/net: Factor out receive buffer selection
Date: Mon, 16 Nov 2026 03:17:36 -0800 [thread overview]
Message-ID: <20261116111744.702159-2-cleger@meta.com> (raw)
In-Reply-To: <20261116111744.702159-1-cleger@meta.com>
In preparation of bundle support for recvmsg, split out the provided
buffer ring peek into io_recv_bundle_peek() and the existing recvmsg
buffer setup into io_recvmsg_buf_select(). No functional change
intended.
Signed-off-by: Clément Léger <cleger@meta.com>
---
io_uring/net.c | 110 ++++++++++++++++++++++++++++++++-----------------
1 file changed, 72 insertions(+), 38 deletions(-)
diff --git a/io_uring/net.c b/io_uring/net.c
index 533afd335627..2f106a1fc69d 100644
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -1039,6 +1039,68 @@ static int io_recvmsg_multishot(struct socket *sock, struct io_sr_msg *io,
kmsg->controllen + err;
}
+static int io_recv_bundle_peek(struct io_kiocb *req,
+ struct io_async_msghdr *kmsg,
+ struct io_br_sel *sel, struct buf_sel_arg *arg,
+ size_t max_len)
+{
+ struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg);
+ int nr_iovs;
+
+ *arg = (struct buf_sel_arg) {
+ .iovs = &kmsg->fast_iov,
+ .nr_iovs = 1,
+ .mode = KBUF_MODE_EXPAND,
+ .buf_group = sr->buf_group,
+ .max_len = max_len,
+ };
+
+ if (kmsg->vec.iovec) {
+ arg->nr_iovs = kmsg->vec.nr;
+ arg->iovs = kmsg->vec.iovec;
+ arg->mode |= KBUF_MODE_FREE;
+ }
+
+ nr_iovs = io_buffers_peek(req, arg, sel);
+ if (unlikely(nr_iovs < 0))
+ return nr_iovs;
+
+ if (arg->iovs != &kmsg->fast_iov && arg->iovs != kmsg->vec.iovec) {
+ kmsg->vec.nr = nr_iovs;
+ kmsg->vec.iovec = arg->iovs;
+ req->flags |= REQ_F_NEED_CLEANUP;
+ }
+ if (arg->partial_map)
+ sr->flags |= IORING_RECV_PARTIAL_MAP;
+ return nr_iovs;
+}
+
+static int io_recvmsg_buf_select(struct io_kiocb *req,
+ struct io_async_msghdr *kmsg,
+ struct io_br_sel *sel,
+ unsigned int issue_flags)
+{
+ struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg);
+ size_t len = sr->len;
+ int ret;
+
+ *sel = io_buffer_select(req, &len, sr->buf_group, issue_flags);
+ if (!sel->addr)
+ return -ENOBUFS;
+ len = min_t(size_t, len, MAX_RW_COUNT);
+
+ if (req->flags & REQ_F_APOLL_MULTISHOT) {
+ ret = io_recvmsg_prep_multishot(kmsg, sr, &sel->addr, &len);
+ if (ret) {
+ io_kbuf_recycle(req, sel->buf_list, issue_flags);
+ return ret;
+ }
+ }
+
+ iov_iter_ubuf(&kmsg->msg.msg_iter, ITER_DEST, sel->addr, len);
+ return 0;
+}
+
int io_recvmsg(struct io_kiocb *req, unsigned int issue_flags)
{
struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg);
@@ -1068,20 +1130,10 @@ int io_recvmsg(struct io_kiocb *req, unsigned int issue_flags)
sel.buf_list = NULL;
len = sr->len;
if (io_do_buffer_select(req)) {
- sel = io_buffer_select(req, &len, sr->buf_group, issue_flags);
- if (!sel.addr)
- return -ENOBUFS;
- len = min_t(size_t, len, MAX_RW_COUNT);
-
- if (req->flags & REQ_F_APOLL_MULTISHOT) {
- ret = io_recvmsg_prep_multishot(kmsg, sr, &sel.addr, &len);
- if (ret) {
- io_kbuf_recycle(req, sel.buf_list, issue_flags);
- return ret;
- }
- }
-
- iov_iter_ubuf(&kmsg->msg.msg_iter, ITER_DEST, sel.addr, len);
+ ret = io_recvmsg_buf_select(req, kmsg, &sel, issue_flags);
+ if (unlikely(ret < 0))
+ return ret;
+ len = iov_iter_count(&kmsg->msg.msg_iter);
}
kmsg->msg.msg_get_inq = 1;
@@ -1153,39 +1205,21 @@ static int io_recv_buf_select(struct io_kiocb *req, struct io_async_msghdr *kmsg
*/
if (!(issue_flags & IO_URING_F_UNLOCKED) &&
sr->flags & IORING_RECVSEND_BUNDLE) {
- struct buf_sel_arg arg = {
- .iovs = &kmsg->fast_iov,
- .nr_iovs = 1,
- .mode = KBUF_MODE_EXPAND,
- .buf_group = sr->buf_group,
- };
-
- if (kmsg->vec.iovec) {
- arg.nr_iovs = kmsg->vec.nr;
- arg.iovs = kmsg->vec.iovec;
- arg.mode |= KBUF_MODE_FREE;
- }
+ struct buf_sel_arg arg;
+ size_t max_len = 0;
if (sel->val)
- arg.max_len = sel->val;
+ max_len = sel->val;
else if (kmsg->msg.msg_inq > 1)
- arg.max_len = kmsg->msg.msg_inq;
+ max_len = kmsg->msg.msg_inq;
/* if mshot limited, ensure we don't go over */
if (sr->flags & IORING_RECV_MSHOT_LIM)
- arg.max_len = min_not_zero(arg.max_len, sr->mshot_total_len);
- ret = io_buffers_peek(req, &arg, sel);
+ max_len = min_not_zero(max_len, sr->mshot_total_len);
+ ret = io_recv_bundle_peek(req, kmsg, sel, &arg, max_len);
if (unlikely(ret < 0))
return ret;
- if (arg.iovs != &kmsg->fast_iov && arg.iovs != kmsg->vec.iovec) {
- kmsg->vec.nr = ret;
- kmsg->vec.iovec = arg.iovs;
- req->flags |= REQ_F_NEED_CLEANUP;
- }
- if (arg.partial_map)
- sr->flags |= IORING_RECV_PARTIAL_MAP;
-
/* special case 1 vec, can be a fast path */
if (ret == 1) {
sr->buf = arg.iovs[0].iov_base;
--
2.53.1-Meta
next prev parent reply other threads:[~2026-11-16 11:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 11:17 [PATCH 0/2] io_uring/net: Add bundle support for multishot recvmsg Clément Léger
2026-11-16 11:17 ` Clément Léger [this message]
2026-11-16 11:17 ` [PATCH 2/2] " Clément Léger
2026-11-17 2:45 ` Jens Axboe
2026-11-17 12:06 ` Clément Léger
2026-11-17 12:26 ` Jens Axboe
2026-11-17 13:20 ` Clément Léger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261116111744.702159-2-cleger@meta.com \
--to=cleger@meta.com \
--cc=axboe@kernel.dk \
--cc=io-uring@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.