[PATCH 5.13 051/380] io_uring: place fixed tables under memcg limits

From: Greg Kroah-Hartman
Date: Thu Sep 16 2021 - 12:37:30 EST


From: Pavel Begunkov <asml.silence@xxxxxxxxx>

commit 0bea96f59ba40e63c0ae93ad6a02417b95f22f4d upstream.

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

Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Pavel Begunkov <asml.silence@xxxxxxxxx>
Link: https://lore.kernel.org/r/b3ac9f5da9821bb59837b5fe25e8ef4be982218c.1629451684.git.asml.silence@xxxxxxxxx
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/io_uring.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -7195,11 +7195,11 @@ static struct io_rsrc_data *io_rsrc_data
{
struct io_rsrc_data *data;

- data = kzalloc(sizeof(*data), GFP_KERNEL);
+ data = kzalloc(sizeof(*data), GFP_KERNEL_ACCOUNT);
if (!data)
return NULL;

- data->tags = kvcalloc(nr, sizeof(*data->tags), GFP_KERNEL);
+ data->tags = kvcalloc(nr, sizeof(*data->tags), GFP_KERNEL_ACCOUNT);
if (!data->tags) {
kfree(data);
return NULL;
@@ -7477,7 +7477,7 @@ static bool io_alloc_file_tables(struct
{
unsigned i, nr_tables = DIV_ROUND_UP(nr_files, IORING_MAX_FILES_TABLE);

- table->files = kcalloc(nr_tables, sizeof(*table->files), GFP_KERNEL);
+ table->files = kcalloc(nr_tables, sizeof(*table->files), GFP_KERNEL_ACCOUNT);
if (!table->files)
return false;

@@ -7485,7 +7485,7 @@ static bool io_alloc_file_tables(struct
unsigned int this_files = min(nr_files, IORING_MAX_FILES_TABLE);

table->files[i] = kcalloc(this_files, sizeof(*table->files[i]),
- GFP_KERNEL);
+ GFP_KERNEL_ACCOUNT);
if (!table->files[i])
break;
nr_files -= this_files;