powerpc/perf: Stop crashing with generic_compat_pmu
PATCH 1/1 powerpc/perf: Stop crashing with generic_compat_pmu
The bhrb_filter_map ("The Branch History Rolling Buffer") callback is only defined in raw CPUs' power_pmu structs. The "architected" CPUs use generic_compat_pmu which does not have this callback and crashed occur.
This add a NULL pointer check for bhrb_filter_map() which behaves as if the callback returned an error.
This does not add the same check for config_bhrb() as the only caller checks for cpuhw->bhrb_users which remains zero if bhrb_filter_map==0.
--- arch/powerpc/perf/core-book3s.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
arch/powerpc/perf/core-book3s.c +14 -5
@@ -1515,9 +1515,16 @@ static int power_pmu_add(struct perf_event *event, int ef_flags) ret =0 ; out:if (has_branch_stack (event)) { -power_pmu_bhrb_enable (event); - cpuhw->bhrb_filter = ppmu->bhrb_filter_map ( - event->attr.branch_sample_type); +u64 bhrb_filter =-1 ; + +if (ppmu->bhrb_filter_map) + bhrb_filter = ppmu->bhrb_filter_map ( + event->attr.branch_sample_type); + +if (bhrb_filter !=-1 ) { + cpuhw->bhrb_filter = bhrb_filter; +power_pmu_bhrb_enable (event);/* Does bhrb_users++ */ + } }perf_pmu_enable (event->pmu);
@@ -1839,7 +1846,6 @@ static int power_pmu_event_init(struct perf_event *event)int n;int err;struct cpu_hw_events *cpuhw; -u64 bhrb_filter;if (!ppmu)return -ENOENT ;
@@ -1945,7 +1951,10 @@ static int power_pmu_event_init(struct perf_event *event) err =power_check_constraints (cpuhw, events, cflags, n +1 );if (has_branch_stack (event)) { - bhrb_filter = ppmu->bhrb_filter_map ( +u64 bhrb_filter =-1 ; + +if (ppmu->bhrb_filter_map) + bhrb_filter = ppmu->bhrb_filter_map ( event->attr.branch_sample_type);if (bhrb_filter ==-1 ) {
Signature · 1 line
2.17.1
Quoted 9 lines · Alexey Kardashevskiy
The
bhrb_filter_map("The Branch History Rolling Buffer") callback is only defined in raw CPUs'power_pmustructs. The "architected" CPUs usegeneric_compat_pmuwhich does not have this callback and crashed occur.This add a NULL pointer check for
bhrb_filter_map()which behaves as if the callback returned an error.This does not add the same check for
config_bhrb()as the only caller checks forcpuhw->bhrb_userswhich remains zero if bhrb_filter_map==0.
Changes looks fine.
The commit be80e758d0c2e ('powerpc/perf: Add generic compat mode pmu driver') which introduced generic_compat_pmu was merged in v5.2. So we need to CC stable starting from 5.2 :( . My bad, sorry.
Maddy
Quoted 49 lines
Signed-off-by Alexey Kardashevskiy <[email protected]>--- arch/powerpc/perf/core-book3s.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)arch/powerpc/perf/core-book3s.c +14
-5@@ -1515,9 +1515,16 @@ static int power_pmu_add(struct perf_event *event, int ef_flags) ret =0 ; out:if (has_branch_stack (event)) { -power_pmu_bhrb_enable (event); - cpuhw->bhrb_filter = ppmu->bhrb_filter_map ( - event->attr.branch_sample_type); +u64 bhrb_filter =-1 ; + +if (ppmu->bhrb_filter_map) + bhrb_filter = ppmu->bhrb_filter_map ( + event->attr.branch_sample_type); + +if (bhrb_filter !=-1 ) { + cpuhw->bhrb_filter = bhrb_filter; +power_pmu_bhrb_enable (event);/* Does bhrb_users++ */ + } }perf_pmu_enable (event->pmu);@@ -1839,7 +1846,6 @@ static int power_pmu_event_init(struct perf_event *event)int n;int err;struct cpu_hw_events *cpuhw; -u64 bhrb_filter;if (!ppmu)return -ENOENT ;@@ -1945,7 +1951,10 @@ static int power_pmu_event_init(struct perf_event *event) err =power_check_constraints (cpuhw, events, cflags, n +1 );if (has_branch_stack (event)) { - bhrb_filter = ppmu->bhrb_filter_map ( +u64 bhrb_filter =-1 ; + +if (ppmu->bhrb_filter_map) + bhrb_filter = ppmu->bhrb_filter_map ( event->attr.branch_sample_type);if (bhrb_filter ==-1 ) {
Hi Maddy,
I just noticed that I still have "powerpc/perf: Add checks for reserved values" in my pile (pushed here https://github.com/aik/linux/commit/61e1bc3f2e19d450e2e2d39174d422160b21957b ), do we still need it? The lockups I saw were fixed by https://github.com/aik/linux/commit/17899eaf88d689 but it is hardly a replacement. Thanks,
Quoted 75 lines · Madhavan Srinivasan
Quoted 9 lines · Alexey Kardashevskiy
The
bhrb_filter_map("The Branch History Rolling Buffer") callback is only defined in raw CPUs'power_pmustructs. The "architected" CPUs usegeneric_compat_pmuwhich does not have this callback and crashed occur.This add a NULL pointer check for
bhrb_filter_map()which behaves as if the callback returned an error.This does not add the same check for
config_bhrb()as the only caller checks forcpuhw->bhrb_userswhich remains zero if bhrb_filter_map==0.Changes looks fine.
Reviewed-by Madhavan Srinivasan <[email protected]>The commit
be80e758d0c2e('powerpc/perf: Add generic compat mode pmu driver') which introducedgeneric_compat_pmuwas merged in v5.2. So we need to CC stable starting from 5.2 :( . My bad, sorry.Maddy
Quoted 52 lines
Signed-off-by Alexey Kardashevskiy <[email protected]>---
arch/powerpc/perf/core-book3s.c| 19 ++++++++++++++-----1 file changed, 14 insertions(+), 5 deletions(-)arch/powerpc/perf/core-book3s.c +0
-0@@ -1515,9 +1515,16 @@ static int power_pmu_add(struct perf_event *event, int ef_flags) ret = 0;out:
if (has_branch_stack(event)) {
-power_pmu_bhrb_enable(event);
-cpuhw->bhrb_filter=ppmu->bhrb_filter_map( - event->attr.branch_sample_type); + u64bhrb_filter= -1;arch/powerpc/perf/core-book3s.c +9
-0+ + if (ppmu->bhrb_filter_map) + bhrb_filter = ppmu->bhrb_filter_map( + event->attr.branch_sample_type); + + if (bhrb_filter != -1) { + cpuhw->bhrb_filter = bhrb_filter; + power_pmu_bhrb_enable(event); /* Does bhrb_users++ */ + }}
perf_pmu_enable(event->pmu);arch/powerpc/perf/core-book3s.c +0
-1@@ -1839,7 +1846,6 @@ static int power_pmu_event_init(struct perf_event *event) int n; int err; struct cpu_hw_events *cpuhw; - u64 bhrb_filter; if (!ppmu)return
-ENOENT;arch/powerpc/perf/core-book3s.c +4
-1@@ -1945,7 +1951,10 @@ static int power_pmu_event_init(struct perf_event *event) err = power_check_constraints(cpuhw, events, cflags, n + 1); if (has_branch_stack(event)) { - bhrb_filter = ppmu->bhrb_filter_map( + u64 bhrb_filter = -1; + + if (ppmu->bhrb_filter_map) + bhrb_filter = ppmu->bhrb_filter_map( event->attr.branch_sample_type);if (
bhrb_filter== -1) {
Signature · 1 line
Alexey
Madhavan Srinivasan
maintainerQuoted 3 lines · Alexey Kardashevskiy
Hi Maddy,
I just noticed that I still have "powerpc/perf: Add checks for reserved values" in my pile (pushed here https://github.com/aik/linux/commit/61e1bc3f2e19d450e2e2d39174d422160b21957b ), do we still need it? The lockups I saw were fixed by https://github.com/aik/linux/commit/17899eaf88d689 but it is hardly a replacement. Thanks,
sorry missed this. Will look at this again. Since we will need generation specific checks for the reserve field.
Maddy
Quoted 79 lines · Madhavan Srinivasan
Quoted 75 lines · Alexey Kardashevskiy
Quoted 9 lines
The
bhrb_filter_map("The Branch History Rolling Buffer") callback is only defined in raw CPUs'power_pmustructs. The "architected" CPUs usegeneric_compat_pmuwhich does not have this callback and crashed occur.This add a NULL pointer check for
bhrb_filter_map()which behaves as if the callback returned an error.This does not add the same check for
config_bhrb()as the only caller checks forcpuhw->bhrb_userswhich remains zero if bhrb_filter_map==0.Changes looks fine.
Reviewed-by Madhavan Srinivasan <[email protected]>The commit
be80e758d0c2e('powerpc/perf: Add generic compat mode pmu driver') which introducedgeneric_compat_pmuwas merged in v5.2. So we need to CC stable starting from 5.2 :( . My bad, sorry.Maddy
Quoted 52 lines
Signed-off-by Alexey Kardashevskiy <[email protected]>---
arch/powerpc/perf/core-book3s.c| 19 ++++++++++++++-----1 file changed, 14 insertions(+), 5 deletions(-)arch/powerpc/perf/core-book3s.c +0
-0@@ -1515,9 +1515,16 @@ static int power_pmu_add(struct perf_event *event, int ef_flags) ret = 0;out:
if (has_branch_stack(event)) {
-power_pmu_bhrb_enable(event);
-cpuhw->bhrb_filter=ppmu->bhrb_filter_map( - event->attr.branch_sample_type); + u64bhrb_filter= -1;arch/powerpc/perf/core-book3s.c +9
-0+ + if (ppmu->bhrb_filter_map) + bhrb_filter = ppmu->bhrb_filter_map( + event->attr.branch_sample_type); + + if (bhrb_filter != -1) { + cpuhw->bhrb_filter = bhrb_filter; + power_pmu_bhrb_enable(event); /* Does bhrb_users++ */ + }}
perf_pmu_enable(event->pmu);arch/powerpc/perf/core-book3s.c +0
-1@@ -1839,7 +1846,6 @@ static int power_pmu_event_init(struct perf_event *event) int n; int err; struct cpu_hw_events *cpuhw; - u64 bhrb_filter; if (!ppmu)return
-ENOENT;arch/powerpc/perf/core-book3s.c +4
-1@@ -1945,7 +1951,10 @@ static int power_pmu_event_init(struct perf_event *event) err = power_check_constraints(cpuhw, events, cflags, n + 1); if (has_branch_stack(event)) { - bhrb_filter = ppmu->bhrb_filter_map( + u64 bhrb_filter = -1; + + if (ppmu->bhrb_filter_map) + bhrb_filter = ppmu->bhrb_filter_map( event->attr.branch_sample_type);if (
bhrb_filter== -1) {
Quoted 7 lines · Madhavan Srinivasan
Quoted 3 lines · Alexey Kardashevskiy
Hi Maddy,
I just noticed that I still have "powerpc/perf: Add checks for reserved values" in my pile (pushed here https://github.com/aik/linux/commit/61e1bc3f2e19d450e2e2d39174d422160b21957b ), do we still need it? The lockups I saw were fixed by https://github.com/aik/linux/commit/17899eaf88d689 but it is hardly a replacement. Thanks,
sorry missed this. Will look at this again. Since we will need generation specific checks for the reserve field.
So any luck with this? Cheers,
Quoted 82 lines
Maddy
Quoted 79 lines · Madhavan Srinivasan
Quoted 75 lines · Alexey Kardashevskiy
Quoted 9 lines
The
bhrb_filter_map("The Branch History Rolling Buffer") callback is only defined in raw CPUs'power_pmustructs. The "architected" CPUs usegeneric_compat_pmuwhich does not have this callback and crashed occur.This add a NULL pointer check for
bhrb_filter_map()which behaves as if the callback returned an error.This does not add the same check for
config_bhrb()as the only caller checks forcpuhw->bhrb_userswhich remains zero if bhrb_filter_map==0.Changes looks fine.
Reviewed-by Madhavan Srinivasan <[email protected]>The commit
be80e758d0c2e('powerpc/perf: Add generic compat mode pmu driver') which introducedgeneric_compat_pmuwas merged in v5.2. So we need to CC stable starting from 5.2 :( . My bad, sorry.Maddy
Quoted 52 lines
Signed-off-by Alexey Kardashevskiy <[email protected]>---
arch/powerpc/perf/core-book3s.c| 19 ++++++++++++++-----1 file changed, 14 insertions(+), 5 deletions(-)arch/powerpc/perf/core-book3s.c +0
-0@@ -1515,9 +1515,16 @@ static int power_pmu_add(struct perf_event *event, int ef_flags) ret = 0;out:
if (has_branch_stack(event)) {
-power_pmu_bhrb_enable(event);
-cpuhw->bhrb_filter=ppmu->bhrb_filter_map( - event->attr.branch_sample_type); + u64bhrb_filter= -1;arch/powerpc/perf/core-book3s.c +9
-0+ + if (ppmu->bhrb_filter_map) + bhrb_filter = ppmu->bhrb_filter_map( + event->attr.branch_sample_type); + + if (bhrb_filter != -1) { + cpuhw->bhrb_filter = bhrb_filter; + power_pmu_bhrb_enable(event); /* Does bhrb_users++ */ + }}
perf_pmu_enable(event->pmu);arch/powerpc/perf/core-book3s.c +0
-1@@ -1839,7 +1846,6 @@ static int power_pmu_event_init(struct perf_event *event) int n; int err; struct cpu_hw_events *cpuhw; - u64 bhrb_filter; if (!ppmu)return
-ENOENT;arch/powerpc/perf/core-book3s.c +4
-1@@ -1945,7 +1951,10 @@ static int power_pmu_event_init(struct perf_event *event) err = power_check_constraints(cpuhw, events, cflags, n + 1); if (has_branch_stack(event)) { - bhrb_filter = ppmu->bhrb_filter_map( + u64 bhrb_filter = -1; + + if (ppmu->bhrb_filter_map) + bhrb_filter = ppmu->bhrb_filter_map( event->attr.branch_sample_type);if (
bhrb_filter== -1) {
Signature · 1 line
Alexey
Michael Ellerman
AppliedQuoted 8 lines · Alexey Kardashevskiy
The
bhrb_filter_map("The Branch History Rolling Buffer") callback is only defined in raw CPUs'power_pmustructs. The "architected" CPUs usegeneric_compat_pmuwhich does not have this callback and crashed occur.This add a NULL pointer check for
bhrb_filter_map()which behaves as if the callback returned an error.[...]
Applied to powerpc/fixes.
[1/1] powerpc/perf: Fix crashes with generic_compat_pmu & BHRB
https://git.kernel.org/powerpc/c/b460b512417ae9c8b51a3bdcc09020cd6c60ff69
cheers