io_uring: place fixed tables under memcg limits

commit 0bea96f59ba40e63c0ae93ad6a02417b95f22f4d upstream.

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: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/b3ac9f5da9821bb59837b5fe25e8ef4be982218c.1629451684.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 0db463599b00fcb0c2d385067566169426211b96..195e26a785973d598771bf3e705c10b108eaa6dd 100644 (file)
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -7383,7 +7383,7 @@ static int io_sqe_alloc_file_tables(struct fixed_file_data *file_data,
 
                this_files = min(nr_files, IORING_MAX_FILES_TABLE);
                table->files = kcalloc(this_files, sizeof(struct file *),
-                                       GFP_KERNEL);
+                                       GFP_KERNEL_ACCOUNT);
                if (!table->files)
                        break;
                nr_files -= this_files;
@@ -7582,7 +7582,7 @@ static int io_sqe_files_register(struct io_ring_ctx *ctx, void __user *arg,
        if (nr_args > rlimit(RLIMIT_NOFILE))
                return -EMFILE;
 
-       file_data = kzalloc(sizeof(*ctx->file_data), GFP_KERNEL);
+       file_data = kzalloc(sizeof(*ctx->file_data), GFP_KERNEL_ACCOUNT);
        if (!file_data)
                return -ENOMEM;
        file_data->ctx = ctx;
@@ -7592,7 +7592,7 @@ static int io_sqe_files_register(struct io_ring_ctx *ctx, void __user *arg,
 
        nr_tables = DIV_ROUND_UP(nr_args, IORING_MAX_FILES_TABLE);
        file_data->table = kcalloc(nr_tables, sizeof(*file_data->table),
-                                  GFP_KERNEL);
+                                  GFP_KERNEL_ACCOUNT);
        if (!file_data->table)
                goto out_free;