Skip to content

Commit 1d07bbd

Browse files
Dapeng MiPeter Zijlstra
authored andcommitted
perf/x86/intel: Add missing branch counters constraint apply
When running the command: 'perf record -e "{instructions,instructions:p}" -j any,counter sleep 1', a "shift-out-of-bounds" warning is reported on CWF. UBSAN: shift-out-of-bounds in /kbuild/src/consumer/arch/x86/events/intel/lbr.c:970:15 shift exponent 64 is too large for 64-bit type 'long long unsigned int' ...... intel_pmu_lbr_counters_reorder.isra.0.cold+0x2a/0xa7 intel_pmu_lbr_save_brstack+0xc0/0x4c0 setup_arch_pebs_sample_data+0x114b/0x2400 The warning occurs because the second "instructions:p" event, which involves branch counters sampling, is incorrectly programmed to fixed counter 0 instead of the general-purpose (GP) counters 0-3 that support branch counters sampling. Currently only GP counters 0-3 support branch counters sampling on CWF, any event involving branch counters sampling should be programed on GP counters 0-3. Since the counter index of fixed counter 0 is 32, it leads to the "src" value in below code is right shifted 64 bits and trigger the "shift-out-of-bounds" warning. cnt = (src >> (order[j] * LBR_INFO_BR_CNTR_BITS)) & LBR_INFO_BR_CNTR_MASK; The root cause is the loss of the branch counters constraint for the new event in the branch counters sampling event group. Since it isn't yet part of the sibling list. This results in the second "instructions:p" event being programmed on fixed counter 0 incorrectly instead of the appropriate GP counters 0-3. To address this, we apply the missing branch counters constraint for the last event in the group. Additionally, we introduce a new function, `intel_set_branch_counter_constr()`, to apply the branch counters constraint and avoid code duplication. Fixes: 3374491 ("perf/x86/intel: Support branch counters logging") Reported-by: Xudong Hao <xudong.hao@intel.com> Signed-off-by: Dapeng Mi <dapeng1.mi@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://patch.msgid.link/20260228053320.140406-2-dapeng1.mi@linux.intel.com Cc: stable@vger.kernel.org
1 parent 4b9ce67 commit 1d07bbd

1 file changed

Lines changed: 21 additions & 10 deletions

File tree

arch/x86/events/intel/core.c

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4628,6 +4628,19 @@ static inline void intel_pmu_set_acr_caused_constr(struct perf_event *event,
46284628
event->hw.dyn_constraint &= hybrid(event->pmu, acr_cause_mask64);
46294629
}
46304630

4631+
static inline int intel_set_branch_counter_constr(struct perf_event *event,
4632+
int *num)
4633+
{
4634+
if (branch_sample_call_stack(event))
4635+
return -EINVAL;
4636+
if (branch_sample_counters(event)) {
4637+
(*num)++;
4638+
event->hw.dyn_constraint &= x86_pmu.lbr_counters;
4639+
}
4640+
4641+
return 0;
4642+
}
4643+
46314644
static int intel_pmu_hw_config(struct perf_event *event)
46324645
{
46334646
int ret = x86_pmu_hw_config(event);
@@ -4698,21 +4711,19 @@ static int intel_pmu_hw_config(struct perf_event *event)
46984711
* group, which requires the extra space to store the counters.
46994712
*/
47004713
leader = event->group_leader;
4701-
if (branch_sample_call_stack(leader))
4714+
if (intel_set_branch_counter_constr(leader, &num))
47024715
return -EINVAL;
4703-
if (branch_sample_counters(leader)) {
4704-
num++;
4705-
leader->hw.dyn_constraint &= x86_pmu.lbr_counters;
4706-
}
47074716
leader->hw.flags |= PERF_X86_EVENT_BRANCH_COUNTERS;
47084717

47094718
for_each_sibling_event(sibling, leader) {
4710-
if (branch_sample_call_stack(sibling))
4719+
if (intel_set_branch_counter_constr(sibling, &num))
4720+
return -EINVAL;
4721+
}
4722+
4723+
/* event isn't installed as a sibling yet. */
4724+
if (event != leader) {
4725+
if (intel_set_branch_counter_constr(event, &num))
47114726
return -EINVAL;
4712-
if (branch_sample_counters(sibling)) {
4713-
num++;
4714-
sibling->hw.dyn_constraint &= x86_pmu.lbr_counters;
4715-
}
47164727
}
47174728

47184729
if (num > fls(x86_pmu.lbr_counters))

0 commit comments

Comments
 (0)