diff options
| author |   Pavel Begunkov <asml.silence@gmail.com> | 2025-03-31 17:17:59 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2025-04-21 05:06:58 -0600 |
| commit | e9ff9ae103573c7393d80533214a567654987ed5 (patch) | |
| tree | edf3d06a2b04b0796a725aa0f50cd3cb67669f4d | |
| parent | io_uring/wq: avoid indirect do_work/free_work calls (diff) | |
| download | wireguard-linux-e9ff9ae103573c7393d80533214a567654987ed5.tar.xz wireguard-linux-e9ff9ae103573c7393d80533214a567654987ed5.zip | |
io_uring/net: don't use io_do_buffer_select at prep
Prep code is interested whether it's a selected buffer request, not
whether a buffer has already been selected like what
io_do_buffer_select() returns. Check for REQ_F_BUFFER_SELECT directly.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/4488a029ac698554bebf732263fe19d7734affa6.1743437358.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | io_uring/net.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index 24040bc3916a..b9a03aeda4bb 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -361,13 +361,9 @@ static int io_send_setup(struct io_kiocb *req, const struct io_uring_sqe *sqe) } if (sr->flags & IORING_RECVSEND_FIXED_BUF) return 0; - if (!io_do_buffer_select(req)) { - ret = import_ubuf(ITER_SOURCE, sr->buf, sr->len, - &kmsg->msg.msg_iter); - if (unlikely(ret < 0)) - return ret; - } - return 0; + if (req->flags & REQ_F_BUFFER_SELECT) + return 0; + return import_ubuf(ITER_SOURCE, sr->buf, sr->len, &kmsg->msg.msg_iter); } static int io_sendmsg_setup(struct io_kiocb *req, const struct io_uring_sqe *sqe) @@ -723,7 +719,6 @@ static int io_recvmsg_prep_setup(struct io_kiocb *req) { struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg); struct io_async_msghdr *kmsg; - int ret; kmsg = io_msg_alloc_async(req); if (unlikely(!kmsg)) @@ -739,13 +734,10 @@ static int io_recvmsg_prep_setup(struct io_kiocb *req) kmsg->msg.msg_iocb = NULL; kmsg->msg.msg_ubuf = NULL; - if (!io_do_buffer_select(req)) { - ret = import_ubuf(ITER_DEST, sr->buf, sr->len, - &kmsg->msg.msg_iter); - if (unlikely(ret)) - return ret; - } - return 0; + if (req->flags & REQ_F_BUFFER_SELECT) + return 0; + return import_ubuf(ITER_DEST, sr->buf, sr->len, + &kmsg->msg.msg_iter); } return io_recvmsg_copy_hdr(req, kmsg); |