From: Caleb Sander Mateos <[email protected]>
To: Jens Axboe <[email protected]>, Pavel Begunkov <[email protected]>
Cc: Caleb Sander Mateos <[email protected]>,
[email protected], [email protected]
Subject: [PATCH 1/5] io_uring/rsrc: split out io_free_node() helper
Date: Fri, 28 Feb 2025 16:59:10 -0700 [thread overview]
Message-ID: <[email protected]> (raw)
Split the freeing of the io_rsrc_node from io_free_rsrc_node(), for use
with nodes that haven't been fully initialized.
Signed-off-by: Caleb Sander Mateos <[email protected]>
---
io_uring/rsrc.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index 45bfb37bca1e..d941256f0d8c 100644
--- a/io_uring/rsrc.c
+++ b/io_uring/rsrc.c
@@ -485,10 +485,16 @@ int io_files_update(struct io_kiocb *req, unsigned int issue_flags)
req_set_fail(req);
io_req_set_res(req, ret, 0);
return IOU_OK;
}
+static void io_free_node(struct io_ring_ctx *ctx, struct io_rsrc_node *node)
+{
+ if (!io_alloc_cache_put(&ctx->node_cache, node))
+ kvfree(node);
+}
+
void io_free_rsrc_node(struct io_ring_ctx *ctx, struct io_rsrc_node *node)
{
if (node->tag)
io_post_aux_cqe(ctx, node->tag, 0, 0);
@@ -504,12 +510,11 @@ void io_free_rsrc_node(struct io_ring_ctx *ctx, struct io_rsrc_node *node)
default:
WARN_ON_ONCE(1);
break;
}
- if (!io_alloc_cache_put(&ctx->node_cache, node))
- kvfree(node);
+ io_free_node(ctx, node);
}
int io_sqe_files_unregister(struct io_ring_ctx *ctx)
{
if (!ctx->file_table.data.nr)
--
2.45.2
next reply other threads:[~2025-02-28 23:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-28 23:59 Caleb Sander Mateos [this message]
2025-02-28 23:59 ` [PATCH 2/5] io_uring/rsrc: free io_rsrc_node using kfree() Caleb Sander Mateos
2025-02-28 23:59 ` [PATCH 3/5] io_uring/rsrc: call io_free_node() on io_sqe_buffer_register() failure Caleb Sander Mateos
2025-03-01 1:31 ` Pavel Begunkov
2025-03-01 2:23 ` Jens Axboe
2025-03-01 18:26 ` Caleb Sander Mateos
2025-02-28 23:59 ` [PATCH 4/5] io_uring/rsrc: avoid NULL node check " Caleb Sander Mateos
2025-02-28 23:59 ` [PATCH 5/5] io_uring/rsrc: skip NULL file/buffer checks in io_free_rsrc_node() Caleb Sander Mateos
2025-03-03 7:20 ` [PATCH 1/5] io_uring/rsrc: split out io_free_node() helper lizetao
2025-03-04 14:17 ` 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 \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/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