mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Dapeng Mi <dapeng1.mi@linux.intel.com>
To: Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	Namhyung Kim <namhyung@kernel.org>,
	Ian Rogers <irogers@google.com>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Andi Kleen <ak@linux.intel.com>,
	Eranian Stephane <eranian@google.com>,
	Sandipan Das <sandipan.das@amd.com>,
	Andrii Nakryiko <andrii@kernel.org>, Song Liu <song@kernel.org>,
	Ravi Bangoria <ravi.bangoria@amd.com>,
	Ananth Narayan <ananth.narayan@amd.com>
Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
	bpf@vger.kernel.org, Dapeng Mi <dapeng1.mi@intel.com>,
	Zide Chen <zide.chen@intel.com>,
	Falcon Thomas <thomas.falcon@intel.com>,
	Xudong Hao <xudong.hao@intel.com>,
	Dapeng Mi <dapeng1.mi@linux.intel.com>,
	Sashiko <sashiko-bot@kernel.org>
Subject: [Patch v7 19/24] perf/x86/intel: Drain PEBS buffer for branch events with PEBS LBR users
Date: Wed, 18 Nov 2026 11:14:48 +0800	[thread overview]
Message-ID: <20261118031453.1353625-20-dapeng1.mi@linux.intel.com> (raw)
In-Reply-To: <20261118031453.1353625-1-dapeng1.mi@linux.intel.com>

If an event needs a branch stack while PEBS LBR users are active, the
PEBS buffer may get drained before the event's sample is output. The
drain overwrites the live LBR snapshot read by the PMI handler, so the
stale PEBS LBR stack is reported to userspace instead.

This can happen, for example, when:
- The event belongs to a SAMPLE_READ group that includes a PEBS event
  snapshotting the LBR stack, and a later perf_event_overflow() calls
  perf_output_read_group(), which drains the PEBS buffer via
  intel_pmu_read_event();
- The overflow triggers group throttling, disabling a PEBS LBR event and
  causing intel_pmu_disable_event() to drain the PEBS buffer before the
  live LBR snapshot is output.

Thus, drain the PEBS buffer whenever the overflowed event needs a branch
stack and PEBS LBR users are active.

Fixes: c22497f5838c ("perf/x86/intel: Support adaptive PEBS v4")
Reported-by: Sashiko <sashiko-bot@kernel.org>
Signed-off-by: Dapeng Mi <dapeng1.mi@linux.intel.com>
---
 arch/x86/events/intel/core.c | 54 ++++++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index 67275a873dba..ccd2c57931b3 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -4027,24 +4027,48 @@ static int handle_pmi_common(struct pt_regs *regs, u64 status)
 			continue;
 
 		/*
-		 * There may be unprocessed PEBS records in the PEBS buffer,
-		 * which still stores the previous values.
-		 * Process those records first before handling the latest value.
-		 * For example,
-		 * A is a regular counter
-		 * B is a PEBS event which reads A
-		 * C is a PEBS event
+		 * Drain any pending PEBS records before handling the overflow
+		 * for the event in two cases:
 		 *
-		 * The following can happen:
-		 * B-assist			A=1
-		 * C				A=2
-		 * B-assist			A=3
-		 * A-overflow-PMI		A=4
-		 * C-assist-PMI (PEBS buffer)	A=5
+		 * 1) The event belongs to a PEBS counter event group. Other
+		 *    PEBS events may record the previous count for this event.
+		 *    If those buffered PEBS records are processed only after
+		 *    intel_pmu_save_and_restart() updates the count, the counter
+		 *    value will be corrupted.
 		 *
-		 * The PEBS buffer has to be drained before handling the A-PMI
+		 *    Example:
+		 *    A = regular counter
+		 *    B = PEBS event that reads A
+		 *    C = PEBS event
+		 *
+		 *    Sequence:
+		 *    B-assist            A=1
+		 *    C                   A=2
+		 *    B-assist            A=3
+		 *    A-overflow-PMI      A=4
+		 *    C-assist-PMI (PEBS) A=5
+		 *
+		 *    Therefore, the PEBS buffer must be drained before handling
+		 *    the A overflow.
+		 *
+		 * 2) The event needs a branch stack, but active PEBS LBR users
+		 *    may drain the PEBS buffer and overwrite the live LBR
+		 *    snapshot updated by the PMI handler. This can happen,
+		 *    for example, when:
+		 *
+		 *    - the event belongs to a SAMPLE_READ group that includes
+		 *      a PEBS event which snapshots the LBR stack; a later
+		 *      perf_event_overflow() may call perf_output_read_group(),
+		 *      which drains the PEBS buffer via intel_pmu_read_event();
+		 *    - the overflow triggers group throttling, disabling a PEBS
+		 *      LBR event and causing intel_pmu_disable_event() to drain
+		 *      the PEBS buffer before the live LBR snapshot is output.
+		 *
+		 *    Therefore, drain the PEBS buffer whenever the event needs
+		 *    a branch stack and PEBS LBR users are active.
 		 */
-		if (is_pebs_counter_event_group(event))
+		if (is_pebs_counter_event_group(event) ||
+		    (has_branch_stack(event) && cpuc->lbr_pebs_users > 0))
 			intel_pmu_drain_pebs_buffer();
 
 		last_period = event->hw.last_period;
-- 
2.34.1


  parent reply	other threads:[~2026-11-18  3:24 UTC|newest]

Thread overview: 26+ 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  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  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 ` Dapeng Mi [this message]
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  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=20261118031453.1353625-20-dapeng1.mi@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=bpf@vger.kernel.org \
    --cc=dapeng1.mi@intel.com \
    --cc=eranian@google.com \
    --cc=irogers@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.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=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®