Messages in this thread | | | From | Lai Jiangshan <> | Date | Wed, 28 Jul 2021 10:50:02 +0800 | Subject | Re: [PATCH v2 1/1] workqueue: Fix possible memory leaks in wq_numa_init() |
| |
Reviewed-by: Lai Jiangshan <jiangshanlai@gmail.com>
On Thu, Jul 22, 2021 at 11:04 AM Zhen Lei <thunder.leizhen@huawei.com> wrote: > > In error handling branch "if (WARN_ON(node == NUMA_NO_NODE))", the > previously allocated memories are not released. Doing this before > allocating memory eliminates memory leaks. > > Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> > --- > kernel/workqueue.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/kernel/workqueue.c b/kernel/workqueue.c > index 50142fc08902..79cc470bd9ce 100644 > --- a/kernel/workqueue.c > +++ b/kernel/workqueue.c > @@ -5896,6 +5896,13 @@ static void __init wq_numa_init(void) > return; > } > > + for_each_possible_cpu(cpu) { > + if (WARN_ON(cpu_to_node(cpu) == NUMA_NO_NODE)) { > + pr_warn("workqueue: NUMA node mapping not available for cpu%d, disabling NUMA support\n", cpu); > + return; > + } > + } > + > wq_update_unbound_numa_attrs_buf = alloc_workqueue_attrs(); > BUG_ON(!wq_update_unbound_numa_attrs_buf); > > @@ -5913,11 +5920,6 @@ static void __init wq_numa_init(void) > > for_each_possible_cpu(cpu) { > node = cpu_to_node(cpu); > - 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 */ > - return; > - } > cpumask_set_cpu(cpu, tbl[node]); > } > > -- > 2.25.1 >
| |