Skip to content

Commit 26147da

Browse files
isilenceaxboe
authored andcommitted
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>
1 parent c376644 commit 26147da

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

io_uring/rsrc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ static void __io_rsrc_put_work(struct io_rsrc_node *ref_node)
154154
{
155155
struct io_rsrc_data *rsrc_data = ref_node->rsrc_data;
156156

157-
if (likely(ref_node->inline_items))
157+
if (likely(!ref_node->empty))
158158
io_rsrc_put_work_one(rsrc_data, &ref_node->item);
159159

160160
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)
199199
}
200200

201201
ref_node->rsrc_data = NULL;
202-
ref_node->inline_items = 0;
202+
ref_node->empty = 0;
203203
ref_node->refs = 1;
204204
return ref_node;
205205
}
@@ -218,6 +218,7 @@ __cold static int io_rsrc_ref_quiesce(struct io_rsrc_data *data,
218218
backup = io_rsrc_node_alloc(ctx);
219219
if (!backup)
220220
return -ENOMEM;
221+
ctx->rsrc_node->empty = true;
221222
ctx->rsrc_node->rsrc_data = data;
222223
list_add_tail(&ctx->rsrc_node->node, &ctx->rsrc_ref_list);
223224
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)
649650

650651
node->item.rsrc = rsrc;
651652
node->item.tag = *tag_slot;
652-
node->inline_items = 1;
653653
*tag_slot = 0;
654654

655655
node->rsrc_data = data;

io_uring/rsrc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct io_rsrc_node {
4343
struct io_rsrc_data *rsrc_data;
4444
};
4545
int refs;
46-
int inline_items;
46+
bool empty;
4747
struct list_head node;
4848
struct io_rsrc_put item;
4949
};

0 commit comments

Comments
 (0)