2021-07-22 03:06:02

by Zhen Lei

Subject: [PATCH v2 0/1] workqueue: Fix possible memory leaks in wq_numa_init()

v1 --> v2:
1. Keep the original "for_each_possible_cpu(cpu)" loop and "cpumask_set_cpu(cpu, tbl[node]);"
2. Remove the comment: /* happens iff arch is bonkers, let's just proceed */


Zhen Lei (1):
workqueue: Fix possible memory leaks in wq_numa_init()

kernel/workqueue.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)

--
2.25.1

2021-07-22 03:06:39

by Zhen Lei

Subject: [PATCH v2 1/1] workqueue: Fix possible memory leaks in wq_numa_init()

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 <[email protected]>
---
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

2021-07-28 02:53:57

by Lai Jiangshan

Subject: Re: [PATCH v2 1/1] workqueue: Fix possible memory leaks in wq_numa_init()

Reviewed-by: Lai Jiangshan <[email protected]>

On Thu, Jul 22, 2021 at 11:04 AM Zhen Lei <[email protected]> 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 <[email protected]>
> ---
> 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
>

2021-07-29 17:25:17

by Tejun Heo

Subject: Re: [PATCH v2 1/1] workqueue: Fix possible memory leaks in wq_numa_init()

On Thu, Jul 22, 2021 at 11:03:52AM +0800, Zhen Lei 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 <[email protected]>

Applied to wq/for-5.15.

Thanks.

--
tejun