Commit ce946408 authored by Gabriel Krisman Bertazi's avatar Gabriel Krisman Bertazi Committed by Jens Axboe
Browse files

io_uring/msg_ring: Drop custom destructor 



kfree can handle slab objects nowadays. Drop the extra callback and just
use kfree.

Signed-off-by: default avatarGabriel Krisman Bertazi <krisman@suse.de>
Link: https://lore.kernel.org/r/20241216204615.759089-10-krisman@suse.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent ef623a64

io_uring/io_uring.c

+2 −2
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static __cold struct io_ring_ctx *io_ring_ctx_alloc(struct io_uring_params *p) 
	io_alloc_cache_free(&ctx->netmsg_cache, io_netmsg_cache_free);

	io_alloc_cache_free(&ctx->rw_cache, io_rw_cache_free);

	io_alloc_cache_free(&ctx->uring_cache, kfree);

	io_alloc_cache_free(&ctx->msg_cache, io_msg_cache_free);

	io_alloc_cache_free(&ctx->msg_cache, kfree);

	io_futex_cache_free(ctx);

	kvfree(ctx->cancel_table.hbs);

	xa_destroy(&ctx->io_bl_xa);
@@ -2696,7 +2696,7 @@ static __cold void io_ring_ctx_free(struct io_ring_ctx *ctx) 
	io_alloc_cache_free(&ctx->netmsg_cache, io_netmsg_cache_free);

	io_alloc_cache_free(&ctx->rw_cache, io_rw_cache_free);

	io_alloc_cache_free(&ctx->uring_cache, kfree);

	io_alloc_cache_free(&ctx->msg_cache, io_msg_cache_free);

	io_alloc_cache_free(&ctx->msg_cache, kfree);

	io_futex_cache_free(ctx);

	io_destroy_buffers(ctx);

	io_free_region(ctx, &ctx->param_region);

io_uring/msg_ring.c

+0 −7
Original line number Diff line number Diff line
@@ -354,10 +354,3 @@ int io_uring_sync_msg_ring(struct io_uring_sqe *sqe) 
	return  __io_msg_ring_data(fd_file(f)->private_data,

				   &io_msg, IO_URING_F_UNLOCKED);

}
 


void io_msg_cache_free(const void *entry)

{

	struct io_kiocb *req = (struct io_kiocb *) entry;



	kmem_cache_free(req_cachep, req);

}

io_uring/msg_ring.h

+0 −1
Original line number Diff line number Diff line
@@ -4,4 +4,3 @@ int io_uring_sync_msg_ring(struct io_uring_sqe *sqe); 
int io_msg_ring_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);

int io_msg_ring(struct io_kiocb *req, unsigned int issue_flags);

void io_msg_ring_cleanup(struct io_kiocb *req);
 
void io_msg_cache_free(const void *entry);