diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2023-04-18 14:06:37 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-04-18 19:38:26 -0600 |
| commit | 26147da37f3e52041d9deba189d39f27ce78a84f (patch) | |
| tree | 34f7046ca88435e76a9a3cfaa552cd26229cc591 /io_uring | |
| parent | c376644fb915fbdea8c4a04f859d032a8be352fd (diff) | |
| download | linux-stable-26147da37f3e52041d9deba189d39f27ce78a84f.tar.gz linux-stable-26147da37f3e52041d9deba189d39f27ce78a84f.tar.bz2 linux-stable-26147da37f3e52041d9deba189d39f27ce78a84f.zip | |
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')
| -rw-r--r-- | io_uring/rsrc.c | 6 | ||||
| -rw-r--r-- | io_uring/rsrc.h | 2 |
2 files changed, 4 insertions, 4 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; diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h index bad7103f5033..f3fe455c6c71 100644 --- a/io_uring/rsrc.h +++ b/io_uring/rsrc.h @@ -43,7 +43,7 @@ struct io_rsrc_node { struct io_rsrc_data *rsrc_data; }; int refs; - int inline_items; + bool empty; struct list_head node; struct io_rsrc_put item; }; |