Skip to content

Commit fb04410

Browse files
committed
powerpc/perf: Fix branch_filter support for multiple filters
Bugzilla: http://bugzilla.redhat.com/2162235 Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=50161851 Tested: Did sanity perf testing (ibm-p10-01-lp14) system. commit b9c0012 Author: Athira Rajeev <atrajeev@linux.vnet.ibm.com> Date: Wed Sep 21 20:22:53 2022 +0530 powerpc/perf: Fix branch_filter support for multiple filters For PERF_SAMPLE_BRANCH_STACK sample type, different branch_sample_type ie branch filters are supported. The branch filters are requested via event attribute "branch_sample_type". Multiple branch filters can be passed in event attribute. eg: $ perf record -b -o- -B --branch-filter any,ind_call true None of the Power PMUs support having multiple branch filters at the same time. Branch filters for branch stack sampling is set via MMCRA IFM bits [32:33]. But currently when requesting for multiple filter types, the "perf record" command does not report any error. eg: $ perf record -b -o- -B --branch-filter any,save_type true $ perf record -b -o- -B --branch-filter any,ind_call true The "bhrb_filter_map" function in PMU driver code does the validity check for supported branch filters. But this check is done for single filter. Hence "perf record" will proceed here without reporting any error. Fix power_pmu_event_init() to return EOPNOTSUPP when multiple branch filters are requested in the event attr. After the fix: $ perf record --branch-filter any,ind_call -- ls Error: cycles: PMU Hardware doesn't support sampling/overflow-interrupts. Try 'perf stat' Reported-by: Disha Goel <disgoel@linux.vnet.ibm.com> Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com> Tested-by: Disha Goel<disgoel@linux.vnet.ibm.com> Reviewed-by: Madhavan Srinivasan <maddy@linux.ibm.com> Reviewed-by: Kajol Jain <kjain@linux.ibm.com> [mpe: Tweak comment and change log wording] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20220921145255.20972-1-atrajeev@linux.vnet.ibm.com Signed-off-by: Steve Best <sbest@redhat.com>
1 parent fa8007f commit fb04410

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

arch/powerpc/perf/core-book3s.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2121,6 +2121,23 @@ static int power_pmu_event_init(struct perf_event *event)
21212121
if (has_branch_stack(event)) {
21222122
u64 bhrb_filter = -1;
21232123

2124+
/*
2125+
* Currently no PMU supports having multiple branch filters
2126+
* at the same time. Branch filters are set via MMCRA IFM[32:33]
2127+
* bits for Power8 and above. Return EOPNOTSUPP when multiple
2128+
* branch filters are requested in the event attr.
2129+
*
2130+
* When opening event via perf_event_open(), branch_sample_type
2131+
* gets adjusted in perf_copy_attr(). Kernel will automatically
2132+
* adjust the branch_sample_type based on the event modifier
2133+
* settings to include PERF_SAMPLE_BRANCH_PLM_ALL. Hence drop
2134+
* the check for PERF_SAMPLE_BRANCH_PLM_ALL.
2135+
*/
2136+
if (hweight64(event->attr.branch_sample_type & ~PERF_SAMPLE_BRANCH_PLM_ALL) > 1) {
2137+
local_irq_restore(irq_flags);
2138+
return -EOPNOTSUPP;
2139+
}
2140+
21242141
if (ppmu->bhrb_filter_map)
21252142
bhrb_filter = ppmu->bhrb_filter_map(
21262143
event->attr.branch_sample_type);

0 commit comments

Comments
 (0)