hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

io_uring: add ring freeing helper

Browse Source 
Commit 9c189eee73af1825ea9c895fafad469de5f82641 upstream.

We do rings and sqes separately, move them into a helper that does both
the freeing and clearing of the memory.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jens Axboe 2021-11-05 17:15:46 -06:00 committed by Greg Kroah-Hartman
parent 63e6dc6172
commit a00113dc99
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
io_uring/io_uring.c
View File

@ -2525,6 +2525,14 @@ static void io_mem_free(void *ptr)
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)
{
gfp_t gfp = GFP_KERNEL_ACCOUNT | __GFP_ZERO | __GFP_NOWARN | __GFP_COMP;
@ -2684,8 +2692,7 @@ static __cold void io_ring_ctx_free(struct io_ring_ctx *ctx)
mmdrop(ctx->mm_account);
ctx->mm_account = NULL;
}
io_mem_free(ctx->rings);
io_mem_free(ctx->sq_sqes);
io_rings_free(ctx);
percpu_ref_exit(&ctx->refs);
free_uid(ctx->user);
@ -3452,15 +3459,13 @@ static __cold int io_allocate_scq_urings(struct io_ring_ctx *ctx,
else
size = array_size(sizeof(struct io_uring_sqe), p->sq_entries);
if (size == SIZE_MAX) {
io_mem_free(ctx->rings);
ctx->rings = NULL;
io_rings_free(ctx);
return -EOVERFLOW;
}
ptr = io_mem_alloc(size);
if (IS_ERR(ptr)) {
io_mem_free(ctx->rings);
ctx->rings = NULL;
io_rings_free(ctx);
return PTR_ERR(ptr);
}