Skip to content

Commit e45cc28

Browse files
maurizio-lombarditehcaster
authored andcommitted
mm: slub: fix flush_cpu_slab()/__free_slab() invocations in task context.
Commit 5a836bf ("mm: slub: move flush_cpu_slab() invocations __free_slab() invocations out of IRQ context") moved all flush_cpu_slab() invocations to the global workqueue to avoid a problem related with deactivate_slab()/__free_slab() being called from an IRQ context on PREEMPT_RT kernels. When the flush_all_cpu_locked() function is called from a task context it may happen that a workqueue with WQ_MEM_RECLAIM bit set ends up flushing the global workqueue, this will cause a dependency issue. workqueue: WQ_MEM_RECLAIM nvme-delete-wq:nvme_delete_ctrl_work [nvme_core] is flushing !WQ_MEM_RECLAIM events:flush_cpu_slab WARNING: CPU: 37 PID: 410 at kernel/workqueue.c:2637 check_flush_dependency+0x10a/0x120 Workqueue: nvme-delete-wq nvme_delete_ctrl_work [nvme_core] RIP: 0010:check_flush_dependency+0x10a/0x120[ 453.262125] Call Trace: __flush_work.isra.0+0xbf/0x220 ? __queue_work+0x1dc/0x420 flush_all_cpus_locked+0xfb/0x120 __kmem_cache_shutdown+0x2b/0x320 kmem_cache_destroy+0x49/0x100 bioset_exit+0x143/0x190 blk_release_queue+0xb9/0x100 kobject_cleanup+0x37/0x130 nvme_fc_ctrl_free+0xc6/0x150 [nvme_fc] nvme_free_ctrl+0x1ac/0x2b0 [nvme_core] Fix this bug by creating a workqueue for the flush operation with the WQ_MEM_RECLAIM bit set. Fixes: 5a836bf ("mm: slub: move flush_cpu_slab() invocations __free_slab() invocations out of IRQ context") Cc: <[email protected]> Signed-off-by: Maurizio Lombardi <[email protected]> Reviewed-by: Hyeonggon Yoo <[email protected]> Signed-off-by: Vlastimil Babka <[email protected]>
1 parent d71608a commit e45cc28

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

mm/slub.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,11 @@ static inline void stat(const struct kmem_cache *s, enum stat_item si)
310310
*/
311311
static nodemask_t slab_nodes;
312312

313+
/*
314+
* Workqueue used for flush_cpu_slab().
315+
*/
316+
static struct workqueue_struct *flushwq;
317+
313318
/********************************************************************
314319
* Core slab cache functions
315320
*******************************************************************/
@@ -2730,7 +2735,7 @@ static void flush_all_cpus_locked(struct kmem_cache *s)
27302735
INIT_WORK(&sfw->work, flush_cpu_slab);
27312736
sfw->skip = false;
27322737
sfw->s = s;
2733-
schedule_work_on(cpu, &sfw->work);
2738+
queue_work_on(cpu, flushwq, &sfw->work);
27342739
}
27352740

27362741
for_each_online_cpu(cpu) {
@@ -4858,6 +4863,8 @@ void __init kmem_cache_init(void)
48584863

48594864
void __init kmem_cache_init_late(void)
48604865
{
4866+
flushwq = alloc_workqueue("slub_flushwq", WQ_MEM_RECLAIM, 0);
4867+
WARN_ON(!flushwq);
48614868
}
48624869

48634870
struct kmem_cache *

0 commit comments

Comments
 (0)