]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
io_uring: remove extra in_idle wake up
authorPavel Begunkov <asml.silence@gmail.com>
Mon, 1 Mar 2021 18:20:48 +0000 (18:20 +0000)
committerJens Axboe <axboe@kernel.dk>
Thu, 4 Mar 2021 13:38:07 +0000 (06:38 -0700)
io_dismantle_req() is always followed by io_put_task(), which already do
proper in_idle wake ups, so we can skip waking the owner task in
io_dismantle_req(). The rules are simpler now, do io_put_task() shortly
after ending a request, and it will be fine.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c

index 840b73db9c3d7138661d2876327b9c2abcb5c604..26e83cabf3bf040ee1c291ea2209ac52b9c0bf25 100644 (file)
@@ -1649,18 +1649,16 @@ static void io_dismantle_req(struct io_kiocb *req)
 
        if (req->flags & REQ_F_INFLIGHT) {
                struct io_ring_ctx *ctx = req->ctx;
-               struct io_uring_task *tctx = req->task->io_uring;
                unsigned long flags;
 
                spin_lock_irqsave(&ctx->inflight_lock, flags);
                list_del(&req->inflight_entry);
                spin_unlock_irqrestore(&ctx->inflight_lock, flags);
                req->flags &= ~REQ_F_INFLIGHT;
-               if (atomic_read(&tctx->in_idle))
-                       wake_up(&tctx->wait);
        }
 }
 
+/* must to be called somewhat shortly after putting a request */
 static inline void io_put_task(struct task_struct *task, int nr)
 {
        struct io_uring_task *tctx = task->io_uring;