KVM: arm64: Add minimal handling for the ARMv8.7 PMU

When running a KVM guest hosted on an ARMv8.7 machine, the host
kernel complains that it doesn't know about the architected number
of events.

Fix it by adding the PMUver code corresponding to PMUv3 for ARMv8.7.

Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com>
Tested-by: Alexandru Elisei <alexandru.elisei@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20211126115533.217903-1-maz@kernel.org

diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
index 16b3f1a1d46888fce1cd0908ed4a091bf3404d92..615dd6278f8b5106cb8f6a4089acf3a6e7492942 100644 (file)
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -937,6 +937,7 @@
 #define ID_AA64DFR0_PMUVER_8_1         0x4
 #define ID_AA64DFR0_PMUVER_8_4         0x5
 #define ID_AA64DFR0_PMUVER_8_5         0x6
+#define ID_AA64DFR0_PMUVER_8_7         0x7
 #define ID_AA64DFR0_PMUVER_IMP_DEF     0xf
 
 #define ID_AA64DFR0_PMSVER_8_2         0x1

diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c
index a5e4bbf5e68f9afc5a5d415bdb4788329b96920e..ca92cc5c71c681a01ee7022b5723cff60dae4f05 100644 (file)
--- a/arch/arm64/kvm/pmu-emul.c
+++ b/arch/arm64/kvm/pmu-emul.c
@@ -28,6 +28,7 @@ static u32 kvm_pmu_event_mask(struct kvm *kvm)
        case ID_AA64DFR0_PMUVER_8_1:
        case ID_AA64DFR0_PMUVER_8_4:
        case ID_AA64DFR0_PMUVER_8_5:
+       case ID_AA64DFR0_PMUVER_8_7:
                return GENMASK(15, 0);
        default:                /* Shouldn't be here, just for sanity */
                WARN_ONCE(1, "Unknown PMU version %d\n", kvm->arch.pmuver);