Skip to content

Commit 751e5f5

Browse files
Michal Hockotorvalds
Michal Hocko
authored andcommitted
vmstat: allocate vmstat_wq before it is used
kernel test robot has reported the following crash: BUG: unable to handle kernel NULL pointer dereference at 00000100 IP: [<c1074df6>] __queue_work+0x26/0x390 *pdpt = 0000000000000000 *pde = f000ff53f000ff53 *pde = f000ff53f000ff53 Oops: 0000 [#1] PREEMPT PREEMPT SMP SMP CPU: 0 PID: 24 Comm: kworker/0:1 Not tainted 4.4.0-rc4-00139-g373ccbe #1 Workqueue: events vmstat_shepherd task: cb684600 ti: cb7ba000 task.ti: cb7ba000 EIP: 0060:[<c1074df6>] EFLAGS: 00010046 CPU: 0 EIP is at __queue_work+0x26/0x390 EAX: 00000046 EBX: cbb37800 ECX: cbb37800 EDX: 00000000 ESI: 00000000 EDI: 00000000 EBP: cb7bbe68 ESP: cb7bbe38 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 CR0: 8005003b CR2: 00000100 CR3: 01fd5000 CR4: 000006b0 Stack: Call Trace: __queue_delayed_work+0xa1/0x160 queue_delayed_work_on+0x36/0x60 vmstat_shepherd+0xad/0xf0 process_one_work+0x1aa/0x4c0 worker_thread+0x41/0x440 kthread+0xb0/0xd0 ret_from_kernel_thread+0x21/0x40 The reason is that start_shepherd_timer schedules the shepherd work item which uses vmstat_wq (vmstat_shepherd) before setup_vmstat allocates that workqueue so if the further initialization takes more than HZ we might end up scheduling on a NULL vmstat_wq. This is really unlikely but not impossible. Fixes: 373ccbe ("mm, vmstat: allow WQ concurrency to discover memory reclaim doesn't make any progress") Reported-by: kernel test robot <[email protected]> Signed-off-by: Michal Hocko <[email protected]> Tested-by: Tetsuo Handa <[email protected]> Cc: [email protected] Cc: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 44d8a7d commit 751e5f5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

mm/vmstat.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1483,6 +1483,7 @@ static void __init start_shepherd_timer(void)
14831483
BUG();
14841484
cpumask_copy(cpu_stat_off, cpu_online_mask);
14851485

1486+
vmstat_wq = alloc_workqueue("vmstat", WQ_FREEZABLE|WQ_MEM_RECLAIM, 0);
14861487
schedule_delayed_work(&shepherd,
14871488
round_jiffies_relative(sysctl_stat_interval));
14881489
}
@@ -1550,7 +1551,6 @@ static int __init setup_vmstat(void)
15501551

15511552
start_shepherd_timer();
15521553
cpu_notifier_register_done();
1553-
vmstat_wq = alloc_workqueue("vmstat", WQ_FREEZABLE|WQ_MEM_RECLAIM, 0);
15541554
#endif
15551555
#ifdef CONFIG_PROC_FS
15561556
proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);

0 commit comments

Comments
 (0)