From: James Clark <james.clark@linaro.org>
To: suzuki.poulose@arm.com, oliver.upton@linux.dev,
coresight@lists.linaro.org, kvmarm@lists.linux.dev
Cc: James Clark <james.clark@linaro.org>,
Marc Zyngier <maz@kernel.org>, Joey Gouly <joey.gouly@arm.com>,
Zenghui Yu <yuzenghui@huawei.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Mike Leach <mike.leach@linaro.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Mark Rutland <mark.rutland@arm.com>,
Anshuman Khandual <anshuman.khandual@arm.com>,
Fuad Tabba <tabba@google.com>, James Morse <james.morse@arm.com>,
Shiqi Liu <shiqiliu@hust.edu.cn>, Mark Brown <broonie@kernel.org>,
Raghavendra Rao Ananta <rananta@google.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v7 07/12] KVM: arm64: arm_spe: Give SPE enabled state to KVM
Date: Tue, 12 Nov 2024 10:37:06 +0000 [thread overview]
Message-ID: <20241112103717.589952-8-james.clark@linaro.org> (raw)
In-Reply-To: <20241112103717.589952-1-james.clark@linaro.org>
Currently in nVHE, KVM has to check if SPE is enabled on every guest
switch even if it was never used. Because it's a debug feature and is
more likely to not be used than used, give KVM the SPE buffer status to
allow a much simpler and faster do-nothing path in the hyp.
This is always called with preemption disabled except for probe/hotplug
which gets wrapped with preempt_disable().
Signed-off-by: James Clark <james.clark@linaro.org>
---
arch/arm64/include/asm/kvm_host.h | 6 ++++++
arch/arm64/kvm/debug.c | 29 +++++++++++++++++++++++++++++
drivers/perf/arm_spe_pmu.c | 13 +++++++++++--
3 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 5dfc3f4f74b2..7f1e32d40f0c 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -641,6 +641,8 @@ struct kvm_host_data {
struct {
/* Host CPU features, set at init */
u8 feats;
+ /* Host CPU state */
+ u8 state;
} flags;
/*
@@ -941,6 +943,8 @@ struct kvm_vcpu_arch {
#define HOST_FEAT_HAS_TRBE __kvm_single_flag(feats, BIT(1))
/* CPU has Feat_TRF */
#define HOST_FEAT_HAS_TRF __kvm_single_flag(feats, BIT(2))
+/* PMBLIMITR_EL1_E is set (SPE profiling buffer enabled) */
+#define HOST_STATE_SPE_EN __kvm_single_flag(state, BIT(0))
/* Pointer to the vcpu's SVE FFR for sve_{save,load}_state() */
#define vcpu_sve_pffr(vcpu) (kern_hyp_va((vcpu)->arch.sve_state) + \
@@ -1382,6 +1386,7 @@ static inline bool kvm_pmu_counter_deferred(struct perf_event_attr *attr)
void kvm_set_pmu_events(u64 set, struct perf_event_attr *attr);
void kvm_clr_pmu_events(u64 clr);
bool kvm_set_pmuserenr(u64 val);
+void kvm_set_pmblimitr(u64 pmblimitr);
#else
static inline void kvm_set_pmu_events(u64 set, struct perf_event_attr *attr) {}
static inline void kvm_clr_pmu_events(u64 clr) {}
@@ -1389,6 +1394,7 @@ static inline bool kvm_set_pmuserenr(u64 val)
{
return false;
}
+static inline void kvm_set_pmblimitr(u64 pmblimitr) {}
#endif
void kvm_vcpu_load_vhe(struct kvm_vcpu *vcpu);
diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c
index fb41ef5d9db9..ed3b4d057c52 100644
--- a/arch/arm64/kvm/debug.c
+++ b/arch/arm64/kvm/debug.c
@@ -335,3 +335,32 @@ void kvm_arm_clear_debug(struct kvm_vcpu *vcpu)
}
}
}
+
+static bool kvm_arm_skip_trace_state(void)
+{
+ /* pKVM hyp finds out the state for itself */
+ if (is_protected_kvm_enabled())
+ return true;
+
+ /* Make sure state gets there in one piece */
+ if (WARN_ON_ONCE(preemptible()))
+ return true;
+
+ return false;
+}
+
+void kvm_set_pmblimitr(u64 pmblimitr)
+{
+ /* Only read in nVHE */
+ if (has_vhe())
+ return;
+
+ if (kvm_arm_skip_trace_state())
+ return;
+
+ if (pmblimitr & PMBLIMITR_EL1_E)
+ host_data_set_flag(HOST_STATE_SPE_EN);
+ else
+ host_data_clear_flag(HOST_STATE_SPE_EN);
+}
+EXPORT_SYMBOL_GPL(kvm_set_pmblimitr);
diff --git a/drivers/perf/arm_spe_pmu.c b/drivers/perf/arm_spe_pmu.c
index 3569050f9cf3..6a79df363aa6 100644
--- a/drivers/perf/arm_spe_pmu.c
+++ b/drivers/perf/arm_spe_pmu.c
@@ -23,6 +23,7 @@
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/kernel.h>
+#include <linux/kvm_host.h>
#include <linux/list.h>
#include <linux/module.h>
#include <linux/of.h>
@@ -496,6 +497,12 @@ static u64 arm_spe_pmu_next_off(struct perf_output_handle *handle)
return limit;
}
+static void arm_spe_write_pmblimitr(u64 val)
+{
+ write_sysreg_s(val, SYS_PMBLIMITR_EL1);
+ kvm_set_pmblimitr(val);
+}
+
static void arm_spe_perf_aux_output_begin(struct perf_output_handle *handle,
struct perf_event *event)
{
@@ -524,7 +531,7 @@ static void arm_spe_perf_aux_output_begin(struct perf_output_handle *handle,
write_sysreg_s(base, SYS_PMBPTR_EL1);
out_write_limit:
- write_sysreg_s(limit, SYS_PMBLIMITR_EL1);
+ arm_spe_write_pmblimitr(limit);
}
static void arm_spe_perf_aux_output_end(struct perf_output_handle *handle)
@@ -552,7 +559,7 @@ static void arm_spe_pmu_disable_and_drain_local(void)
dsb(nsh);
/* Disable the profiling buffer */
- write_sysreg_s(0, SYS_PMBLIMITR_EL1);
+ arm_spe_write_pmblimitr(0);
isb();
}
@@ -1095,7 +1102,9 @@ static void __arm_spe_pmu_reset_local(void)
* This is probably overkill, as we have no idea where we're
* draining any buffered data to...
*/
+ preempt_disable();
arm_spe_pmu_disable_and_drain_local();
+ preempt_enable();
/* Reset the buffer base pointer */
write_sysreg_s(0, SYS_PMBPTR_EL1);
--
2.34.1
next prev parent reply other threads:[~2024-11-12 10:38 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-12 10:36 [PATCH v7 00/12] kvm/coresight: Support exclude guest and exclude host James Clark
2024-11-12 10:37 ` [PATCH v7 01/12] arm64/sysreg: Add a comment that the sysreg file should be sorted James Clark
2024-11-12 10:37 ` [PATCH v7 02/12] tools: arm64: Update sysreg.h header files James Clark
2024-11-12 10:37 ` [PATCH v7 03/12] arm64/sysreg/tools: Move TRFCR definitions to sysreg James Clark
2024-11-12 10:37 ` [PATCH v7 04/12] KVM: arm64: Make vcpu flag macros more generic James Clark
2024-11-18 9:00 ` Marc Zyngier
2024-11-18 9:22 ` James Clark
2024-11-12 10:37 ` [PATCH v7 05/12] KVM: arm64: Move SPE and TRBE flags to host data James Clark
2024-11-12 10:37 ` [PATCH v7 06/12] KVM: arm64: Add flag for FEAT_TRF James Clark
2024-11-12 10:37 ` James Clark [this message]
2024-11-20 9:16 ` [PATCH v7 07/12] KVM: arm64: arm_spe: Give SPE enabled state to KVM Oliver Upton
2024-11-20 9:43 ` James Clark
2024-11-12 10:37 ` [PATCH v7 08/12] KVM: arm64: Don't hit sysregs to see if SPE is enabled or not James Clark
2024-11-12 10:37 ` [PATCH v7 09/12] KVM: arm64: coresight: Give TRBE enabled state to KVM James Clark
2024-11-12 10:37 ` [PATCH v7 10/12] KVM: arm64: Don't hit sysregs to see if TRBE is enabled or not James Clark
2024-11-12 10:37 ` [PATCH v7 11/12] KVM: arm64: Swap TRFCR on guest switch James Clark
2024-11-20 17:31 ` Oliver Upton
2024-11-21 12:50 ` James Clark
2024-11-26 16:23 ` Oliver Upton
2024-11-27 10:08 ` James Clark
2024-11-12 10:37 ` [PATCH v7 12/12] coresight: Pass guest TRFCR value to KVM James Clark
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=20241112103717.589952-8-james.clark@linaro.org \
--to=james.clark@linaro.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=anshuman.khandual@arm.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=coresight@lists.linaro.org \
--cc=james.morse@arm.com \
--cc=joey.gouly@arm.com \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=mike.leach@linaro.org \
--cc=oliver.upton@linux.dev \
--cc=rananta@google.com \
--cc=shiqiliu@hust.edu.cn \
--cc=suzuki.poulose@arm.com \
--cc=tabba@google.com \
--cc=will@kernel.org \
--cc=yuzenghui@huawei.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®