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

io_uring: allow to pass addr into sendzc 



Allow to specify an address to zerocopy sends making it more like
sendto(2).

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


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

include/uapi/linux/io_uring.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ struct io_uring_sqe { 
		__u32	file_index;

		struct {

			__u16	notification_idx;

			__u16	__pad;

			__u16	addr_len;

		};

	};

	union {

io_uring/net.c

+16 −2
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ struct io_sendzc { 
	u16				slot_idx;

	unsigned			msg_flags;

	unsigned			flags;

	unsigned			addr_len;

	void __user			*addr;

};



#define IO_APOLL_MULTI_POLLED (REQ_F_APOLL_MULTISHOT | REQ_F_POLLED)
@@ -848,8 +850,7 @@ int io_sendzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
{

	struct io_sendzc *zc = io_kiocb_to_cmd(req);



	if (READ_ONCE(sqe->addr2) || READ_ONCE(sqe->__pad2[0]) ||

	    READ_ONCE(sqe->addr3))

	if (READ_ONCE(sqe->__pad2[0]) || READ_ONCE(sqe->addr3))

		return -EINVAL;



	zc->flags = READ_ONCE(sqe->ioprio);
@@ -862,6 +863,10 @@ int io_sendzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
	zc->slot_idx = READ_ONCE(sqe->notification_idx);

	if (zc->msg_flags & MSG_DONTWAIT)

		req->flags |= REQ_F_NOWAIT;



	zc->addr = u64_to_user_ptr(READ_ONCE(sqe->addr2));

	zc->addr_len = READ_ONCE(sqe->addr_len);



#ifdef CONFIG_COMPAT

	if (req->ctx->compat)

		zc->msg_flags |= MSG_CMSG_COMPAT;
@@ -871,6 +876,7 @@ int io_sendzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 


int io_sendzc(struct io_kiocb *req, unsigned int issue_flags)

{

	struct sockaddr_storage address;

	struct io_ring_ctx *ctx = req->ctx;

	struct io_sendzc *zc = io_kiocb_to_cmd(req);

	struct io_notif_slot *notif_slot;
@@ -908,6 +914,14 @@ int io_sendzc(struct io_kiocb *req, unsigned int issue_flags) 
		return ret;

	mm_account_pinned_pages(&notif->uarg.mmp, zc->len);



	if (zc->addr) {

		ret = move_addr_to_kernel(zc->addr, zc->addr_len, &address);

		if (unlikely(ret < 0))

			return ret;

		msg.msg_name = (struct sockaddr *)&address;

		msg.msg_namelen = zc->addr_len;

	}



	msg_flags = zc->msg_flags | MSG_ZEROCOPY;

	if (issue_flags & IO_URING_F_NONBLOCK)

		msg_flags |= MSG_DONTWAIT;