[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20180114102713.GB6166@worktop.programming.kicks-ass.net>
Date: Sun, 14 Jan 2018 11:27:13 +0100
From: Peter Zijlstra <peterz@...radead.org>
To: Thomas Gleixner <tglx@...utronix.de>
Cc: linux-kernel@...r.kernel.org, Vince Weaver <vince@...ter.net>,
torvalds@...ux-foundation.org, robert@...ecki.net,
luto@...capital.net, mingo@...nel.org, hughd@...gle.com,
greg@...ah.com,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Subject: [PATCH] x86,perf: Disable intel_bts when PTI
The intel_bts driver does not use the 'normal' BTS buffer we allocated
space for in the cpu_entry_area but instead uses the memory allocated
for the perf AUX buffer.
This obviously comes apart when using PTI because then the kernel
mapping; which includes that AUX buffer memory; disappears.
For now disable this driver when PTI is enabled, we'll try and sort
something out later.
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Reported-by: Vince Weaver <vincent.weaver@...ne.edu>
Reported-by: Robert Święcki <robert@...ecki.net>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
---
arch/x86/events/intel/bts.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/arch/x86/events/intel/bts.c b/arch/x86/events/intel/bts.c
index 141e07b06216..24ffa1e88cf9 100644
--- a/arch/x86/events/intel/bts.c
+++ b/arch/x86/events/intel/bts.c
@@ -582,6 +582,24 @@ static __init int bts_init(void)
if (!boot_cpu_has(X86_FEATURE_DTES64) || !x86_pmu.bts)
return -ENODEV;
+ if (boot_cpu_has(X86_FEATURE_PTI)) {
+ /*
+ * BTS hardware writes through a virtual memory map we must
+ * either use the kernel physical map, or the user mapping of
+ * the AUX buffer.
+ *
+ * However, since this driver supports per-CPU and per-task inherit
+ * we cannot use the user mapping since it will not be availble
+ * if we're not running the owning process.
+ *
+ * With PTI we can't use the kernal map either, because its not
+ * there when we run userspace.
+ *
+ * For now, disable this driver when using PTI.
+ */
+ return -ENODEV;
+ }
+
bts_pmu.capabilities = PERF_PMU_CAP_AUX_NO_SG | PERF_PMU_CAP_ITRACE |
PERF_PMU_CAP_EXCLUSIVE;
bts_pmu.task_ctx_nr = perf_sw_context;
Powered by blists - more mailing lists