Commit 0cd3e59d authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Peter Zijlstra

sched/isolation: Consolidate error handling

Centralize the mask freeing and return value for the error path. This
makes potential leaks more visible.
Signed-off-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarJuri Lelli <juri.lelli@redhat.com>
Reviewed-by: default avatarPhil Auld <pauld@redhat.com>
Link: https://lore.kernel.org/r/20220207155910.527133-7-frederic@kernel.org
parent 6367b600
...@@ -92,12 +92,12 @@ void __init housekeeping_init(void) ...@@ -92,12 +92,12 @@ void __init housekeeping_init(void)
static int __init housekeeping_setup(char *str, enum hk_flags flags) static int __init housekeeping_setup(char *str, enum hk_flags flags)
{ {
cpumask_var_t non_housekeeping_mask, housekeeping_staging; cpumask_var_t non_housekeeping_mask, housekeeping_staging;
int err = 0;
alloc_bootmem_cpumask_var(&non_housekeeping_mask); alloc_bootmem_cpumask_var(&non_housekeeping_mask);
if (cpulist_parse(str, non_housekeeping_mask) < 0) { if (cpulist_parse(str, non_housekeeping_mask) < 0) {
pr_warn("Housekeeping: nohz_full= or isolcpus= incorrect CPU range\n"); pr_warn("Housekeeping: nohz_full= or isolcpus= incorrect CPU range\n");
free_bootmem_cpumask_var(non_housekeeping_mask); goto free_non_housekeeping_mask;
return 0;
} }
alloc_bootmem_cpumask_var(&housekeeping_staging); alloc_bootmem_cpumask_var(&housekeeping_staging);
...@@ -119,30 +119,29 @@ static int __init housekeeping_setup(char *str, enum hk_flags flags) ...@@ -119,30 +119,29 @@ static int __init housekeeping_setup(char *str, enum hk_flags flags)
} else { } else {
if (!cpumask_equal(housekeeping_staging, housekeeping_mask)) { if (!cpumask_equal(housekeeping_staging, housekeeping_mask)) {
pr_warn("Housekeeping: nohz_full= must match isolcpus=\n"); pr_warn("Housekeeping: nohz_full= must match isolcpus=\n");
free_bootmem_cpumask_var(housekeeping_staging); goto free_housekeeping_staging;
free_bootmem_cpumask_var(non_housekeeping_mask);
return 0;
} }
} }
free_bootmem_cpumask_var(housekeeping_staging);
if ((flags & HK_FLAG_TICK) && !(housekeeping_flags & HK_FLAG_TICK)) { if ((flags & HK_FLAG_TICK) && !(housekeeping_flags & HK_FLAG_TICK)) {
if (IS_ENABLED(CONFIG_NO_HZ_FULL)) { if (IS_ENABLED(CONFIG_NO_HZ_FULL)) {
tick_nohz_full_setup(non_housekeeping_mask); tick_nohz_full_setup(non_housekeeping_mask);
} else { } else {
pr_warn("Housekeeping: nohz unsupported." pr_warn("Housekeeping: nohz unsupported."
" Build with CONFIG_NO_HZ_FULL\n"); " Build with CONFIG_NO_HZ_FULL\n");
free_bootmem_cpumask_var(non_housekeeping_mask); goto free_housekeeping_staging;
return 0;
} }
} }
housekeeping_flags |= flags; housekeeping_flags |= flags;
err = 1;
free_housekeeping_staging:
free_bootmem_cpumask_var(housekeeping_staging);
free_non_housekeeping_mask:
free_bootmem_cpumask_var(non_housekeeping_mask); free_bootmem_cpumask_var(non_housekeeping_mask);
return 1; return err;
} }
static int __init housekeeping_nohz_full_setup(char *str) static int __init housekeeping_nohz_full_setup(char *str)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment