io_uring: create common fixed_rsrc_data allocation routines

Create common alloc/free fixed_rsrc_data routines for both files and
buffers.

Reviewed-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Bijan Mottahedeh <bijan.mottahedeh@oracle.com>
[remove buffer part]
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 727d0d3cdbcc9f06ec6d3915b9b7a04b8d9fee03..8f7d95e0d240fbc91f5372be948c4c8686e3a209 100644 (file)
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -7407,6 +7407,31 @@ static int io_rsrc_ref_quiesce(struct fixed_rsrc_data *data,
        return 0;
 }
 
+static struct fixed_rsrc_data *alloc_fixed_rsrc_data(struct io_ring_ctx *ctx)
+{
+       struct fixed_rsrc_data *data;
+
+       data = kzalloc(sizeof(*data), GFP_KERNEL);
+       if (!data)
+               return NULL;
+
+       if (percpu_ref_init(&data->refs, io_rsrc_ref_kill,
+                           PERCPU_REF_ALLOW_REINIT, GFP_KERNEL)) {
+               kfree(data);
+               return NULL;
+       }
+       data->ctx = ctx;
+       init_completion(&data->done);
+       return data;
+}
+
+static void free_fixed_rsrc_data(struct fixed_rsrc_data *data)
+{
+       percpu_ref_exit(&data->refs);
+       kfree(data->table);
+       kfree(data);
+}
+
 static int io_sqe_files_unregister(struct io_ring_ctx *ctx)
 {
        struct fixed_rsrc_data *data = ctx->file_data;
@@ -7429,9 +7454,7 @@ static int io_sqe_files_unregister(struct io_ring_ctx *ctx)
        nr_tables = DIV_ROUND_UP(ctx->nr_user_files, IORING_MAX_FILES_TABLE);
        for (i = 0; i < nr_tables; i++)
                kfree(data->table[i].files);
-       kfree(data->table);
-       percpu_ref_exit(&data->refs);
-       kfree(data);
+       free_fixed_rsrc_data(data);
        ctx->file_data = NULL;
        ctx->nr_user_files = 0;
        return 0;
@@ -7866,11 +7889,9 @@ static int io_sqe_files_register(struct io_ring_ctx *ctx, void __user *arg,
        if (nr_args > IORING_MAX_FIXED_FILES)
                return -EMFILE;
 
-       file_data = kzalloc(sizeof(*ctx->file_data), GFP_KERNEL);
+       file_data = alloc_fixed_rsrc_data(ctx);
        if (!file_data)
                return -ENOMEM;
-       file_data->ctx = ctx;
-       init_completion(&file_data->done);
 
        nr_tables = DIV_ROUND_UP(nr_args, IORING_MAX_FILES_TABLE);
        file_data->table = kcalloc(nr_tables, sizeof(*file_data->table),
@@ -7878,12 +7899,8 @@ static int io_sqe_files_register(struct io_ring_ctx *ctx, void __user *arg,
        if (!file_data->table)
                goto out_free;
 
-       if (percpu_ref_init(&file_data->refs, io_rsrc_ref_kill,
-                               PERCPU_REF_ALLOW_REINIT, GFP_KERNEL))
-               goto out_free;
-
        if (io_sqe_alloc_file_tables(file_data, nr_tables, nr_args))
-               goto out_ref;
+               goto out_free;
        ctx->file_data = file_data;
 
        for (i = 0; i < nr_args; i++, ctx->nr_user_files++) {
@@ -7943,11 +7960,8 @@ out_fput:
        for (i = 0; i < nr_tables; i++)
                kfree(file_data->table[i].files);
        ctx->nr_user_files = 0;
-out_ref:
-       percpu_ref_exit(&file_data->refs);
 out_free:
-       kfree(file_data->table);
-       kfree(file_data);
+       free_fixed_rsrc_data(ctx->file_data);
        ctx->file_data = NULL;
        return ret;
 }