summaryrefslogtreecommitdiff
path: root/io_uring/rsrc.c
diff options
context:
space:
mode:
authorPavel Begunkov <asml.silence@gmail.com>2023-04-18 16:06:37 +0300
committerJens Axboe <axboe@kernel.dk>2023-04-19 04:38:26 +0300
commit26147da37f3e52041d9deba189d39f27ce78a84f (patch)
tree34f7046ca88435e76a9a3cfaa552cd26229cc591 /io_uring/rsrc.c
parentc376644fb915fbdea8c4a04f859d032a8be352fd (diff)
downloadlinux-26147da37f3e52041d9deba189d39f27ce78a84f.tar.xz
io_uring/rsrc: add empty flag in rsrc_node
Unless a node was flushed by io_rsrc_ref_quiesce(), it'll carry a resource. Replace ->inline_items with an empty flag, which is initialised to false and only raised in io_rsrc_ref_quiesce(). Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://lore.kernel.org/r/75d384c9d2252e12af73b9cf8a44e1699106aeb1.1681822823.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring/rsrc.c')
-rw-r--r--io_uring/rsrc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index a54a222a20b8..127bd602131e 100644
--- a/io_uring/rsrc.c
+++ b/io_uring/rsrc.c
@@ -154,7 +154,7 @@ static void __io_rsrc_put_work(struct io_rsrc_node *ref_node)
{
struct io_rsrc_data *rsrc_data = ref_node->rsrc_data;
- if (likely(ref_node->inline_items))
+ if (likely(!ref_node->empty))
io_rsrc_put_work_one(rsrc_data, &ref_node->item);
io_rsrc_node_destroy(rsrc_data->ctx, ref_node);
@@ -199,7 +199,7 @@ struct io_rsrc_node *io_rsrc_node_alloc(struct io_ring_ctx *ctx)
}
ref_node->rsrc_data = NULL;
- ref_node->inline_items = 0;
+ ref_node->empty = 0;
ref_node->refs = 1;
return ref_node;
}
@@ -218,6 +218,7 @@ __cold static int io_rsrc_ref_quiesce(struct io_rsrc_data *data,
backup = io_rsrc_node_alloc(ctx);
if (!backup)
return -ENOMEM;
+ ctx->rsrc_node->empty = true;
ctx->rsrc_node->rsrc_data = data;
list_add_tail(&ctx->rsrc_node->node, &ctx->rsrc_ref_list);
io_put_rsrc_node(ctx, ctx->rsrc_node);
@@ -649,7 +650,6 @@ int io_queue_rsrc_removal(struct io_rsrc_data *data, unsigned idx, void *rsrc)
node->item.rsrc = rsrc;
node->item.tag = *tag_slot;
- node->inline_items = 1;
*tag_slot = 0;
node->rsrc_data = data;