cpufreq:powernv: Fix init_chip_info initialization in numa=off
Subsystems (2)
PATCH 1/1 cpufreq:powernv: Fix init_chip_info initialization in numa=off
In the numa=off kernel command-line configuration init_chip_info() loops around the number of chips and attempts to copy the cpumask of that node which is NULL for all iterations after the first chip.
Hence adding a check to bail out after the first initialization if there is only one node.
--- drivers/cpufreq/powernv-cpufreq.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/cpufreq/powernv-cpufreq.c +2 -0
@@ -1078,6 +1078,8 @@ static int init_chip_info(void)INIT_WORK (&chips[i].throttle, powernv_cpufreq_work_fn);for_each_cpu (cpu, &chips[i].mask)per_cpu (chip_info, cpu) = &chips[i]; +if (num_possible_nodes () ==1 ) +break ; } free_and_return:
Signature · 1 line
2.30.2
Hello Pratik,
Quoted 3 lines · Pratik R. Sampat
In the numa=off kernel command-line configuration
init_chip_info()loops around the number of chips and attempts to copy the cpumask of that node which is NULL for all iterations after the first chip.
Thanks for taking a look into this. Indeed there is an issue here because the code here assumes that node_mask as a proxy for the chip_mask. This assumption breaks when run with numa=off, since there will only be a single node, but multiple chips.
Quoted 16 lines
Hence adding a check to bail out after the first initialization if there is only one node.
Fixes 053819e0bf84 ("cpufreq: powernv: Handle throttling due to Pmax capping at chip level")Signed-off-by Pratik R. Sampat <[email protected]>Reported-by Shirisha Ganta <[email protected]>--- drivers/cpufreq/powernv-cpufreq.c | 2 ++ 1 file changed, 2 insertions(+)drivers/cpufreq/powernv-cpufreq.c +0
-0
drivers/cpufreq/powernv-cpufreq.c static int init_chip_info(void) · line 1082
Quoted 5 lines
drivers/cpufreq/powernv-cpufreq.c +2
-0@@ -1078,6 +1078,8 @@ static int init_chip_info(void)INIT_WORK (&chips[i].throttle, powernv_cpufreq_work_fn);for_each_cpu (cpu, &chips[i].mask)per_cpu (chip_info, cpu) = &chips[i]; +if (num_possible_nodes () ==1 ) +break ;
With this we will only initialize the chip[0].throttle work function, while for the rest of the chips chip[i].throttle will be uninitialized. While we may be running in the numa=off mode, the fact remains that those other chips do exist and they may experiencing throttling, during which they will try to schedule work for chip[i] in order to take corrective action, which will fail.
Hence a more correct approach may be to maintain a chip[i] mask independent of the node mask.
Quoted 6 lines
drivers/cpufreq/powernv-cpufreq.c +0
-0} free_and_return:Signature · 1 line
2.30.2