Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Dylan Yudaken <dylany@fb.com>
To:     Jens Axboe <axboe@kernel.dk>,
        Pavel Begunkov <asml.silence@gmail.com>,
        <io-uring@vger.kernel.org>
CC:     <Kernel-team@fb.com>, <linux-kernel@vger.kernel.org>,
        Dylan Yudaken <dylany@fb.com>
Subject: [PATCH v2 for-next 04/12] io_uring: recycle buffers on error
Date:   Thu, 30 Jun 2022 02:12:23 -0700
Message-ID: <20220630091231.1456789-5-dylany@fb.com>
In-Reply-To: <20220630091231.1456789-1-dylany@fb.com>
References: <20220630091231.1456789-1-dylany@fb.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain
Precedence: bulk

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

Signed-off-by: Dylan Yudaken <dylany@fb.com>
---
 io_uring/net.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/io_uring/net.c b/io_uring/net.c
index 5e84f7ab92a3..0268c4603f5d 100644
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -481,10 +481,13 @@ int io_recvmsg(struct io_kiocb *req, unsigned int i=
ssue_flags)
 	if (kmsg->free_iov)
 		kfree(kmsg->free_iov);
 	req->flags &=3D ~REQ_F_NEED_CLEANUP;
-	if (ret >=3D 0)
+	if (ret > 0)
 		ret +=3D sr->done_io;
 	else if (sr->done_io)
 		ret =3D sr->done_io;
+	else
+		io_kbuf_recycle(req, issue_flags);
+
 	cflags =3D io_put_kbuf(req, issue_flags);
 	if (kmsg->msg.msg_inq)
 		cflags |=3D IORING_CQE_F_SOCK_NONEMPTY;
@@ -557,10 +560,13 @@ int io_recv(struct io_kiocb *req, unsigned int issu=
e_flags)
 		req_set_fail(req);
 	}
=20
-	if (ret >=3D 0)
+	if (ret > 0)
 		ret +=3D sr->done_io;
 	else if (sr->done_io)
 		ret =3D sr->done_io;
+	else
+		io_kbuf_recycle(req, issue_flags);
+
 	cflags =3D io_put_kbuf(req, issue_flags);
 	if (msg.msg_inq)
 		cflags |=3D IORING_CQE_F_SOCK_NONEMPTY;
--=20
2.30.2