From: "tip-bot2 for Fernand Sieber" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: jschoenh@amazon.de, Peter Zijlstra <peterz@infradead.org>,
Fernand Sieber <sieberf@amazon.com>, <stable@vger.kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: perf/urgent] perf/x86/intel: Do not enable BTS for guests
Date: Wed, 21 Jan 2026 15:50:23 -0000 [thread overview]
Message-ID: <176901062386.510.18286224975679497732.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20251211183604.868641-1-sieberf@amazon.com>
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 91dcfae0ff2b9b9ab03c1ec95babaceefbffb9f4
Gitweb: https://git.kernel.org/tip/91dcfae0ff2b9b9ab03c1ec95babaceefbffb9f4
Author: Fernand Sieber <sieberf@amazon.com>
AuthorDate: Thu, 11 Dec 2025 20:36:04 +02:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 21 Jan 2026 16:28:59 +01:00
perf/x86/intel: Do not enable BTS for guests
By default when users program perf to sample branch instructions
(PERF_COUNT_HW_BRANCH_INSTRUCTIONS) with a sample period of 1, perf
interprets this as a special case and enables BTS (Branch Trace Store)
as an optimization to avoid taking an interrupt on every branch.
Since BTS doesn't virtualize, this optimization doesn't make sense when
the request originates from a guest. Add an additional check that
prevents this optimization for virtualized events (exclude_host).
Reported-by: Jan H. Schönherr <jschoenh@amazon.de>
Suggested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Fernand Sieber <sieberf@amazon.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: <stable@vger.kernel.org>
Link: https://patch.msgid.link/20251211183604.868641-1-sieberf@amazon.com
---
arch/x86/events/perf_event.h | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h
index 6296302..ad35c54 100644
--- a/arch/x86/events/perf_event.h
+++ b/arch/x86/events/perf_event.h
@@ -1574,13 +1574,22 @@ static inline bool intel_pmu_has_bts_period(struct perf_event *event, u64 period
struct hw_perf_event *hwc = &event->hw;
unsigned int hw_event, bts_event;
- if (event->attr.freq)
+ /*
+ * Only use BTS for fixed rate period==1 events.
+ */
+ if (event->attr.freq || period != 1)
+ return false;
+
+ /*
+ * BTS doesn't virtualize.
+ */
+ if (event->attr.exclude_host)
return false;
hw_event = hwc->config & INTEL_ARCH_EVENT_MASK;
bts_event = x86_pmu.event_map(PERF_COUNT_HW_BRANCH_INSTRUCTIONS);
- return hw_event == bts_event && period == 1;
+ return hw_event == bts_event;
}
static inline bool intel_pmu_has_bts(struct perf_event *event)
prev parent reply other threads:[~2026-01-21 15:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-01 14:23 [PATCH] KVM: x86/pmu: Do not accidentally create BTS events Fernand Sieber
2025-12-01 14:45 ` Woodhouse, David
2025-12-02 9:35 ` Peter Zijlstra
2025-12-02 9:59 ` Fernand Sieber
2025-12-02 2:19 ` Like Xu
2025-12-02 10:03 ` Peter Zijlstra
2025-12-02 12:44 ` Peter Zijlstra
2025-12-02 16:03 ` Sean Christopherson
2025-12-10 10:11 ` Fernand Sieber
2025-12-10 11:16 ` Peter Zijlstra
2025-12-11 18:36 ` [PATCH v2] perf/x86/intel: Do not enable BTS for guests Fernand Sieber
2026-01-14 17:25 ` David Woodhouse
2026-01-21 13:57 ` Fernand Sieber
2026-01-21 15:31 ` Peter Zijlstra
2026-01-21 15:50 ` tip-bot2 for Fernand Sieber [this message]
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=176901062386.510.18286224975679497732.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=jschoenh@amazon.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=sieberf@amazon.com \
--cc=stable@vger.kernel.org \
--cc=x86@kernel.org \
/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®