perf_counter/powerpc: Check oprofile_cpu_type for NULL before using it
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 8 lines · Paul Mackerras
From: Benjamin Herrenschmidt <[email protected]>
If the current CPU doesn't support performance counters,
cur_cpu_spec->oprofile_cpu_typecan be NULL. The currentperf_countermodules don't test for that case and would thus crash at boot time.Bug reported by David Woodhouse.
Quoted 7 lines
Signed-off-by Benjamin Herrenschmidt <[email protected]>Reported-by David Woodhouse <[email protected]>Signed-off-by Paul Mackerras <[email protected]>---
Ingo, this needs to go in for .31 since it fixes a boot-time oops. Are you going to be sending a batch to Linus shortly or should I send this to him separately?
Yeah, wanted to send a batch of fixes later today - so i've queued this one up too in perfcounters/urgent.
Thanks,
Ingo
Commit-ID: e0d82a0a4e9841b787e6431ccfbb515546c55dc2 Gitweb: http://git.kernel.org/tip/e0d82a0a4e9841b787e6431ccfbb515546c55dc2 Author: Benjamin Herrenschmidt <[email protected]> AuthorDate: Thu, 6 Aug 2009 21:16:44 +1000 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 6 Aug 2009 13:55:09 +0200
perf_counter/powerpc: Check oprofile_cpu_type for NULL before using it
If the current CPU doesn't support performance counters, cur_cpu_spec->oprofile_cpu_type can be NULL. The current perf_counter modules don't test for that case and would thus crash at boot time.
Bug reported by David Woodhouse.
LKML-Reference: <[email protected]>
--- arch/powerpc/kernel/mpc7450-pmu.c | 3 ++- arch/powerpc/kernel/power4-pmu.c | 3 ++- arch/powerpc/kernel/power5+-pmu.c | 5 +++-- arch/powerpc/kernel/power5-pmu.c | 3 ++- arch/powerpc/kernel/power6-pmu.c | 3 ++- arch/powerpc/kernel/power7-pmu.c | 3 ++- arch/powerpc/kernel/ppc970-pmu.c | 5 +++-- 7 files changed, 16 insertions(+), 9 deletions(-)
arch/powerpc/kernel/mpc7450-pmu.c +2 -1
@@ -407,7 +407,8 @@ struct power_pmu mpc7450_pmu = {static int init_mpc7450_pmu (void ) { -if (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc/7450" )) +if (!cur_cpu_spec->oprofile_cpu_type || +strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc/7450" ))return -ENODEV ;return register_power_pmu (&mpc7450_pmu);
arch/powerpc/kernel/power4-pmu.c +2 -1
@@ -606,7 +606,8 @@ static struct power_pmu power4_pmu = {static int init_power4_pmu (void ) { -if (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power4" )) +if (!cur_cpu_spec->oprofile_cpu_type || +strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power4" ))return -ENODEV ;return register_power_pmu (&power4_pmu);
arch/powerpc/kernel/power5+-pmu.c +3 -2
@@ -678,8 +678,9 @@ static struct power_pmu power5p_pmu = {static int init_power5p_pmu (void ) { -if (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power5+" ) - &&strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power5++" )) +if (!cur_cpu_spec->oprofile_cpu_type || + (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power5+" ) + &&strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power5++" )))return -ENODEV ;return register_power_pmu (&power5p_pmu);
arch/powerpc/kernel/power5-pmu.c +2 -1
@@ -618,7 +618,8 @@ static struct power_pmu power5_pmu = {static int init_power5_pmu (void ) { -if (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power5" )) +if (!cur_cpu_spec->oprofile_cpu_type || +strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power5" ))return -ENODEV ;return register_power_pmu (&power5_pmu);
arch/powerpc/kernel/power6-pmu.c +2 -1
@@ -537,7 +537,8 @@ static struct power_pmu power6_pmu = {static int init_power6_pmu (void ) { -if (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power6" )) +if (!cur_cpu_spec->oprofile_cpu_type || +strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power6" ))return -ENODEV ;return register_power_pmu (&power6_pmu);
arch/powerpc/kernel/power7-pmu.c +2 -1
@@ -366,7 +366,8 @@ static struct power_pmu power7_pmu = {static int init_power7_pmu (void ) { -if (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power7" )) +if (!cur_cpu_spec->oprofile_cpu_type || +strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power7" ))return -ENODEV ;return register_power_pmu (&power7_pmu);
arch/powerpc/kernel/ppc970-pmu.c +3 -2
@@ -488,8 +488,9 @@ static struct power_pmu ppc970_pmu = {static int init_ppc970_pmu (void ) { -if (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/970" ) - &&strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/970MP" )) +if (!cur_cpu_spec->oprofile_cpu_type || + (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/970" ) + &&strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/970MP" )))return -ENODEV ;return register_power_pmu (&ppc970_pmu);