Commit a20b8631 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring/net: open code io_sendmsg_copy_hdr() 



io_sendmsg_setup() is trivial and io_sendmsg_copy_hdr() doesn't add
any good abstraction, open code one into another.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/565318ce585665e88053663eeee5178d2c15692f.1743202294.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 00cfc05c

io_uring/net.c

+10 −20
Original line number Diff line number Diff line
@@ -325,25 +325,6 @@ static int io_msg_copy_hdr(struct io_kiocb *req, struct io_async_msghdr *iomsg, 
	return 0;

}



static int io_sendmsg_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 user_msghdr msg;

	int ret;



	ret = io_msg_copy_hdr(req, iomsg, &msg, ITER_SOURCE, NULL);

	if (unlikely(ret))

		return ret;



	if (!(req->flags & REQ_F_BUFFER_SELECT))

		ret = io_net_import_vec(req, iomsg, msg.msg_iov, msg.msg_iovlen,

					ITER_SOURCE);

	/* save msg_control as sys_sendmsg() overwrites it */

	sr->msg_control = iomsg->msg.msg_control_user;

	return ret;

}



void io_sendmsg_recvmsg_cleanup(struct io_kiocb *req)

{

	struct io_async_msghdr *io = req->async_data;
@@ -392,10 +373,19 @@ static int io_sendmsg_setup(struct io_kiocb *req, const struct io_uring_sqe *sqe 
{

	struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg);

	struct io_async_msghdr *kmsg = req->async_data;

	struct user_msghdr msg;

	int ret;



	sr->umsg = u64_to_user_ptr(READ_ONCE(sqe->addr));

	ret = io_msg_copy_hdr(req, kmsg, &msg, ITER_SOURCE, NULL);

	if (unlikely(ret))

		return ret;

	/* save msg_control as sys_sendmsg() overwrites it */

	sr->msg_control = kmsg->msg.msg_control_user;



	return io_sendmsg_copy_hdr(req, kmsg);

	if (req->flags & REQ_F_BUFFER_SELECT)

		return 0;

	return io_net_import_vec(req, kmsg, msg.msg_iov, msg.msg_iovlen, ITER_SOURCE);

}



static int io_sendmsg_zc_setup(struct io_kiocb *req, const struct io_uring_sqe *sqe)