From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: Re: [PATCH 01/17] io_uring/net: switch io_send() and io_send_zc() to using io_async_msghdr
Date: Sat, 6 Apr 2024 21:58:17 +0100 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
On 3/20/24 22:55, Jens Axboe wrote:
> No functional changes in this patch, just in preparation for carrying
> more state then we have now, if necessary. While unifying some of this
> code, add a generic send setup prep handler that they can both use.
>
> This gets rid of some manual msghdr and sockaddr on the stack, and makes
> it look a bit more like the sendmsg/recvmsg variants. We can probably
> unify a bit more on top of this going forward.
>
> Signed-off-by: Jens Axboe <[email protected]>
> ---
> io_uring/net.c | 196 ++++++++++++++++++++++++-----------------------
> io_uring/opdef.c | 1 +
> 2 files changed, 103 insertions(+), 94 deletions(-)
>
> diff --git a/io_uring/net.c b/io_uring/net.c
> index ed798e185bbf..a16838c0c837 100644
> --- a/io_uring/net.c
> +++ b/io_uring/net.c
> @@ -322,36 +322,25 @@ static int io_sendmsg_copy_hdr(struct io_kiocb *req,
>
...
> -int io_send(struct io_kiocb *req, unsigned int issue_flags)
> +static struct io_async_msghdr *io_send_setup(struct io_kiocb *req,
> + struct io_async_msghdr *stack_msg,
> + unsigned int issue_flags)
> {
> - struct sockaddr_storage __address;
> struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg);
> - struct msghdr msg;
> - struct socket *sock;
> - unsigned flags;
> - int min_ret = 0;
> + struct io_async_msghdr *kmsg;
> int ret;
>
> - msg.msg_name = NULL;
> - msg.msg_control = NULL;
> - msg.msg_controllen = 0;
> - msg.msg_namelen = 0;
> - msg.msg_ubuf = NULL;
> -
> - if (sr->addr) {
> - if (req_has_async_data(req)) {
> - struct io_async_msghdr *io = req->async_data;
> -
> - msg.msg_name = &io->addr;
> - } else {
> - ret = move_addr_to_kernel(sr->addr, sr->addr_len, &__address);
> + if (req_has_async_data(req)) {
> + kmsg = req->async_data;
> + } else {
> + kmsg = stack_msg;
> + kmsg->free_iov = NULL;
> + kmsg->msg.msg_name = NULL;
> + kmsg->msg.msg_namelen = 0;
> + kmsg->msg.msg_control = NULL;
> + kmsg->msg.msg_controllen = 0;
> + kmsg->msg.msg_ubuf = NULL;
> +
> + if (sr->addr) {
> + ret = move_addr_to_kernel(sr->addr, sr->addr_len,
> + &kmsg->addr);
> if (unlikely(ret < 0))
> - return ret;
> - msg.msg_name = (struct sockaddr *)&__address;
> + return ERR_PTR(ret);
> + kmsg->msg.msg_name = &kmsg->addr;
> + kmsg->msg.msg_namelen = sr->addr_len;
> + }
> +
> + if (!io_do_buffer_select(req)) {
it seems, this chunk leaked from another series as well. fwiw,
it was moved in a later commit
"io_uring/net: get rid of ->prep_async() for send side"
> + ret = import_ubuf(ITER_SOURCE, sr->buf, sr->len,
> + &kmsg->msg.msg_iter);
> + if (unlikely(ret))
> + return ERR_PTR(ret);
> }
> - msg.msg_namelen = sr->addr_len;
> }
--
Pavel Begunkov
next prev parent reply other threads:[~2024-04-06 20:58 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-20 22:55 [PATCHSET v2 0/17] Improve async state handling Jens Axboe
2024-03-20 22:55 ` [PATCH 01/17] io_uring/net: switch io_send() and io_send_zc() to using io_async_msghdr Jens Axboe
2024-04-06 20:58 ` Pavel Begunkov [this message]
2024-04-07 21:47 ` Jens Axboe
2024-03-20 22:55 ` [PATCH 02/17] io_uring/net: switch io_recv() " Jens Axboe
2024-03-20 22:55 ` [PATCH 03/17] io_uring/net: unify cleanup handling Jens Axboe
2024-03-20 22:55 ` [PATCH 04/17] io_uring/net: always setup an io_async_msghdr Jens Axboe
2024-03-20 22:55 ` [PATCH 05/17] io_uring/net: get rid of ->prep_async() for receive side Jens Axboe
2024-03-20 22:55 ` [PATCH 06/17] io_uring/net: get rid of ->prep_async() for send side Jens Axboe
2024-03-20 22:55 ` [PATCH 07/17] io_uring: kill io_msg_alloc_async_prep() Jens Axboe
2024-03-20 22:55 ` [PATCH 08/17] io_uring/net: add iovec recycling Jens Axboe
2024-03-20 22:55 ` [PATCH 09/17] io_uring/net: drop 'kmsg' parameter from io_req_msg_cleanup() Jens Axboe
2024-03-20 22:55 ` [PATCH 10/17] io_uring/rw: always setup io_async_rw for read/write requests Jens Axboe
2024-03-25 12:03 ` Anuj gupta
2024-03-25 14:54 ` Jens Axboe
2024-03-20 22:55 ` [PATCH 11/17] io_uring: get rid of struct io_rw_state Jens Axboe
2024-03-20 22:55 ` [PATCH 12/17] io_uring/rw: add iovec recycling Jens Axboe
2024-03-20 22:55 ` [PATCH 13/17] io_uring/net: move connect to always using async data Jens Axboe
2024-03-20 22:55 ` [PATCH 14/17] io_uring/uring_cmd: switch to always allocating " Jens Axboe
2024-03-20 22:55 ` [PATCH 15/17] io_uring/uring_cmd: defer SQE copying until we need it Jens Axboe
2024-03-25 12:41 ` Anuj gupta
2024-03-25 14:55 ` Jens Axboe
2024-03-20 22:55 ` [PATCH 16/17] io_uring: drop ->prep_async() Jens Axboe
2024-04-06 20:54 ` Pavel Begunkov
2024-04-07 21:46 ` Jens Axboe
2024-03-20 22:55 ` [PATCH 17/17] io_uring/alloc_cache: switch to array based caching Jens Axboe
2024-03-21 15:59 ` Gabriel Krisman Bertazi
2024-03-21 16:38 ` Jens Axboe
2024-03-21 17:20 ` Gabriel Krisman Bertazi
2024-03-21 17:22 ` Jens Axboe
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 \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox