io_uring: remove rsrc put work irq save/restore
authorPavel Begunkov <asml.silence@gmail.com>
Mon, 14 Jun 2021 01:36:19 +0000 (02:36 +0100)
committerJens Axboe <axboe@kernel.dk>
Mon, 14 Jun 2021 14:23:13 +0000 (08:23 -0600)
io_rsrc_put_work() is executed by workqueue in non-irq context, so no
need for irqsave/restore variants of spinlocking.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/2a7f77220735f4ad404ac885b4d73bdf42d2f836.1623634181.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c

index 6fda9fd..55e449d 100644 (file)
@@ -7555,14 +7555,13 @@ static void __io_rsrc_put_work(struct io_rsrc_node *ref_node)
 
                if (prsrc->tag) {
                        bool lock_ring = ctx->flags & IORING_SETUP_IOPOLL;
-                       unsigned long flags;
 
                        io_ring_submit_lock(ctx, lock_ring);
-                       spin_lock_irqsave(&ctx->completion_lock, flags);
+                       spin_lock_irq(&ctx->completion_lock);
                        io_cqring_fill_event(ctx, prsrc->tag, 0, 0);
                        ctx->cq_extra++;
                        io_commit_cqring(ctx);
-                       spin_unlock_irqrestore(&ctx->completion_lock, flags);
+                       spin_unlock_irq(&ctx->completion_lock);
                        io_cqring_ev_posted(ctx);
                        io_ring_submit_unlock(ctx, lock_ring);
                }