Messages in this thread | | | Date | Mon, 15 Dec 2014 13:25:26 +0800 | From | Lai Jiangshan <> | Subject | Re: [PATCH 1/5] workqueue: fix memory leak in wq_numa_init() |
| |
On 12/13/2014 01:12 AM, Tejun Heo wrote: > On Fri, Dec 12, 2014 at 06:19:51PM +0800, Lai Jiangshan wrote: >> wq_numa_init() will quit directly on some bonkers cases without freeing the >> memory. Add the missing cleanup code. >> >> Cc: Tejun Heo <tj@kernel.org> >> Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> >> Cc: "Gu, Zheng" <guz.fnst@cn.fujitsu.com> >> Cc: tangchen <tangchen@cn.fujitsu.com> >> Cc: Hiroyuki KAMEZAWA <kamezawa.hiroyu@jp.fujitsu.com> >> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> >> --- >> kernel/workqueue.c | 3 +++ >> 1 files changed, 3 insertions(+), 0 deletions(-) >> >> diff --git a/kernel/workqueue.c b/kernel/workqueue.c >> index 09b685d..a6fd2b8 100644 >> --- a/kernel/workqueue.c >> +++ b/kernel/workqueue.c >> @@ -4811,6 +4811,9 @@ static void __init wq_numa_init(void) >> if (WARN_ON(node == NUMA_NO_NODE)) { >> pr_warn("workqueue: NUMA node mapping not available for cpu%d, disabling NUMA support\n", cpu); >> /* happens iff arch is bonkers, let's just proceed */ >> + for_each_node(node) >> + free_cpumask_var(tbl[node]); >> + kfree(tbl); > > The comment right up there says that this happens if and only if the > arch code is seriously broken and it's consciously skipping exception > handling. That's a condition where we might as well trigger BUG_ON(). > Just leave it alone.
cpu_to_node() can return NUMA_NO_NODE after system booted (when node offline) currently. so I don't think it is seriously broken if cpu_to_node() returns NUMA_NO_NODE when booting.
See:
static void unmap_cpu_on_node(pg_data_t *pgdat) { #ifdef CONFIG_ACPI_NUMA int cpu;
for_each_possible_cpu(cpu) if (cpu_to_node(cpu) == pgdat->node_id) numa_clear_node(cpu); #endif }
> > Thanks. >
| |