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

io_uring/zcrx: elide passing msg flags 



zcrx sqe->msg_flags has never been defined and checked to be zero. It
doesn't need to be a MSG_* bitmask. Keep them undefined, don't mix
with MSG_DONTWAIT, and don't pass into io_zcrx_recv() as it's ignored
anyway.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a0169c3a

io_uring/net.c

+2 −5
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ enum sr_retry_flags { 


struct io_recvzc {

	struct file			*file;

	unsigned			msg_flags;

	u16				flags;

	u32				len;

	struct io_zcrx_ifq		*ifq;
@@ -1253,8 +1252,7 @@ int io_recvzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 


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

	zc->flags = READ_ONCE(sqe->ioprio);

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

	if (zc->msg_flags)

	if (READ_ONCE(sqe->msg_flags))

		return -EINVAL;

	if (zc->flags & ~(IORING_RECVSEND_POLL_FIRST | IORING_RECV_MULTISHOT))

		return -EINVAL;
@@ -1283,8 +1281,7 @@ int io_recvzc(struct io_kiocb *req, unsigned int issue_flags) 
		return -ENOTSOCK;



	len = zc->len;

	ret = io_zcrx_recv(req, zc->ifq, sock, zc->msg_flags | MSG_DONTWAIT,

			   issue_flags, &zc->len);

	ret = io_zcrx_recv(req, zc->ifq, sock, 0, issue_flags, &zc->len);

	if (len && zc->len == 0) {

		io_req_set_res(req, 0, 0);