Commit 0bea96f5 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: place fixed tables under memcg limits 



Fixed tables may be large enough, place all of them together with
allocated tags under memcg limits.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/b3ac9f5da9821bb59837b5fe25e8ef4be982218c.1629451684.git.asml.silence@gmail.com


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

fs/io_uring.c

+4 −3
Original line number Diff line number Diff line
@@ -7138,14 +7138,14 @@ static void **io_alloc_page_table(size_t size) 
	size_t init_size = size;

	void **table;



	table = kcalloc(nr_tables, sizeof(*table), GFP_KERNEL);

	table = kcalloc(nr_tables, sizeof(*table), GFP_KERNEL_ACCOUNT);

	if (!table)

		return NULL;



	for (i = 0; i < nr_tables; i++) {

		unsigned int this_size = min_t(size_t, size, PAGE_SIZE);



		table[i] = kzalloc(this_size, GFP_KERNEL);

		table[i] = kzalloc(this_size, GFP_KERNEL_ACCOUNT);

		if (!table[i]) {

			io_free_page_table(table, init_size);

			return NULL;
@@ -7336,7 +7336,8 @@ static int io_rsrc_data_alloc(struct io_ring_ctx *ctx, rsrc_put_fn *do_put, 


static bool io_alloc_file_tables(struct io_file_table *table, unsigned nr_files)

{

	table->files = kvcalloc(nr_files, sizeof(table->files[0]), GFP_KERNEL);

	table->files = kvcalloc(nr_files, sizeof(table->files[0]),

				GFP_KERNEL_ACCOUNT);

	return !!table->files;

}