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

io_uring/net: extract iovec import into a helper 

Deduplicate iovec imports between compat and !compat by introducing a
helper function.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/6a5f8c526f6732c4249a7fa0213b49e1a3ecccf0.1740569495.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
pull/1188/head
Pavel Begunkov 2025-02-26 11:41:21 +00:00 committed by Jens Axboe
parent 51e158d405
commit 5ee6e3ea31
1 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
io_uring/net.c
View File

@ -192,6 +192,29 @@ static inline void io_mshot_prep_retry(struct io_kiocb *req,
req->buf_index = sr->buf_group; req->buf_index = sr->buf_group;
} }
static int io_net_import_vec(struct io_kiocb *req, struct io_async_msghdr *iomsg,
const struct iovec __user *uiov, unsigned uvec_seg,
int ddir)
{
struct iovec *iov;
int ret, nr_segs;
if (iomsg->free_iov) {
nr_segs = iomsg->free_iov_nr;
iov = iomsg->free_iov;
} else {
nr_segs = 1;
iov = &iomsg->fast_iov;
}
ret = __import_iovec(ddir, uiov, uvec_seg, nr_segs, &iov,
&iomsg->msg.msg_iter, io_is_compat(req->ctx));
if (unlikely(ret < 0))
return ret;
io_net_vec_assign(req, iomsg, iov);
return 0;
}
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
static int io_compat_msg_copy_hdr(struct io_kiocb *req, static int io_compat_msg_copy_hdr(struct io_kiocb *req,
struct io_async_msghdr *iomsg, struct io_async_msghdr *iomsg,
@ -200,8 +223,7 @@ static int io_compat_msg_copy_hdr(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 compat_iovec __user *uiov; struct compat_iovec __user *uiov;
struct iovec *iov; int ret;
int ret, nr_segs;
if (copy_from_user(msg, sr->umsg_compat, sizeof(*msg))) if (copy_from_user(msg, sr->umsg_compat, sizeof(*msg)))
return -EFAULT; return -EFAULT;
@ -227,21 +249,8 @@ static int io_compat_msg_copy_hdr(struct io_kiocb *req,
return 0; return 0;
} }
if (iomsg->free_iov) { return io_net_import_vec(req, iomsg, (struct iovec __user *)uiov,
nr_segs = iomsg->free_iov_nr; msg->msg_iovlen, ddir);
iov = iomsg->free_iov;
} else {
iov = &iomsg->fast_iov;
nr_segs = 1;
}
ret = __import_iovec(ddir, (struct iovec __user *)uiov, msg->msg_iovlen,
nr_segs, &iov, &iomsg->msg.msg_iter, true);
if (unlikely(ret < 0))
return ret;
io_net_vec_assign(req, iomsg, iov);
return 0;
} }
#endif #endif
@ -269,8 +278,7 @@ static int io_msg_copy_hdr(struct io_kiocb *req, struct io_async_msghdr *iomsg,
{ {
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 user_msghdr __user *umsg = sr->umsg; struct user_msghdr __user *umsg = sr->umsg;
struct iovec *iov; int ret;
int ret, nr_segs;
ret = io_copy_msghdr_from_user(msg, umsg); ret = io_copy_msghdr_from_user(msg, umsg);
if (unlikely(ret)) if (unlikely(ret))
@ -298,21 +306,7 @@ static int io_msg_copy_hdr(struct io_kiocb *req, struct io_async_msghdr *iomsg,
return 0; return 0;
} }
if (iomsg->free_iov) { return io_net_import_vec(req, iomsg, msg->msg_iov, msg->msg_iovlen, ddir);
nr_segs = iomsg->free_iov_nr;
iov = iomsg->free_iov;
} else {
iov = &iomsg->fast_iov;
nr_segs = 1;
}
ret = __import_iovec(ddir, msg->msg_iov, msg->msg_iovlen, nr_segs,
&iov, &iomsg->msg.msg_iter, false);
if (unlikely(ret < 0))
return ret;
io_net_vec_assign(req, iomsg, iov);
return 0;
} }
static int io_sendmsg_copy_hdr(struct io_kiocb *req, static int io_sendmsg_copy_hdr(struct io_kiocb *req,