Commit 9c189eee authored by Jens Axboe's avatar Jens Axboe

io_uring: add ring freeing helper

We do rings and sqes separately, move them into a helper that does both
the freeing and clearing of the memory.
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e27cef86
...@@ -2688,6 +2688,14 @@ static void io_mem_free(void *ptr) ...@@ -2688,6 +2688,14 @@ static void io_mem_free(void *ptr)
free_compound_page(page); free_compound_page(page);
} }
static void io_rings_free(struct io_ring_ctx *ctx)
{
io_mem_free(ctx->rings);
io_mem_free(ctx->sq_sqes);
ctx->rings = NULL;
ctx->sq_sqes = NULL;
}
static void *io_mem_alloc(size_t size) static void *io_mem_alloc(size_t size)
{ {
gfp_t gfp = GFP_KERNEL_ACCOUNT | __GFP_ZERO | __GFP_NOWARN | __GFP_COMP; gfp_t gfp = GFP_KERNEL_ACCOUNT | __GFP_ZERO | __GFP_NOWARN | __GFP_COMP;
...@@ -2852,8 +2860,7 @@ static __cold void io_ring_ctx_free(struct io_ring_ctx *ctx) ...@@ -2852,8 +2860,7 @@ static __cold void io_ring_ctx_free(struct io_ring_ctx *ctx)
mmdrop(ctx->mm_account); mmdrop(ctx->mm_account);
ctx->mm_account = NULL; ctx->mm_account = NULL;
} }
io_mem_free(ctx->rings); io_rings_free(ctx);
io_mem_free(ctx->sq_sqes);
percpu_ref_exit(&ctx->refs); percpu_ref_exit(&ctx->refs);
free_uid(ctx->user); free_uid(ctx->user);
...@@ -3682,15 +3689,13 @@ static __cold int io_allocate_scq_urings(struct io_ring_ctx *ctx, ...@@ -3682,15 +3689,13 @@ static __cold int io_allocate_scq_urings(struct io_ring_ctx *ctx,
else else
size = array_size(sizeof(struct io_uring_sqe), p->sq_entries); size = array_size(sizeof(struct io_uring_sqe), p->sq_entries);
if (size == SIZE_MAX) { if (size == SIZE_MAX) {
io_mem_free(ctx->rings); io_rings_free(ctx);
ctx->rings = NULL;
return -EOVERFLOW; return -EOVERFLOW;
} }
ptr = io_mem_alloc(size); ptr = io_mem_alloc(size);
if (IS_ERR(ptr)) { if (IS_ERR(ptr)) {
io_mem_free(ctx->rings); io_rings_free(ctx);
ctx->rings = NULL;
return PTR_ERR(ptr); return PTR_ERR(ptr);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment