Commit d4e097da authored by Dylan Yudaken's avatar Dylan Yudaken Committed by Jens Axboe
Browse files

io_uring: recycle buffers on error 



Rather than passing an error back to the user with a buffer attached,
recycle the buffer immediately.

Signed-off-by: default avatarDylan Yudaken <dylany@fb.com>
Link: https://lore.kernel.org/r/20220630091231.1456789-5-dylany@fb.com


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

io_uring/net.c

+8 −2
Original line number Diff line number Diff line
@@ -481,10 +481,13 @@ int io_recvmsg(struct io_kiocb *req, unsigned int issue_flags) 
	if (kmsg->free_iov)

		kfree(kmsg->free_iov);

	req->flags &= ~REQ_F_NEED_CLEANUP;

	if (ret >= 0)

	if (ret > 0)

		ret += sr->done_io;

	else if (sr->done_io)

		ret = sr->done_io;

	else

		io_kbuf_recycle(req, issue_flags);



	cflags = io_put_kbuf(req, issue_flags);

	if (kmsg->msg.msg_inq)

		cflags |= IORING_CQE_F_SOCK_NONEMPTY;
@@ -557,10 +560,13 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags) 
		req_set_fail(req);

	}



	if (ret >= 0)

	if (ret > 0)

		ret += sr->done_io;

	else if (sr->done_io)

		ret = sr->done_io;

	else

		io_kbuf_recycle(req, issue_flags);



	cflags = io_put_kbuf(req, issue_flags);

	if (msg.msg_inq)

		cflags |= IORING_CQE_F_SOCK_NONEMPTY;