Commit 15ba5e51 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring/net: don't use io_net_kbuf_recyle() for non-provided cases 

A previous commit used io_net_kbuf_recyle() for any network helper that
did IO and needed partial retry. However, that's only needed if the
opcode does buffer selection, which isnt support for sendzc, sendmsg_zc,
or sendmsg. Just remove them - they don't do any harm, but it is a bit
confusing when reading the code.

Link: https://lore.kernel.org/r/20250821020750.598432-4-axboe@kernel.dk


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

io_uring/net.c

+3 −3
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags) 
			kmsg->msg.msg_controllen = 0;

			kmsg->msg.msg_control = NULL;

			sr->done_io += ret;

			return io_net_kbuf_recyle(req, kmsg, ret);

			return -EAGAIN;

		}

		if (ret == -ERESTARTSYS)

			ret = -EINTR;
@@ -1503,7 +1503,7 @@ int io_send_zc(struct io_kiocb *req, unsigned int issue_flags) 
			zc->len -= ret;

			zc->buf += ret;

			zc->done_io += ret;

			return io_net_kbuf_recyle(req, kmsg, ret);

			return -EAGAIN;

		}

		if (ret == -ERESTARTSYS)

			ret = -EINTR;
@@ -1573,7 +1573,7 @@ int io_sendmsg_zc(struct io_kiocb *req, unsigned int issue_flags) 


		if (ret > 0 && io_net_retry(sock, flags)) {

			sr->done_io += ret;

			return io_net_kbuf_recyle(req, kmsg, ret);

			return -EAGAIN;

		}

		if (ret == -ERESTARTSYS)

			ret = -EINTR;