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

io_uring/net: use io_sr_msg for sendzc 



Reuse struct io_sr_msg for zerocopy sends, which is handy. There is
only one zerocopy specific field, namely .notif, and we have enough
space for it.

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


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

io_uring/net.c

+5 −13
Original line number Diff line number Diff line
@@ -59,15 +59,7 @@ struct io_sr_msg { 
	unsigned			done_io;

	unsigned			msg_flags;

	u16				flags;

};



struct io_sendzc {

	struct file			*file;

	void __user			*buf;

	unsigned			len;

	unsigned			done_io;

	unsigned			msg_flags;

	u16				flags;

	/* used only for sendzc */

	u16				addr_len;

	void __user			*addr;

	struct io_kiocb 		*notif;
@@ -190,7 +182,7 @@ static int io_sendmsg_copy_hdr(struct io_kiocb *req, 


int io_sendzc_prep_async(struct io_kiocb *req)

{

	struct io_sendzc *zc = io_kiocb_to_cmd(req, struct io_sendzc);

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

	struct io_async_msghdr *io;

	int ret;
@@ -890,7 +882,7 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags) 


void io_sendzc_cleanup(struct io_kiocb *req)

{

	struct io_sendzc *zc = io_kiocb_to_cmd(req, struct io_sendzc);

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



	zc->notif->flags |= REQ_F_CQE_SKIP;

	io_notif_flush(zc->notif);
@@ -899,7 +891,7 @@ void io_sendzc_cleanup(struct io_kiocb *req) 


int io_sendzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

	struct io_sendzc *zc = io_kiocb_to_cmd(req, struct io_sendzc);

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

	struct io_ring_ctx *ctx = req->ctx;

	struct io_kiocb *notif;
@@ -1009,7 +1001,7 @@ static int io_sg_from_iter(struct sock *sk, struct sk_buff *skb, 
int io_sendzc(struct io_kiocb *req, unsigned int issue_flags)

{

	struct sockaddr_storage __address, *addr = NULL;

	struct io_sendzc *zc = io_kiocb_to_cmd(req, struct io_sendzc);

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

	struct msghdr msg;

	struct iovec iov;

	struct socket *sock;