Skip to content

Commit 1155404

Browse files
axboegregkh
authored andcommitted
io-wq: remove GFP_ATOMIC allocation off schedule out path
[ Upstream commit d3e9f73 ] Daniel reports that the v5.14-rc4-rt4 kernel throws a BUG when running stress-ng: | [ 90.202543] BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:35 | [ 90.202549] in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 2047, name: iou-wrk-2041 | [ 90.202555] CPU: 5 PID: 2047 Comm: iou-wrk-2041 Tainted: G W 5.14.0-rc4-rt4+ #89 | [ 90.202559] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.14.0-2 04/01/2014 | [ 90.202561] Call Trace: | [ 90.202577] dump_stack_lvl+0x34/0x44 | [ 90.202584] ___might_sleep.cold+0x87/0x94 | [ 90.202588] rt_spin_lock+0x19/0x70 | [ 90.202593] ___slab_alloc+0xcb/0x7d0 | [ 90.202598] ? newidle_balance.constprop.0+0xf5/0x3b0 | [ 90.202603] ? dequeue_entity+0xc3/0x290 | [ 90.202605] ? io_wqe_dec_running.isra.0+0x98/0xe0 | [ 90.202610] ? pick_next_task_fair+0xb9/0x330 | [ 90.202612] ? __schedule+0x670/0x1410 | [ 90.202615] ? io_wqe_dec_running.isra.0+0x98/0xe0 | [ 90.202618] kmem_cache_alloc_trace+0x79/0x1f0 | [ 90.202621] io_wqe_dec_running.isra.0+0x98/0xe0 | [ 90.202625] io_wq_worker_sleeping+0x37/0x50 | [ 90.202628] schedule+0x30/0xd0 | [ 90.202630] schedule_timeout+0x8f/0x1a0 | [ 90.202634] ? __bpf_trace_tick_stop+0x10/0x10 | [ 90.202637] io_wqe_worker+0xfd/0x320 | [ 90.202641] ? finish_task_switch.isra.0+0xd3/0x290 | [ 90.202644] ? io_worker_handle_work+0x670/0x670 | [ 90.202646] ? io_worker_handle_work+0x670/0x670 | [ 90.202649] ret_from_fork+0x22/0x30 which is due to the RT kernel not liking a GFP_ATOMIC allocation inside a raw spinlock. Besides that not working on RT, doing any kind of allocation from inside schedule() is kind of nasty and should be avoided if at all possible. This particular path happens when an io-wq worker goes to sleep, and we need a new worker to handle pending work. We currently allocate a small data item to hold the information we need to create a new worker, but we can instead include this data in the io_worker struct itself and just protect it with a single bit lock. We only really need one per worker anyway, as we will have run pending work between to sleep cycles. https://lore.kernel.org/lkml/[email protected]/ Reported-by: Daniel Wagner <[email protected]> Tested-by: Daniel Wagner <[email protected]> Acked-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Jens Axboe <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 037b574 commit 1155404

File tree

1 file changed

+40
-32
lines changed

1 file changed

+40
-32
lines changed

fs/io-wq.c

Lines changed: 40 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ struct io_worker {
5151

5252
struct completion ref_done;
5353

54+
unsigned long create_state;
55+
struct callback_head create_work;
56+
int create_index;
57+
5458
struct rcu_head rcu;
5559
};
5660

@@ -272,24 +276,18 @@ static void io_wqe_inc_running(struct io_worker *worker)
272276
atomic_inc(&acct->nr_running);
273277
}
274278

275-
struct create_worker_data {
276-
struct callback_head work;
277-
struct io_wqe *wqe;
278-
int index;
279-
};
280-
281279
static void create_worker_cb(struct callback_head *cb)
282280
{
283-
struct create_worker_data *cwd;
281+
struct io_worker *worker;
284282
struct io_wq *wq;
285283
struct io_wqe *wqe;
286284
struct io_wqe_acct *acct;
287285
bool do_create = false, first = false;
288286

289-
cwd = container_of(cb, struct create_worker_data, work);
290-
wqe = cwd->wqe;
287+
worker = container_of(cb, struct io_worker, create_work);
288+
wqe = worker->wqe;
291289
wq = wqe->wq;
292-
acct = &wqe->acct[cwd->index];
290+
acct = &wqe->acct[worker->create_index];
293291
raw_spin_lock_irq(&wqe->lock);
294292
if (acct->nr_workers < acct->max_workers) {
295293
if (!acct->nr_workers)
@@ -299,33 +297,42 @@ static void create_worker_cb(struct callback_head *cb)
299297
}
300298
raw_spin_unlock_irq(&wqe->lock);
301299
if (do_create) {
302-
create_io_worker(wq, wqe, cwd->index, first);
300+
create_io_worker(wq, wqe, worker->create_index, first);
303301
} else {
304302
atomic_dec(&acct->nr_running);
305303
io_worker_ref_put(wq);
306304
}
307-
kfree(cwd);
305+
clear_bit_unlock(0, &worker->create_state);
306+
io_worker_release(worker);
308307
}
309308

310-
static void io_queue_worker_create(struct io_wqe *wqe, struct io_wqe_acct *acct)
309+
static void io_queue_worker_create(struct io_wqe *wqe, struct io_worker *worker,
310+
struct io_wqe_acct *acct)
311311
{
312-
struct create_worker_data *cwd;
313312
struct io_wq *wq = wqe->wq;
314313

315314
/* raced with exit, just ignore create call */
316315
if (test_bit(IO_WQ_BIT_EXIT, &wq->state))
317316
goto fail;
317+
if (!io_worker_get(worker))
318+
goto fail;
319+
/*
320+
* create_state manages ownership of create_work/index. We should
321+
* only need one entry per worker, as the worker going to sleep
322+
* will trigger the condition, and waking will clear it once it
323+
* runs the task_work.
324+
*/
325+
if (test_bit(0, &worker->create_state) ||
326+
test_and_set_bit_lock(0, &worker->create_state))
327+
goto fail_release;
318328

319-
cwd = kmalloc(sizeof(*cwd), GFP_ATOMIC);
320-
if (cwd) {
321-
init_task_work(&cwd->work, create_worker_cb);
322-
cwd->wqe = wqe;
323-
cwd->index = acct->index;
324-
if (!task_work_add(wq->task, &cwd->work, TWA_SIGNAL))
325-
return;
326-
327-
kfree(cwd);
328-
}
329+
init_task_work(&worker->create_work, create_worker_cb);
330+
worker->create_index = acct->index;
331+
if (!task_work_add(wq->task, &worker->create_work, TWA_SIGNAL))
332+
return;
333+
clear_bit_unlock(0, &worker->create_state);
334+
fail_release:
335+
io_worker_release(worker);
329336
fail:
330337
atomic_dec(&acct->nr_running);
331338
io_worker_ref_put(wq);
@@ -343,7 +350,7 @@ static void io_wqe_dec_running(struct io_worker *worker)
343350
if (atomic_dec_and_test(&acct->nr_running) && io_wqe_run_queue(wqe)) {
344351
atomic_inc(&acct->nr_running);
345352
atomic_inc(&wqe->wq->worker_refs);
346-
io_queue_worker_create(wqe, acct);
353+
io_queue_worker_create(wqe, worker, acct);
347354
}
348355
}
349356

@@ -1004,12 +1011,12 @@ struct io_wq *io_wq_create(unsigned bounded, struct io_wq_data *data)
10041011

10051012
static bool io_task_work_match(struct callback_head *cb, void *data)
10061013
{
1007-
struct create_worker_data *cwd;
1014+
struct io_worker *worker;
10081015

10091016
if (cb->func != create_worker_cb)
10101017
return false;
1011-
cwd = container_of(cb, struct create_worker_data, work);
1012-
return cwd->wqe->wq == data;
1018+
worker = container_of(cb, struct io_worker, create_work);
1019+
return worker->wqe->wq == data;
10131020
}
10141021

10151022
void io_wq_exit_start(struct io_wq *wq)
@@ -1026,12 +1033,13 @@ static void io_wq_exit_workers(struct io_wq *wq)
10261033
return;
10271034

10281035
while ((cb = task_work_cancel_match(wq->task, io_task_work_match, wq)) != NULL) {
1029-
struct create_worker_data *cwd;
1036+
struct io_worker *worker;
10301037

1031-
cwd = container_of(cb, struct create_worker_data, work);
1032-
atomic_dec(&cwd->wqe->acct[cwd->index].nr_running);
1038+
worker = container_of(cb, struct io_worker, create_work);
1039+
atomic_dec(&worker->wqe->acct[worker->create_index].nr_running);
10331040
io_worker_ref_put(wq);
1034-
kfree(cwd);
1041+
clear_bit_unlock(0, &worker->create_state);
1042+
io_worker_release(worker);
10351043
}
10361044

10371045
rcu_read_lock();

0 commit comments

Comments
 (0)