Skip to content

Commit ac5f71a

Browse files
committed
io_uring/net: add provided buffer support for IORING_OP_SEND
It's pretty trivial to wire up provided buffer support for the send side, just like how it's done the receive side. This enables setting up a buffer ring that an application can use to push pending sends to, and then have a send pick a buffer from that ring. One of the challenges with async IO and networking sends is that you can get into reordering conditions if you have more than one inflight at the same time. Consider the following scenario where everything is fine: 1) App queues sendA for socket1 2) App queues sendB for socket1 3) App does io_uring_submit() 4) sendA is issued, completes successfully, posts CQE 5) sendB is issued, completes successfully, posts CQE All is fine. Requests are always issued in-order, and both complete inline as most sends do. However, if we're flooding socket1 with sends, the following could also result from the same sequence: 1) App queues sendA for socket1 2) App queues sendB for socket1 3) App does io_uring_submit() 4) sendA is issued, socket1 is full, poll is armed for retry 5) Space frees up in socket1, this triggers sendA retry via task_work 6) sendB is issued, completes successfully, posts CQE 7) sendA is retried, completes successfully, posts CQE Now we've sent sendB before sendA, which can make things unhappy. If both sendA and sendB had been using provided buffers, then it would look as follows instead: 1) App queues dataA for sendA, queues sendA for socket1 2) App queues dataB for sendB queues sendB for socket1 3) App does io_uring_submit() 4) sendA is issued, socket1 is full, poll is armed for retry 5) Space frees up in socket1, this triggers sendA retry via task_work 6) sendB is issued, picks first buffer (dataA), completes successfully, posts CQE (which says "I sent dataA") 7) sendA is retried, picks first buffer (dataB), completes successfully, posts CQE (which says "I sent dataB") Now we've sent the data in order, and everybody is happy. It's worth noting that this also opens the door for supporting multishot sends, as provided buffers would be a prerequisite for that. Those can trigger either when new buffers are added to the outgoing ring, or (if stalled due to lack of space) when space frees up in the socket. Signed-off-by: Jens Axboe <[email protected]>
1 parent 3e747de commit ac5f71a

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

io_uring/net.c

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -364,10 +364,12 @@ static int io_send_setup(struct io_kiocb *req)
364364
kmsg->msg.msg_name = &kmsg->addr;
365365
kmsg->msg.msg_namelen = sr->addr_len;
366366
}
367-
ret = import_ubuf(ITER_SOURCE, sr->buf, sr->len, &kmsg->msg.msg_iter);
368-
if (unlikely(ret < 0))
369-
return ret;
370-
367+
if (!io_do_buffer_select(req)) {
368+
ret = import_ubuf(ITER_SOURCE, sr->buf, sr->len,
369+
&kmsg->msg.msg_iter);
370+
if (unlikely(ret < 0))
371+
return ret;
372+
}
371373
return 0;
372374
}
373375

@@ -480,6 +482,7 @@ int io_send(struct io_kiocb *req, unsigned int issue_flags)
480482
struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg);
481483
struct io_async_msghdr *kmsg = req->async_data;
482484
struct socket *sock;
485+
unsigned int cflags;
483486
unsigned flags;
484487
int min_ret = 0;
485488
int ret;
@@ -492,6 +495,17 @@ int io_send(struct io_kiocb *req, unsigned int issue_flags)
492495
(sr->flags & IORING_RECVSEND_POLL_FIRST))
493496
return -EAGAIN;
494497

498+
if (io_do_buffer_select(req)) {
499+
size_t len = sr->len;
500+
void __user *buf;
501+
502+
buf = io_buffer_select(req, &len, issue_flags);
503+
if (unlikely(!buf))
504+
return -ENOBUFS;
505+
sr->buf = buf;
506+
sr->len = len;
507+
}
508+
495509
flags = sr->msg_flags;
496510
if (issue_flags & IO_URING_F_NONBLOCK)
497511
flags |= MSG_DONTWAIT;
@@ -521,7 +535,8 @@ int io_send(struct io_kiocb *req, unsigned int issue_flags)
521535
else if (sr->done_io)
522536
ret = sr->done_io;
523537
io_req_msg_cleanup(req, issue_flags);
524-
io_req_set_res(req, ret, 0);
538+
cflags = io_put_kbuf(req, issue_flags);
539+
io_req_set_res(req, ret, cflags);
525540
return IOU_OK;
526541
}
527542

io_uring/opdef.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ const struct io_issue_def io_issue_defs[] = {
281281
.pollout = 1,
282282
.audit_skip = 1,
283283
.ioprio = 1,
284+
.buffer_select = 1,
284285
#if defined(CONFIG_NET)
285286
.async_size = sizeof(struct io_async_msghdr),
286287
.prep = io_sendmsg_prep,

0 commit comments

Comments
 (0)