[v1] timers/migration: Ensure proper resource cleanup on error in tmigr_init

[PATCH] timers/migration: Ensure proper resource cleanup on error in tmigr_init

Posted by Zhan Xusheng 3 days, 16 hours ago

Free resources allocated by zalloc_cpumask_var and kcalloc on failure.

Signed-off-by: Zhan Xusheng <zhanxusheng@xiaomi.com>
---
 kernel/time/timer_migration.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c
index 18dda1aa782d..c2b3aa6946c1 100644
--- a/kernel/time/timer_migration.c
+++ b/kernel/time/timer_migration.c
@@ -1994,7 +1994,7 @@ static int __init tmigr_init(void)
 
 	tmigr_level_list = kcalloc(tmigr_hierarchy_levels, sizeof(struct list_head), GFP_KERNEL);
 	if (!tmigr_level_list)
-		goto err;
+		goto err_free_cpumask;
 
 	for (i = 0; i < tmigr_hierarchy_levels; i++)
 		INIT_LIST_HEAD(&tmigr_level_list[i]);
@@ -2007,15 +2007,21 @@ static int __init tmigr_init(void)
 	ret = cpuhp_setup_state(CPUHP_TMIGR_PREPARE, "tmigr:prepare",
 				tmigr_cpu_prepare, NULL);
 	if (ret)
-		goto err;
+		goto err_free_level_list;
 
 	ret = cpuhp_setup_state(CPUHP_AP_TMIGR_ONLINE, "tmigr:online",
 				tmigr_set_cpu_available, tmigr_clear_cpu_available);
 	if (ret)
-		goto err;
+		goto err_free_level_list;
 
 	return 0;
 
+err_free_level_list:
+	kfree(tmigr_level_list);
+
+err_free_cpumask:
+	free_cpumask_var(tmigr_available_cpumask);
+
 err:
 	pr_err("Timer migration setup failed\n");
 	return ret;
-- 
2.43.0

Re: [PATCH] timers/migration: Ensure proper resource cleanup on error in tmigr_init

Posted by Thomas Gleixner 3 days, 10 hours ago

On Wed, Feb 04 2026 at 16:50, Zhan Xusheng wrote:
> Free resources allocated by zalloc_cpumask_var and kcalloc on failure.
>
> Signed-off-by: Zhan Xusheng <zhanxusheng@xiaomi.com>
> ---
>  kernel/time/timer_migration.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c
> index 18dda1aa782d..c2b3aa6946c1 100644
> --- a/kernel/time/timer_migration.c
> +++ b/kernel/time/timer_migration.c
> @@ -1994,7 +1994,7 @@ static int __init tmigr_init(void)
>  
>  	tmigr_level_list = kcalloc(tmigr_hierarchy_levels, sizeof(struct list_head), GFP_KERNEL);
>  	if (!tmigr_level_list)
> -		goto err;
> +		goto err_free_cpumask;
>  
>  	for (i = 0; i < tmigr_hierarchy_levels; i++)
>  		INIT_LIST_HEAD(&tmigr_level_list[i]);
> @@ -2007,15 +2007,21 @@ static int __init tmigr_init(void)
>  	ret = cpuhp_setup_state(CPUHP_TMIGR_PREPARE, "tmigr:prepare",
>  				tmigr_cpu_prepare, NULL);
>  	if (ret)
> -		goto err;
> +		goto err_free_level_list;
>  
>  	ret = cpuhp_setup_state(CPUHP_AP_TMIGR_ONLINE, "tmigr:online",
>  				tmigr_set_cpu_available, tmigr_clear_cpu_available);
>  	if (ret)
> -		goto err;
> +		goto err_free_level_list;

Which leaves the prepare hotplug state registered ....

>  	return 0;
>  
> +err_free_level_list:
> +	kfree(tmigr_level_list);
> +
> +err_free_cpumask:
> +	free_cpumask_var(tmigr_available_cpumask);
> +
>  err:
>  	pr_err("Timer migration setup failed\n");
>  	return ret;

[PATCH v2] timers/migration: Ensure proper resource cleanup on error in tmigr_init

Posted by Zhan Xusheng 2 days, 22 hours ago

Free resources allocated by zalloc_cpumask_var and kcalloc on failure.

Reviewed-by: Thomas Gleixner <tglx@kernel.org>
Signed-off-by: Zhan Xusheng <zhanxusheng@xiaomi.com>
---
 kernel/time/timer_migration.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c
index 18dda1aa782d..ab8354ad85be 100644
--- a/kernel/time/timer_migration.c
+++ b/kernel/time/timer_migration.c
@@ -1994,7 +1994,7 @@ static int __init tmigr_init(void)
 
 	tmigr_level_list = kcalloc(tmigr_hierarchy_levels, sizeof(struct list_head), GFP_KERNEL);
 	if (!tmigr_level_list)
-		goto err;
+		goto err_free_cpumask;
 
 	for (i = 0; i < tmigr_hierarchy_levels; i++)
 		INIT_LIST_HEAD(&tmigr_level_list[i]);
@@ -2007,15 +2007,24 @@ static int __init tmigr_init(void)
 	ret = cpuhp_setup_state(CPUHP_TMIGR_PREPARE, "tmigr:prepare",
 				tmigr_cpu_prepare, NULL);
 	if (ret)
-		goto err;
+		goto err_free_level_list;
 
 	ret = cpuhp_setup_state(CPUHP_AP_TMIGR_ONLINE, "tmigr:online",
 				tmigr_set_cpu_available, tmigr_clear_cpu_available);
 	if (ret)
-		goto err;
+		goto err_remove_prepare_state;
 
 	return 0;
 
+err_remove_prepare_state:
+	cpuhp_remove_state(CPUHP_TMIGR_PREPARE);
+
+err_free_level_list:
+	kfree(tmigr_level_list);
+
+err_free_cpumask:
+	free_cpumask_var(tmigr_available_cpumask);
+
 err:
 	pr_err("Timer migration setup failed\n");
 	return ret;
-- 
2.43.0

Re: [PATCH v2] timers/migration: Ensure proper resource cleanup on error in tmigr_init

Posted by Thomas Gleixner 2 days, 18 hours ago

On Thu, Feb 05 2026 at 10:45, Zhan Xusheng wrote:

> Free resources allocated by zalloc_cpumask_var and kcalloc on failure.
>
> Reviewed-by: Thomas Gleixner <tglx@kernel.org>

I surely did not give you a reviewed-by tag. The fact that I reviewed V1
does not mean you can slap such a tag on it.

[PATCH v3] timers/migration: Ensure proper resource cleanup on error in tmigr_init

Posted by Zhan Xusheng 2 days, 17 hours ago

Free resources allocated by zalloc_cpumask_var and kcalloc on failure.

Signed-off-by: Zhan Xusheng <zhanxusheng@xiaomi.com>
---
 kernel/time/timer_migration.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c
index 18dda1aa782d..ab8354ad85be 100644
--- a/kernel/time/timer_migration.c
+++ b/kernel/time/timer_migration.c
@@ -1994,7 +1994,7 @@ static int __init tmigr_init(void)
 
 	tmigr_level_list = kcalloc(tmigr_hierarchy_levels, sizeof(struct list_head), GFP_KERNEL);
 	if (!tmigr_level_list)
-		goto err;
+		goto err_free_cpumask;
 
 	for (i = 0; i < tmigr_hierarchy_levels; i++)
 		INIT_LIST_HEAD(&tmigr_level_list[i]);
@@ -2007,15 +2007,24 @@ static int __init tmigr_init(void)
 	ret = cpuhp_setup_state(CPUHP_TMIGR_PREPARE, "tmigr:prepare",
 				tmigr_cpu_prepare, NULL);
 	if (ret)
-		goto err;
+		goto err_free_level_list;
 
 	ret = cpuhp_setup_state(CPUHP_AP_TMIGR_ONLINE, "tmigr:online",
 				tmigr_set_cpu_available, tmigr_clear_cpu_available);
 	if (ret)
-		goto err;
+		goto err_remove_prepare_state;
 
 	return 0;
 
+err_remove_prepare_state:
+	cpuhp_remove_state(CPUHP_TMIGR_PREPARE);
+
+err_free_level_list:
+	kfree(tmigr_level_list);
+
+err_free_cpumask:
+	free_cpumask_var(tmigr_available_cpumask);
+
 err:
 	pr_err("Timer migration setup failed\n");
 	return ret;
-- 
2.43.0