mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Mi, Dapeng" <dapeng1.mi@linux.intel.com>
To: bot+bpf-ci@kernel.org, peterz@infradead.org, mingo@redhat.com,
	acme@kernel.org, namhyung@kernel.org, irogers@google.com,
	adrian.hunter@intel.com, alexander.shishkin@linux.intel.com,
	ak@linux.intel.com, eranian@google.com, sandipan.das@amd.com,
	andrii@kernel.org, song@kernel.org, ravi.bangoria@amd.com,
	ananth.narayan@amd.com
Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
	bpf@vger.kernel.org, dapeng1.mi@intel.com, zide.chen@intel.com,
	thomas.falcon@intel.com, xudong.hao@intel.com,
	sashiko-bot@kernel.org, ast@kernel.org, daniel@iogearbox.net,
	martin.lau@kernel.org, eddyz87@gmail.com,
	yonghong.song@linux.dev, mason@kernel.org,
	ihor.solodrai@linux.dev
Subject: Re: [Patch v7 04/24] perf/x86/intel: Limit branch snapshots to valid entries
Date: Wed, 18 Nov 2026 14:01:54 +0800	[thread overview]
Message-ID: <a4decd8d-0eb4-41f8-b106-446ab6d3d4df@linux.intel.com> (raw)
In-Reply-To: <61848b4bb02d2dcb5f78b813f31a4f395805c864c1152c52374abc2ca1a1ff51@mail.kernel.org>


On 11/18/2026 12:10 PM, bot+bpf-ci@kernel.org wrote:
>> perf/x86/intel: Limit branch snapshots to valid entries
> TL;DR: Resetting the shared lbr_stack.nr in intel_pmu_lbr_read() may corrupt
> an in-flight host adaptive-PEBS branch-stack sample when KVM vLBR is active
> and a BPF program calls bpf_get_branch_snapshot(); a later patch fixes it.
>
>> diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c
>> --- a/arch/x86/events/intel/lbr.c
>> +++ b/arch/x86/events/intel/lbr.c
> [ ... ]
>
>> @@ -1026,14 +1026,19 @@ void intel_pmu_lbr_read(void)
>>  {
>>  	struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
>>  
>> +	if (!cpuc->lbr_users || vlbr_exclude_host()) {
>> +		/* Reset lbr_stack.nr to prevent stale data leakage. */
>> +		cpuc->lbr_stack.nr = 0;
>> +		return;
>> +	}
>> +
> Can this reset of cpuc->lbr_stack.nr corrupt a host adaptive-PEBS sample
> that is still in flight?
>
> Before this patch the vlbr_exclude_host() case returned without writing
> anything.  Now the BPF snapshot path writes to the same per-CPU struct
> that a PMI-time sample may still point at:
>
> intel_pmu_handle_irq()
>   handle_pmi_common() -> x86_pmu_drain_pebs
>     __intel_pmu_pebs_last_event()
>       setup_pebs_adaptive_sample_data()
>         intel_pmu_store_pebs_lbrs(lbr)   /* cpuc->lbr_stack.nr = N */
>         intel_pmu_lbr_save_brstack()
>           perf_sample_save_brstack()     /* data->dyn_size += N entries */
>                                          /* data->br_stack = &cpuc->lbr_stack */
>       perf_event_overflow()
>         __perf_event_overflow()
>           bpf_overflow_handler()
>             BPF prog -> bpf_get_branch_snapshot()
>               __intel_pmu_snapshot_branch_stack()
>                 intel_pmu_lbr_read()     /* vlbr_exclude_host(): nr = 0 */
>           overflow_handler() -> perf_output_sample()
>             perf_output_put(handle, data->br_stack->nr);       /* now 0 */
>             perf_output_copy(handle, data->br_stack->entries, ...);
>
> The record header was sized for N branch entries, but nr is now 0 and no
> entries are written, so the PEBS LBR data for that sample is lost and the
> tail of the record is never written.
>
> This looks reachable when KVM's vLBR event is active (it sets
> INTEL_PMC_IDX_FIXED_VLBR in intel_ctrl_exclude_host_mask) alongside a host
> PEBS event using PERF_SAMPLE_BRANCH_STACK, with a perf_event BPF program
> calling bpf_get_branch_snapshot().  Before this patch the same sequence
> produced a consistent sample.
>
> The !cpuc->lbr_users half of the condition does not look affected, since
> any event whose sample references cpuc->lbr_stack is counted in lbr_users.
>
> The series appears to fix this later in 61909a79de63 ("perf/x86/intel:
> Use a dedicated LBR stack for BPF snapshotting"), where
> intel_pmu_lbr_read() takes the stack to fill as a parameter.  Is it worth
> avoiding the shared-stack write in this patch, so that the intermediate
> commit does not have this window?

Yeah, the patch order can be refined. But I'm not sure if it's worthy to
post a new version just for the patch sequence. Anyway, I would refine this
patch order if there is a new version. Thanks.


>
>>  	/*
>>  	 * Don't read when all LBRs users are using adaptive PEBS.
>>  	 *
> ---
> AI reviewed your patch. Please fix the bug or email reply why it's not a bug.
> See: https://github.com/kernel-patches/vmtest/blob/master/ci/claude/README.md
>
> CI run summary: https://github.com/kernel-patches/bpf/actions/runs/44231525404

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

Thread overview: 31+ 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 [this message]
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: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  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=a4decd8d-0eb4-41f8-b106-446ab6d3d4df@linux.intel.com \
    --to=dapeng1.mi@linux.intel.com \
    --cc=acme@kernel.org \
    --cc=adrian.hunter@intel.com \
    --cc=ak@linux.intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=ananth.narayan@amd.com \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bot+bpf-ci@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=dapeng1.mi@intel.com \
    --cc=eddyz87@gmail.com \
    --cc=eranian@google.com \
    --cc=ihor.solodrai@linux.dev \
    --cc=irogers@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=martin.lau@kernel.org \
    --cc=mason@kernel.org \
    --cc=mingo@redhat.com \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=ravi.bangoria@amd.com \
    --cc=sandipan.das@amd.com \
    --cc=sashiko-bot@kernel.org \
    --cc=song@kernel.org \
    --cc=thomas.falcon@intel.com \
    --cc=xudong.hao@intel.com \
    --cc=yonghong.song@linux.dev \
    --cc=zide.chen@intel.com \
    /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

all inboxes | Powered by JetHome®