BPF List
 help / color / mirror / Atom feed
From: "Mi, Dapeng" <dapeng1.mi@linux.intel.com>
To: sashiko-reviews@lists.linux.dev
Cc: linux-perf-users@vger.kernel.org, bpf@vger.kernel.org
Subject: Re: [Patch v7 15/24] perf/x86/intel: Set PERF_EV_CAP_SIBLING for pure branch counter events
Date: Wed, 18 Nov 2026 14:32:22 +0800	[thread overview]
Message-ID: <f51611e9-692a-4a0f-a01e-084237814ece@linux.intel.com> (raw)
In-Reply-To: <sashiko-outbox-220065@kernel.org>


On 11/18/2026 12:05 PM, sashiko-bot@kernel.org wrote:
> Thank you for your contribution! Sashiko AI review found 1 potential
> issue to consider:
> - [Medium] perf/x86/intel: incomplete group detach handling in
>   intel_pmu_hw_config()
> --
>
> commit 2f6a2a62d0ff0bf2794f702072c776c06e629ff3
> Author: Dapeng Mi <dapeng1.mi@linux.intel.com>
>
> perf/x86/intel: Set PERF_EV_CAP_SIBLING for pure branch counter events
>
> This commit sets PERF_EV_CAP_SIBLING on pure branch counter events in
> intel_pmu_hw_config() so that the perf core schedules them out if the
> group leader is detached.
>
>> diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
>> index 84b134bb91eea..fd4de141ef281 100644
>> --- a/arch/x86/events/intel/core.c
>> +++ b/arch/x86/events/intel/core.c
>> @@ -5130,10 +5130,17 @@ static int intel_pmu_hw_config(struct perf_event *event)
>>  		 * require any branch stack setup.
>>  		 * Clear the bit to avoid unnecessary branch stack setup.
>>  		 */
>> -		if (0 == (event->attr.branch_sample_type &
>> -			  ~(PERF_SAMPLE_BRANCH_PLM_ALL |
>> -			    PERF_SAMPLE_BRANCH_COUNTERS)))
>> -			event->hw.flags  &= ~PERF_X86_EVENT_NEEDS_BRANCH_STACK;
>> +		if (!(event->attr.branch_sample_type &
>> +		      ~(PERF_SAMPLE_BRANCH_PLM_ALL | PERF_SAMPLE_BRANCH_COUNTERS))) {
>> +			event->hw.flags &= ~PERF_X86_EVENT_NEEDS_BRANCH_STACK;
>> +			/*
>> +			 * A pure branch counter event doesn't set up the LBR
>> +			 * itself. It must stay grouped with a normal branch
>> +			 * event which configures the LBR for it. Otherwise,
>> +			 * the LBR cannot be configured correctly.
>> +			 */
>> +			event->event_caps |= PERF_EV_CAP_SIBLING;
>> +		}
>>  
>>  		/*
>>  		 * Force the leader to be a LBR event. So LBRs can be reset
> [Severity: Medium]
> What happens on group detach when a branch counter sibling has other
> branch_sample_type filter bits set alongside PERF_SAMPLE_BRANCH_COUNTERS?
>
> First, a counting sibling in PERF_SAMPLE_READ mode with a branch filter
> (such as PERF_SAMPLE_BRANCH_ANY | PERF_SAMPLE_BRANCH_COUNTERS, which
> "perf record -e '{e1,e2}:S' -j any,counter" configures) skips setting
> PERF_X86_EVENT_NEEDS_BRANCH_STACK earlier in intel_pmu_hw_config():
>
> arch/x86/events/intel/core.c:intel_pmu_hw_config() {
> 	if (needs_branch_stack(event)) {
> 		/* Avoid branch stack setup for counting events in SAMPLE READ */
> 		if (is_sampling_event(event) ||
> 		    !(event->attr.sample_type & PERF_SAMPLE_READ))
> 			event->hw.flags |= PERF_X86_EVENT_NEEDS_BRANCH_STACK;
> 	}
> }
>
> Because branch_sample_type contains PERF_SAMPLE_BRANCH_ANY, the condition
> here is false and PERF_EV_CAP_SIBLING is not set either.  If the group
> leader is closed, perf_group_detach() promotes this sibling to a
> standalone leader that stays scheduled with ARCH_PERFMON_EVENTSEL_BR_CNTR
> enabled in hardware without LBR configured.

Yeah, it's an issue, but not introduced by this patchset. It needs a
separate fix.


>
> Second, for a sampling sibling that retains
> PERF_X86_EVENT_NEEDS_BRANCH_STACK and has PERF_SAMPLE_BRANCH_COUNTERS set,
> intel_pmu_hw_config() only sets PERF_X86_EVENT_BRANCH_COUNTERS on
> leader->hw.flags and not on event->hw.flags.  When the original leader is
> closed and perf_promote_sibling_to_leader() sets sibling->group_leader =
> sibling, is_branch_counters_group(sibling) becomes false, so
> intel_pmu_lbr_save_brstack() skips intel_pmu_lbr_counters_reorder() and
> intel_pmu_lbr_del() skips intel_pmu_lbr_reset().

Ditto. 


>

  reply	other threads:[~2026-11-18  6:32 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-18  3:14 [Patch v7 00/24] perf/x86: Fix multiple LBR sampling issues Dapeng Mi
2026-11-18  3:14 ` [Patch v7 01/24] perf/x86: Disable LBR if x86_pmu.lbr_nr exceeds MAX_LBR_ENTRIES Dapeng Mi
2026-11-18  3:14 ` [Patch v7 02/24] perf/x86/intel: Validate LBR XSAVE state before updating LBR stack Dapeng Mi
2026-11-18  3:14 ` [Patch v7 03/24] perf/x86/amd/lbr: Limit branch snapshots to valid entries Dapeng Mi
2026-11-18  3:14 ` [Patch v7 04/24] perf/x86/intel: " Dapeng Mi
2026-11-18  4:10   ` bot+bpf-ci
2026-11-18  6:01     ` Mi, Dapeng
2026-11-18  3:14 ` [Patch v7 05/24] perf/x86: Add lbr_enabled to track LBR state Dapeng Mi
2026-11-18  3:14 ` [Patch v7 06/24] perf/x86/amd: Avoid re-enabling PMU and LBR for BPF when disabled Dapeng Mi
2026-11-18  3:43   ` sashiko-bot
2026-11-18  3:14 ` [Patch v7 07/24] perf/x86/intel: Add helper to enable PMU without LBR Dapeng Mi
2026-11-18  3:14 ` [Patch v7 08/24] perf/x86/intel: Avoid re-enabling PMU and LBR for BPF when disabled Dapeng Mi
2026-11-18  3:14 ` [Patch v7 09/24] perf/x86/intel: Keep LBR frozen throughout PMI handling Dapeng Mi
2026-11-18  3:14 ` [Patch v7 10/24] perf: Add counted-bounds tracking for perf_branch_stack Dapeng Mi
2026-11-18  3:14 ` [Patch v7 11/24] perf/x86/intel: Allow LBR read helpers to operate on explicit stacks Dapeng Mi
2026-11-18  3:14 ` [Patch v7 12/24] perf/x86/intel: Use a dedicated LBR stack for BPF snapshotting Dapeng Mi
2026-11-18  3:14 ` [Patch v7 13/24] perf/x86/intel: Always snapshot live hardware LBR state for BPF Dapeng Mi
2026-11-18  3:14 ` [Patch v7 14/24] perf/x86/intel: Account lbr_pebs_users for arch-PEBS events Dapeng Mi
2026-11-18  4:10   ` bot+bpf-ci
2026-11-18  6:28     ` Mi, Dapeng
2026-11-18  3:14 ` [Patch v7 15/24] perf/x86/intel: Set PERF_EV_CAP_SIBLING for pure branch counter events Dapeng Mi
2026-11-18  4:05   ` sashiko-bot
2026-11-18  6:32     ` Mi, Dapeng [this message]
2026-11-18  3:14 ` [Patch v7 16/24] perf/x86/intel: Account LBR user counts " Dapeng Mi
2026-11-18  3:14 ` [Patch v7 17/24] perf/x86/intel: Refresh LBR stack for non-PEBS LBR events when needed Dapeng Mi
2026-11-18  3:14 ` [Patch v7 18/24] perf/x86/intel: Fix draining of un-overflowed PEBS buffer in PMI handler Dapeng Mi
2026-11-18  3:14 ` [Patch v7 19/24] perf/x86/intel: Drain PEBS buffer for branch events with PEBS LBR users Dapeng Mi
2026-11-18  3:14 ` [Patch v7 20/24] perf/x86/intel: Clear raw LBR counters in the LBR stack Dapeng Mi
2026-11-18  3:54   ` bot+bpf-ci
2026-11-18  6:48     ` Mi, Dapeng
2026-11-18  3:14 ` [Patch v7 21/24] perf/x86/intel: Refresh LBR stack for LBR counter events in PMI handler Dapeng Mi
2026-11-18  3:14 ` [Patch v7 22/24] perf/x86/intel: Pass LBR stack size into intel_pmu_store_lbr() Dapeng Mi
2026-11-18  3:14 ` [Patch v7 23/24] perf/core: Don't mutate shared branch stack depth Dapeng Mi
2026-11-18  3:14 ` [Patch v7 24/24] perf/x86/intel: Fix incorrect PERF_METRICS overflow bit clearing Dapeng Mi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f51611e9-692a-4a0f-a01e-084237814ece@linux.intel.com \
    --to=dapeng1.mi@linux.intel.com \
    --cc=bpf@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=sashiko-reviews@lists.linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox