Commit c854188e authored Mar 02, 2020 by Andrew Murray Committed by Will Deacon Mar 17, 2020

KVM: arm64: limit PMU version to PMUv3 for ARMv8.1



We currently expose the PMU version of the host to the guest via
emulation of the DFR0_EL1 and AA64DFR0_EL1 debug feature registers.
However many of the features offered beyond PMUv3 for 8.1 are not
supported in KVM. Examples of this include support for the PMMIR
registers (added in PMUv3 for ARMv8.4) and 64-bit event counters
added in (PMUv3 for ARMv8.5).

Let's trap the Debug Feature Registers in order to limit
PMUVer/PerfMon in the Debug Feature Registers to PMUv3 for ARMv8.1
to avoid unexpected behaviour.

Both ID_AA64DFR0.PMUVer and ID_DFR0.PerfMon follow the "Alternative ID
scheme used for the Performance Monitors Extension version" where 0xF
means an IMPLEMENTATION DEFINED PMU is implemented, and values 0x0-0xE
are treated as with an unsigned field (with 0x0 meaning no PMU is
present). As we don't expect to expose an IMPLEMENTATION DEFINED PMU,
and our cap is below 0xF, we can treat these fields as unsigned when
applying the cap.

Signed-off-by: Andrew Murray <andrew.murray@arm.com>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
[Mark: make field names consistent, use perfmon cap]
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>

parent 8e35aa64

arch/arm64/include/asm/sysreg.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -702,6 +702,12 @@
		#define ID_AA64DFR0_TRACEVER_SHIFT 4
		#define ID_AA64DFR0_DEBUGVER_SHIFT 0

		#define ID_AA64DFR0_PMUVER_8_1 0x4

		#define ID_DFR0_PERFMON_SHIFT 24

		#define ID_DFR0_PERFMON_8_1 0x4

		#define ID_ISAR5_RDM_SHIFT 24
		#define ID_ISAR5_CRC32_SHIFT 16
		#define ID_ISAR5_SHA2_SHIFT 12

arch/arm64/kvm/sys_regs.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -1085,6 +1085,16 @@ static u64 read_id_reg(const struct kvm_vcpu *vcpu,
		(0xfUL << ID_AA64ISAR1_API_SHIFT) \|
		(0xfUL << ID_AA64ISAR1_GPA_SHIFT) \|
		(0xfUL << ID_AA64ISAR1_GPI_SHIFT));
		} else if (id == SYS_ID_AA64DFR0_EL1) {
		/* Limit guests to PMUv3 for ARMv8.1 */
		val = cpuid_feature_cap_perfmon_field(val,
		ID_AA64DFR0_PMUVER_SHIFT,
		ID_AA64DFR0_PMUVER_8_1);
		} else if (id == SYS_ID_DFR0_EL1) {
		/* Limit guests to PMUv3 for ARMv8.1 */
		val = cpuid_feature_cap_perfmon_field(val,
		ID_DFR0_PERFMON_SHIFT,
		ID_DFR0_PERFMON_8_1);
		}

		return val;

Admin message