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: Dylan Yudaken <dylany@fb.com>
Link: https://lore.kernel.org/r/20220630091231.1456789-5-dylany@fb.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/net.c b/io_uring/net.c
index 06eaef9f97bec5cb72958b32fbede9e4203f5e0c..e4422dff07048a80515096b973379c600ec8b84c 100644 (file)
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -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 @@ out_free:
                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;