public inbox for io-uring@vger.kernel.org
 help / color / mirror / Atom feed
From: Pavel Begunkov <asml.silence@gmail.com>
To: io-uring@vger.kernel.org
Cc: asml.silence@gmail.com
Subject: [PATCH 5/7] io_uring: don't free never created regions
Date: Thu, 16 Oct 2025 14:23:21 +0100	[thread overview]
Message-ID: <a0af76f781736bf6ea07f6eeaf637b9913727482.1760620698.git.asml.silence@gmail.com> (raw)
In-Reply-To: <cover.1760620698.git.asml.silence@gmail.com>

io_free_region() tolerates empty regions but there is no reason to that
either. If the first io_create_region() in io_register_resize_rings()
fails, just return the error without attempting to clean it up.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
 io_uring/register.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/io_uring/register.c b/io_uring/register.c
index f7f71f035b0d..b11550ed940c 100644
--- a/io_uring/register.c
+++ b/io_uring/register.c
@@ -432,10 +432,9 @@ static int io_register_resize_rings(struct io_ring_ctx *ctx, void __user *arg)
 		rd.flags |= IORING_MEM_REGION_TYPE_USER;
 	}
 	ret = io_create_region(ctx, &n.ring_region, &rd, IORING_OFF_CQ_RING);
-	if (ret) {
-		io_register_free_rings(ctx, &n);
+	if (ret)
 		return ret;
-	}
+
 	n.rings = io_region_get_ptr(&n.ring_region);
 
 	/*
-- 
2.49.0


  parent reply	other threads:[~2025-10-16 13:22 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-16 13:23 [PATCH 0/7] random region / rings cleanups Pavel Begunkov
2025-10-16 13:23 ` [PATCH 1/7] io_uring: deduplicate array_size in io_allocate_scq_urings Pavel Begunkov
2025-10-16 13:23 ` [PATCH 2/7] io_uring: sanity check sizes before attempting allocation Pavel Begunkov
2025-10-16 13:23 ` [PATCH 3/7] io_uring: use no mmap safe region helpers on resizing Pavel Begunkov
2025-10-16 13:23 ` [PATCH 4/7] io_uring: remove extra args from io_register_free_rings Pavel Begunkov
2025-10-16 13:23 ` Pavel Begunkov [this message]
2025-10-16 13:23 ` [PATCH 6/7] io_uring/kbuf: use io_create_region for kbuf creation Pavel Begunkov
2025-10-16 13:23 ` [PATCH 7/7] io_uring: only publish fully handled mem region Pavel Begunkov
2025-10-17 21:01 ` [PATCH 0/7] random region / rings cleanups Gabriel Krisman Bertazi
2025-10-20 16:38 ` Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a0af76f781736bf6ea07f6eeaf637b9913727482.1760620698.git.asml.silence@gmail.com \
    --to=asml.silence@gmail.com \
    --cc=io-uring@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox