io_uring: add rsrc_ref locking routines

Encapsulate resource reference locking into separate routines.

Signed-off-by: Bijan Mottahedeh <bijan.mottahedeh@oracle.com>
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Reviewed-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 fcc7a3e..a129192 100644 (file)
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -7350,14 +7350,24 @@ static void io_rsrc_ref_kill(struct percpu_ref *ref)
        complete(&data->done);
 }
 
+static inline void io_rsrc_ref_lock(struct io_ring_ctx *ctx)
+{
+       spin_lock_bh(&ctx->rsrc_ref_lock);
+}
+
+static inline void io_rsrc_ref_unlock(struct io_ring_ctx *ctx)
+{
+       spin_unlock_bh(&ctx->rsrc_ref_lock);
+}
+
 static void io_sqe_rsrc_set_node(struct io_ring_ctx *ctx,
                                 struct fixed_rsrc_data *rsrc_data,
                                 struct fixed_rsrc_ref_node *ref_node)
 {
-       spin_lock_bh(&ctx->rsrc_ref_lock);
+       io_rsrc_ref_lock(ctx);
        rsrc_data->node = ref_node;
        list_add_tail(&ref_node->node, &ctx->rsrc_ref_list);
-       spin_unlock_bh(&ctx->rsrc_ref_lock);
+       io_rsrc_ref_unlock(ctx);
        percpu_ref_get(&rsrc_data->refs);
 }
 
@@ -7374,9 +7384,9 @@ static int io_sqe_files_unregister(struct io_ring_ctx *ctx)
        if (!backup_node)
                return -ENOMEM;
 
-       spin_lock_bh(&ctx->rsrc_ref_lock);
+       io_rsrc_ref_lock(ctx);
        ref_node = data->node;
-       spin_unlock_bh(&ctx->rsrc_ref_lock);
+       io_rsrc_ref_unlock(ctx);
        if (ref_node)
                percpu_ref_kill(&ref_node->refs);
 
@@ -7766,7 +7776,7 @@ static void io_rsrc_data_ref_zero(struct percpu_ref *ref)
        data = ref_node->rsrc_data;
        ctx = data->ctx;
 
-       spin_lock_bh(&ctx->rsrc_ref_lock);
+       io_rsrc_ref_lock(ctx);
        ref_node->done = true;
 
        while (!list_empty(&ctx->rsrc_ref_list)) {
@@ -7778,7 +7788,7 @@ static void io_rsrc_data_ref_zero(struct percpu_ref *ref)
                list_del(&ref_node->node);
                first_add |= llist_add(&ref_node->llist, &ctx->rsrc_put_llist);
        }
-       spin_unlock_bh(&ctx->rsrc_ref_lock);
+       io_rsrc_ref_unlock(ctx);
 
        if (percpu_ref_is_dying(&data->refs))
                delay = 0;