diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2023-09-06 18:39:04 +0100 |
|---|---|---|
| committer | Luis Chamberlain <mcgrof@kernel.org> | 2023-09-12 12:57:55 -0700 |
| commit | 35889e7fb556360b27920b53977fbe2a1897f31e (patch) | |
| tree | a82c5d815e9354aceaa38d52ce96888845589444 | |
| parent | f8cdbae368dc7c066804ad2304d1028ce304517b (diff) | |
| download | linux-next-large-block-20230825.tar.gz | |
workqueue: Remove duplicate worqueue attributes allocationlarge-block-20230825
Commit 84193c07105c ("workqueue: Generalize unbound CPU pods")
inadvertently introduced another call to alloc_workqueue_attrs()
overriding the pointer returned by a previous alloc_workqueue_attrs() a
few lines up in workqueue_init_early(). This leads to a kmemleak report:
unreferenced object 0xffff000040015000 (size 96):
comm "swapper/0", pid 0, jiffies 4294892296 (age 163.956s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 03 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<000000004cec0d50>] __kmem_cache_alloc_node+0x1c4/0x288
[<0000000083361c2a>] kmalloc_trace+0x20/0x2c
[<000000005ca61f11>] workqueue_init_early+0xe4/0x538
[<000000004e6ea358>] start_kernel+0x23c/0x5ec
[<00000000aea9761e>] __primary_switched+0xbc/0xc4
Remove the first allocation.
Fixes: 84193c07105c ("workqueue: Generalize unbound CPU pods")
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Tejun Heo <tj@kernel.org>
| -rw-r--r-- | kernel/workqueue.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index d4364d3d8aaa4e..856a4896eb64a0 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -6524,9 +6524,6 @@ void __init workqueue_init_early(void) pwq_cache = KMEM_CACHE(pool_workqueue, SLAB_PANIC); - wq_update_pod_attrs_buf = alloc_workqueue_attrs(); - BUG_ON(!wq_update_pod_attrs_buf); - /* initialize WQ_AFFN_SYSTEM pods */ pt->pod_cpus = kcalloc(1, sizeof(pt->pod_cpus[0]), GFP_KERNEL); pt->pod_node = kcalloc(1, sizeof(pt->pod_node[0]), GFP_KERNEL); |