io_uring: introduce io_cache_free() helper
PATCH 1/1 io_uring: introduce io_cache_free() helper
Add a helper function io_cache_free() that returns an allocation to a io_alloc_cache, falling back on kfree() if the io_alloc_cache is full. This is the inverse of io_cache_alloc(), which takes an allocation from an io_alloc_cache and falls back on kmalloc() if the cache is empty.
Convert 4 callers to use the helper.
--- io_uring/alloc_cache.h | 6 ++++++ io_uring/futex.c | 4 +--- io_uring/io_uring.c | 3 +-- io_uring/rsrc.c | 15 +++++---------- 4 files changed, 13 insertions(+), 15 deletions(-)
io_uring/alloc_cache.h +6 -0
@@ -66,6 +66,12 @@ static inline void *io_cache_alloc(struct io_alloc_cache *cache, gfp_t gfp)if (obj)return obj; return io_cache_alloc_new(cache, gfp); } +static inline void io_cache_free (struct io_alloc_cache *cache,void *obj) +{ +if (!io_alloc_cache_put (cache, obj)) +kfree (obj); +} +#endif
io_uring/futex.c +1 -3
@@ -51,16 +51,14 @@ static void __io_futex_complete(struct io_kiocb *req, io_tw_token_t tw)io_req_task_complete (req, tw); }static void io_futex_complete (struct io_kiocb *req,io_tw_token_t tw) { -struct io_futex_data *ifd = req->async_data;struct io_ring_ctx *ctx = req->ctx;io_tw_lock (ctx, tw); -if (!io_alloc_cache_put (&ctx->futex_cache, ifd)) -kfree (ifd); +io_cache_free (&ctx->futex_cache, req->async_data);__io_futex_complete (req, tw); }static void io_futexv_complete (struct io_kiocb *req,io_tw_token_t tw) {
io_uring/io_uring.c +1 -2
@@ -1420,12 +1420,11 @@ static void io_free_batch_list(struct io_ring_ctx *ctx,if ((req->flags &REQ_F_POLLED ) && req->apoll) {struct async_poll *apoll = req->apoll;if (apoll->double_poll)kfree (apoll->double_poll); -if (!io_alloc_cache_put (&ctx->apoll_cache, apoll)) -kfree (apoll); +io_cache_free (&ctx->apoll_cache, apoll); req->flags &= ~REQ_F_POLLED ; }if (req->flags &IO_REQ_LINK_FLAGS )io_queue_next (req);if (unlikely (req->flags &IO_REQ_CLEAN_FLAGS ))
io_uring/rsrc.c +5 -10
@@ -122,12 +122,13 @@ static struct io_mapped_ubuf *io_alloc_imu(struct io_ring_ctx *ctx, GFP_KERNEL); }static void io_free_imu (struct io_ring_ctx *ctx,struct io_mapped_ubuf *imu) { -if (imu->nr_bvecs >IO_CACHED_BVECS_SEGS || - !io_alloc_cache_put (&ctx->imu_cache, imu)) +if (imu->nr_bvecs <=IO_CACHED_BVECS_SEGS ) +io_cache_free (&ctx->imu_cache, imu); +else kvfree (imu); }static void io_buffer_unmap (struct io_ring_ctx *ctx,struct io_mapped_ubuf *imu) {
@@ -485,16 +486,10 @@ 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)) -kfree (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 );
@@ -508,11 +503,11 @@ void io_free_rsrc_node(struct io_ring_ctx *ctx, struct io_rsrc_node *node)default :WARN_ON_ONCE (1 );break ; } -io_free_node (ctx, node); +io_cache_free (&ctx->node_cache, node); }int io_sqe_files_unregister (struct io_ring_ctx *ctx) {if (!ctx->file_table.data.nr)
@@ -833,11 +828,11 @@ static struct io_rsrc_node *io_sqe_buffer_register(struct io_ring_ctx *ctx, } done:if (ret) {if (imu)io_free_imu (ctx, imu); -io_free_node (ctx, node); +io_cache_free (&ctx->node_cache, node); node =ERR_PTR (ret); }kvfree (pages);return node; }
Signature · 1 line
2.45.2
Quoted 8 lines · Caleb Sander Mateos
Add a helper function
io_cache_free()that returns an allocation to aio_alloc_cache, falling back onkfree()if theio_alloc_cacheis full. This is the inverse ofio_cache_alloc(), which takes an allocation from anio_alloc_cacheand falls back onkmalloc()if the cache is empty.Convert 4 callers to use the helper.
[...]
Applied, thanks!
[1/1] io_uring: introduce io_cache_free() helper
commit: 0d83b8a9f180436a84fbdeb575696b0c3ae0ac0c
Best regards,
Signature · 1 line
Jens Axboe