[PATCH] workqueue: Removed double allocation of wq_update_pod_attrs_buf

[PATCH] workqueue: Removed double allocation of wq_update_pod_attrs_buf

[Steven Rostedt]

From: "Steven Rostedt (Google)" <rostedt@goodmis.org>

First commit 2930155b2e272 ("workqueue: Initialize unbound CPU pods later in
the boot") added the initialization of wq_update_pod_attrs_buf to
workqueue_init_early(), and then latter on, commit 84193c07105c6
("workqueue: Generalize unbound CPU pods") added it as well. This appeared
in a kmemleak run where the second allocation made the first allocation
leak.

Fixes: 84193c07105c6 ("workqueue: Generalize unbound CPU pods")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
 kernel/workqueue.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index c85825e17df8..129328b765fb 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -6535,9 +6535,6 @@ void __init workqueue_init_early(void)
 
 	BUG_ON(!zalloc_cpumask_var_node(&pt->pod_cpus[0], GFP_KERNEL, NUMA_NO_NODE));
 
-	wq_update_pod_attrs_buf = alloc_workqueue_attrs();
-	BUG_ON(!wq_update_pod_attrs_buf);
-
 	pt->nr_pods = 1;
 	cpumask_copy(pt->pod_cpus[0], cpu_possible_mask);
 	pt->pod_node[0] = NUMA_NO_NODE;
-- 
2.40.1

Re: [PATCH] workqueue: Removed double allocation of wq_update_pod_attrs_buf

[Geert Uytterhoeven]

On Thu, Sep 7, 2023 at 8:46 AM Steven Rostedt <rostedt@goodmis.org> wrote:
> From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
>
> First commit 2930155b2e272 ("workqueue: Initialize unbound CPU pods later in
> the boot") added the initialization of wq_update_pod_attrs_buf to
> workqueue_init_early(), and then latter on, commit 84193c07105c6
> ("workqueue: Generalize unbound CPU pods") added it as well. This appeared
> in a kmemleak run where the second allocation made the first allocation
> leak.
>
> Fixes: 84193c07105c6 ("workqueue: Generalize unbound CPU pods")
> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

Just noticed this, too.
John posted a similar patch after you:
https://lore.kernel.org/all/20230913101634.553699-1-john.ogness@linutronix.de/

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] workqueue: Removed double allocation of wq_update_pod_attrs_buf

[Tejun Heo]

On Tue, Sep 05, 2023 at 05:49:35PM -0400, Steven Rostedt wrote:
> From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
> 
> First commit 2930155b2e272 ("workqueue: Initialize unbound CPU pods later in
> the boot") added the initialization of wq_update_pod_attrs_buf to
> workqueue_init_early(), and then latter on, commit 84193c07105c6
> ("workqueue: Generalize unbound CPU pods") added it as well. This appeared
> in a kmemleak run where the second allocation made the first allocation
> leak.
> 
> Fixes: 84193c07105c6 ("workqueue: Generalize unbound CPU pods")
> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

Applied to wq/for-6.6-fixes.

Thanks.

-- 
tejun