diff options
| author | Oliver Upton <oliver.upton@linux.dev> | 2023-09-20 19:50:30 +0000 |
|---|---|---|
| committer | Oliver Upton <oliver.upton@linux.dev> | 2023-09-21 18:13:28 +0000 |
| commit | 9116db11feb521d9eaa850d3a6a8b713f59c6971 (patch) | |
| tree | 1a04dfc7d9fbbe4399a9dbcbf29cd99b0f51a90b /arch/arm64/kvm/arm.c | |
| parent | ef150908b6bd80a54126dbec324bd63a24a5628a (diff) | |
KVM: arm64: Hoist PMUv3 check into KVM_ARM_VCPU_INIT ioctl handler
Test that the system supports PMUv3 before ever getting to
kvm_reset_vcpu().
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Link: https://lore.kernel.org/r/20230920195036.1169791-3-oliver.upton@linux.dev
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
Diffstat (limited to 'arch/arm64/kvm/arm.c')
| -rw-r--r-- | arch/arm64/kvm/arm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 8b5094343f84..18cbd3c9a4d7 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1197,6 +1197,9 @@ static unsigned long system_supported_vcpu_features(void) if (!cpus_have_final_cap(ARM64_HAS_32BIT_EL1)) clear_bit(KVM_ARM_VCPU_EL1_32BIT, &features); + if (!kvm_arm_support_pmu_v3()) + clear_bit(KVM_ARM_VCPU_PMU_V3, &features); + return features; } |