Skip to content

Commit ed1f5c1

Browse files
Dapeng Migregkh
authored andcommitted
perf/x86/intel: Add missing branch counters constraint apply
commit 1d07bbd7ea36ea0b8dfa8068dbe67eb3a32d9590 upstream. 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 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 560ec8f commit ed1f5c1

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
@@ -4224,6 +4224,19 @@ static inline void intel_pmu_set_acr_caused_constr(struct perf_event *event,
42244224
event->hw.dyn_constraint &= hybrid(event->pmu, acr_cause_mask64);
42254225
}
42264226

4227+
static inline int intel_set_branch_counter_constr(struct perf_event *event,
4228+
int *num)
4229+
{
4230+
if (branch_sample_call_stack(event))
4231+
return -EINVAL;
4232+
if (branch_sample_counters(event)) {
4233+
(*num)++;
4234+
event->hw.dyn_constraint &= x86_pmu.lbr_counters;
4235+
}
4236+
4237+
return 0;
4238+
}
4239+
42274240
static int intel_pmu_hw_config(struct perf_event *event)
42284241
{
42294242
int ret = x86_pmu_hw_config(event);
@@ -4283,21 +4296,19 @@ static int intel_pmu_hw_config(struct perf_event *event)
42834296
* group, which requires the extra space to store the counters.
42844297
*/
42854298
leader = event->group_leader;
4286-
if (branch_sample_call_stack(leader))
4299+
if (intel_set_branch_counter_constr(leader, &num))
42874300
return -EINVAL;
4288-
if (branch_sample_counters(leader)) {
4289-
num++;
4290-
leader->hw.dyn_constraint &= x86_pmu.lbr_counters;
4291-
}
42924301
leader->hw.flags |= PERF_X86_EVENT_BRANCH_COUNTERS;
42934302

42944303
for_each_sibling_event(sibling, leader) {
4295-
if (branch_sample_call_stack(sibling))
4304+
if (intel_set_branch_counter_constr(sibling, &num))
4305+
return -EINVAL;
4306+
}
4307+
4308+
/* event isn't installed as a sibling yet. */
4309+
if (event != leader) {
4310+
if (intel_set_branch_counter_constr(event, &num))
42964311
return -EINVAL;
4297-
if (branch_sample_counters(sibling)) {
4298-
num++;
4299-
sibling->hw.dyn_constraint &= x86_pmu.lbr_counters;
4300-
}
43014312
}
43024313

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

0 commit comments

Comments
 (0)