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

io_uring/net: don't use io_do_buffer_select at prep 



Prep code is interested whether it's a selected buffer request, not
whether a buffer has already been selected like what
io_do_buffer_select() returns. Check for REQ_F_BUFFER_SELECT directly.

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


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

io_uring/net.c

+7 −15
Original line number Diff line number Diff line
@@ -361,13 +361,9 @@ static int io_send_setup(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
	}

	if (sr->flags & IORING_RECVSEND_FIXED_BUF)

		return 0;

	if (!io_do_buffer_select(req)) {

		ret = import_ubuf(ITER_SOURCE, sr->buf, sr->len,

				  &kmsg->msg.msg_iter);

		if (unlikely(ret < 0))

			return ret;

	}

	if (req->flags & REQ_F_BUFFER_SELECT)

		return 0;

	return import_ubuf(ITER_SOURCE, sr->buf, sr->len, &kmsg->msg.msg_iter);

}



static int io_sendmsg_setup(struct io_kiocb *req, const struct io_uring_sqe *sqe)
@@ -723,7 +719,6 @@ static int io_recvmsg_prep_setup(struct io_kiocb *req) 
{

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

	struct io_async_msghdr *kmsg;

	int ret;



	kmsg = io_msg_alloc_async(req);

	if (unlikely(!kmsg))
@@ -739,13 +734,10 @@ static int io_recvmsg_prep_setup(struct io_kiocb *req) 
		kmsg->msg.msg_iocb = NULL;

		kmsg->msg.msg_ubuf = NULL;



		if (!io_do_buffer_select(req)) {

			ret = import_ubuf(ITER_DEST, sr->buf, sr->len,

					  &kmsg->msg.msg_iter);

			if (unlikely(ret))

				return ret;

		}

		if (req->flags & REQ_F_BUFFER_SELECT)

			return 0;

		return import_ubuf(ITER_DEST, sr->buf, sr->len,

				   &kmsg->msg.msg_iter);

	}



	return io_recvmsg_copy_hdr(req, kmsg);