Commit 9afe6847 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring/kbuf: remove legacy kbuf kmem cache 



Remove the kmem cache used by legacy provided buffers.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/8195c207d8524d94e972c0c82de99282289f7f5c.1738724373.git.asml.silence@gmail.com


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

io_uring/io_uring.c

+0 −2
Original line number Diff line number Diff line
@@ -3927,8 +3927,6 @@ static int __init io_uring_init(void) 
	req_cachep = kmem_cache_create("io_kiocb", sizeof(struct io_kiocb), &kmem_args,

				SLAB_HWCACHE_ALIGN | SLAB_PANIC | SLAB_ACCOUNT |

				SLAB_TYPESAFE_BY_RCU);

	io_buf_cachep = KMEM_CACHE(io_buffer,

					  SLAB_HWCACHE_ALIGN | SLAB_PANIC | SLAB_ACCOUNT);



	iou_wq = alloc_workqueue("iou_exit", WQ_UNBOUND, 64);

	BUG_ON(!iou_wq);

io_uring/io_uring.h

+0 −1
Original line number Diff line number Diff line
@@ -418,7 +418,6 @@ static inline bool io_req_cache_empty(struct io_ring_ctx *ctx) 
}



extern struct kmem_cache *req_cachep;

extern struct kmem_cache *io_buf_cachep;



static inline struct io_kiocb *io_extract_req(struct io_ring_ctx *ctx)

{

io_uring/kbuf.c

+2 −4
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
/* BIDs are addressed by a 16-bit field in a CQE */

#define MAX_BIDS_PER_BGID (1 << 16)



struct kmem_cache *io_buf_cachep;



struct io_provide_buf {

	struct file			*file;

	__u64				addr;
@@ -411,7 +409,7 @@ void io_destroy_buffers(struct io_ring_ctx *ctx) 


	list_for_each_safe(item, tmp, &ctx->io_buffers_cache) {

		buf = list_entry(item, struct io_buffer, list);

		kmem_cache_free(io_buf_cachep, buf);

		kfree(buf);

	}

}
@@ -521,7 +519,7 @@ static int io_refill_buffer_cache(struct io_ring_ctx *ctx) 
		spin_unlock(&ctx->completion_lock);

	}



	buf = kmem_cache_alloc(io_buf_cachep, GFP_KERNEL);

	buf = kmalloc(sizeof(*buf), GFP_KERNEL_ACCOUNT);

	if (!buf)

		return -ENOMEM;

	list_add_tail(&buf->list, &ctx->io_buffers_cache);