superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
pull/1250/head
Pavel Begunkov 2025-03-31 17:17:59 +01:00 committed by Jens Axboe
parent 9fe99eed91
commit e9ff9ae103
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
io_uring/net.c
View File

@ -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) if (sr->flags & IORING_RECVSEND_FIXED_BUF)
return 0; return 0;
if (!io_do_buffer_select(req)) { if (req->flags & REQ_F_BUFFER_SELECT)
ret = import_ubuf(ITER_SOURCE, sr->buf, sr->len, return 0;
&kmsg->msg.msg_iter); return import_ubuf(ITER_SOURCE, sr->buf, sr->len, &kmsg->msg.msg_iter);
if (unlikely(ret < 0))
return ret;
}
return 0;
} }
static int io_sendmsg_setup(struct io_kiocb *req, const struct io_uring_sqe *sqe) 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_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg);
struct io_async_msghdr *kmsg; struct io_async_msghdr *kmsg;
int ret;
kmsg = io_msg_alloc_async(req); kmsg = io_msg_alloc_async(req);
if (unlikely(!kmsg)) 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_iocb = NULL;
kmsg->msg.msg_ubuf = NULL; kmsg->msg.msg_ubuf = NULL;
if (!io_do_buffer_select(req)) { if (req->flags & REQ_F_BUFFER_SELECT)
ret = import_ubuf(ITER_DEST, sr->buf, sr->len, return 0;
&kmsg->msg.msg_iter); return import_ubuf(ITER_DEST, sr->buf, sr->len,
if (unlikely(ret)) &kmsg->msg.msg_iter);
return ret;
}
return 0;
} }
return io_recvmsg_copy_hdr(req, kmsg); return io_recvmsg_copy_hdr(req, kmsg);