linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Oliver Upton <oliver.upton@linux.dev>
To: kvmarm@lists.linux.dev
Cc: Marc Zyngier <maz@kernel.org>, Joey Gouly <joey.gouly@arm.com>,
	Suzuki K Poulose <suzuki.poulose@arm.com>,
	Zenghui Yu <yuzenghui@huawei.com>,
	Mingwei Zhang <mizhang@google.com>,
	Colton Lewis <coltonlewis@google.com>,
	Raghavendra Rao Ananta <rananta@google.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Oliver Upton <oliver.upton@linux.dev>
Subject: [PATCH 05/18] KVM: arm64: Compute PMCEID from arm_pmu's event bitmaps
Date: Tue, 17 Dec 2024 13:20:35 -0800	[thread overview]
Message-ID: <20241217212048.3709204-6-oliver.upton@linux.dev> (raw)
In-Reply-To: <20241217212048.3709204-1-oliver.upton@linux.dev>

The PMUv3 driver populates a couple of bitmaps with the values of
PMCEID{0,1}, from which the guest's PMCEID{0,1} can be derived. This
is particularly convenient when virtualizing PMUv3 on IMP DEF hardware,
as reading the nonexistent PMCEID registers leads to a rather unpleasant
UNDEF.

Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
---
 arch/arm64/kvm/pmu-emul.c | 47 ++++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c
index 456102bc0b55..809d65b912e8 100644
--- a/arch/arm64/kvm/pmu-emul.c
+++ b/arch/arm64/kvm/pmu-emul.c
@@ -861,8 +861,42 @@ static struct arm_pmu *kvm_pmu_probe_armpmu(void)
 	return pmu;
 }
 
+static u64 __compute_pmceid(struct arm_pmu *pmu, bool pmceid1)
+{
+	u32 hi[2], lo[2];
+
+	bitmap_to_arr32(lo, pmu->pmceid_bitmap, ARMV8_PMUV3_MAX_COMMON_EVENTS);
+	bitmap_to_arr32(hi, pmu->pmceid_ext_bitmap, ARMV8_PMUV3_MAX_COMMON_EVENTS);
+
+	return ((u64)hi[pmceid1] << 32) | lo[pmceid1];
+}
+
+static u64 compute_pmceid0(struct arm_pmu *pmu)
+{
+	u64 val = __compute_pmceid(pmu, 0);
+
+	/* always support CHAIN */
+	val |= BIT(ARMV8_PMUV3_PERFCTR_CHAIN);
+	return val;
+}
+
+static u64 compute_pmceid1(struct arm_pmu *pmu)
+{
+	u64 val = __compute_pmceid(pmu, 1);
+
+	/*
+	 * Don't advertise STALL_SLOT*, as PMMIR_EL0 is handled
+	 * as RAZ
+	 */
+	val &= ~(BIT_ULL(ARMV8_PMUV3_PERFCTR_STALL_SLOT - 32) |
+		 BIT_ULL(ARMV8_PMUV3_PERFCTR_STALL_SLOT_FRONTEND - 32) |
+		 BIT_ULL(ARMV8_PMUV3_PERFCTR_STALL_SLOT_BACKEND - 32));
+	return val;
+}
+
 u64 kvm_pmu_get_pmceid(struct kvm_vcpu *vcpu, bool pmceid1)
 {
+	struct arm_pmu *cpu_pmu = vcpu->kvm->arch.arm_pmu;
 	unsigned long *bmap = vcpu->kvm->arch.pmu_filter;
 	u64 val, mask = 0;
 	int base, i, nr_events;
@@ -871,19 +905,10 @@ u64 kvm_pmu_get_pmceid(struct kvm_vcpu *vcpu, bool pmceid1)
 		return 0;
 
 	if (!pmceid1) {
-		val = read_sysreg(pmceid0_el0);
-		/* always support CHAIN */
-		val |= BIT(ARMV8_PMUV3_PERFCTR_CHAIN);
+		val = compute_pmceid0(cpu_pmu);
 		base = 0;
 	} else {
-		val = read_sysreg(pmceid1_el0);
-		/*
-		 * Don't advertise STALL_SLOT*, as PMMIR_EL0 is handled
-		 * as RAZ
-		 */
-		val &= ~(BIT_ULL(ARMV8_PMUV3_PERFCTR_STALL_SLOT - 32) |
-			 BIT_ULL(ARMV8_PMUV3_PERFCTR_STALL_SLOT_FRONTEND - 32) |
-			 BIT_ULL(ARMV8_PMUV3_PERFCTR_STALL_SLOT_BACKEND - 32));
+		val = compute_pmceid1(cpu_pmu);
 		base = 32;
 	}
 
-- 
2.39.5



  parent reply	other threads:[~2024-12-17 21:27 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-17 21:20 [PATCH 00/18] KVM: arm64: Support FEAT_PMUv3 on Apple hardware Oliver Upton
2024-12-17 21:20 ` [PATCH 01/18] drivers/perf: apple_m1: Refactor event select/filter configuration Oliver Upton
2024-12-17 21:20 ` [PATCH 02/18] drivers/perf: apple_m1: Support host/guest event filtering Oliver Upton
2024-12-17 21:20 ` [PATCH 03/18] drivers/perf: apple_m1: Map generic branch events Oliver Upton
2024-12-17 21:20 ` [PATCH 04/18] drivers/perf: apple_m1: Provide helper for mapping PMUv3 events Oliver Upton
2024-12-17 21:20 ` Oliver Upton [this message]
2024-12-17 21:20 ` [PATCH 06/18] KVM: arm64: Always support SW_INCR PMU event Oliver Upton
2024-12-17 21:20 ` [PATCH 07/18] KVM: arm64: Remap PMUv3 events onto hardware Oliver Upton
2024-12-17 21:20 ` [PATCH 08/18] KVM: arm64: Use a cpucap to determine if system supports FEAT_PMUv3 Oliver Upton
2024-12-17 21:20 ` [PATCH 09/18] KVM: arm64: Drop kvm_arm_pmu_available static key Oliver Upton
2024-12-18 23:23   ` kernel test robot
2024-12-17 21:20 ` [PATCH 10/18] KVM: arm64: Use guard() to cleanup usage of arm_pmus_lock Oliver Upton
2024-12-17 21:20 ` [PATCH 11/18] KVM: arm64: Move PMUVer filtering into KVM code Oliver Upton
2024-12-17 21:20 ` [PATCH 12/18] KVM: arm64: Compute synthetic sysreg ESR for Apple PMUv3 traps Oliver Upton
2024-12-17 21:20 ` [PATCH 13/18] KVM: arm64: Advertise PMUv3 if IMPDEF traps are present Oliver Upton
2024-12-17 21:22 ` [PATCH 14/18] KVM: arm64: Advertise 0 event counters for IMPDEF PMU Oliver Upton
2024-12-17 21:22 ` [PATCH 15/18] arm64: Enable IMP DEF PMUv3 traps on Apple M2 Oliver Upton
2024-12-17 21:23 ` [RFC PATCH 16/18] drivers/perf: apple_m1: Map a few more PMUv3 events Oliver Upton
2024-12-17 21:23 ` [RFC PATCH 17/18] KVM: arm64: Provide 1 event counter on IMPDEF hardware Oliver Upton
2024-12-17 21:23 ` [HACK PATCH 18/18] KVM: arm64: selftests: Add test for probing PMUv3 sysregs Oliver Upton
2024-12-21 13:45 ` [PATCH 00/18] KVM: arm64: Support FEAT_PMUv3 on Apple hardware Janne Grunau
2024-12-21 22:00   ` Oliver Upton
2025-01-08 12:38 ` Will Deacon
2025-01-08 20:14   ` Oliver Upton
2025-01-08 21:26     ` Marc Zyngier
2025-01-08 23:06       ` [PATCH 00/18] KVM: arm64: Support FEAT_PMUv3 on Apple hardware\ Oliver Upton
2025-01-10 16:22 ` [PATCH 00/18] KVM: arm64: Support FEAT_PMUv3 on Apple hardware Will Deacon

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=20241217212048.3709204-6-oliver.upton@linux.dev \
    --to=oliver.upton@linux.dev \
    --cc=catalin.marinas@arm.com \
    --cc=coltonlewis@google.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=mizhang@google.com \
    --cc=rananta@google.com \
    --cc=suzuki.poulose@arm.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;
as well as URLs for NNTP newsgroup(s).