]> www.infradead.org Git - users/willy/linux.git/commitdiff
io-wq: remove spurious bit clear on task_work addition
authorJens Axboe <axboe@kernel.dk>
Mon, 6 Dec 2021 17:49:04 +0000 (10:49 -0700)
committerJens Axboe <axboe@kernel.dk>
Mon, 6 Dec 2021 17:49:04 +0000 (10:49 -0700)
There's a small race here where the task_work could finish and drop
the worker itself, so that by the time that task_work_add() returns
with a successful addition we've already put the worker.

The worker callbacks clear this bit themselves, so we don't actually
need to manually clear it in the caller. Get rid of it.

Reported-by: syzbot+b60c982cb0efc5e05a47@syzkaller.appspotmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io-wq.c

index 50cf9f92da3613f22da54392dcbba54e3d20e8a3..35da9d90df7609cbcc6ae54ed432870f8b809806 100644 (file)
@@ -359,10 +359,8 @@ static bool io_queue_worker_create(struct io_worker *worker,
 
        init_task_work(&worker->create_work, func);
        worker->create_index = acct->index;
-       if (!task_work_add(wq->task, &worker->create_work, TWA_SIGNAL)) {
-               clear_bit_unlock(0, &worker->create_state);
+       if (!task_work_add(wq->task, &worker->create_work, TWA_SIGNAL))
                return true;
-       }
        clear_bit_unlock(0, &worker->create_state);
 fail_release:
        io_worker_release(worker);