[PATCH v4 2/2] KVM: arm64: Clear the default PMU when kvm_setup_vcpu() fails

[Suzuki K Poulose]

On 02/11/2026 07:58, Fuad Tabba wrote:
> Under KVM_ARM_VCPU_PMU_V3_STRICT, the VM has no PMU until userspace
> selects one, and initializing the PMU fails with -ENXIO until then.
> However, without STRICT, kvm_setup_vcpu() selects the default PMU
> before it prepares the vCPU for nested virtualization, and leaves it
> set when that preparation fails. After a retry with STRICT,
> initializing the PMU succeeds and the guest gets the PMU of the CPU
> the failed INIT ran on.
> 
> Drop the PMU and its number of counters along with the VM's feature
> bitmap. While KVM_ARCH_FLAG_VCPU_FEATURES_CONFIGURED is clear, no vCPU
> has been initialized and the PMU attributes return -ENODEV, so only
> such a failure can have set them. Once the flag is set, every INIT has the
> features of the first one that succeeded, which either selected a PMU
> or had none to select, so kvm_setup_vcpu() doesn't select another.
> 
> Fixes: ad220e275c398 ("KVM: arm64: Add KVM_ARM_VCPU_PMU_V3_STRICT vCPU feature")
> Signed-off-by: Fuad Tabba <fuad.tabba at linux.dev>
> ---
>   arch/arm64/kvm/arm.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
> index 3e91e01b032c4..65194e02cdbc2 100644
> --- a/arch/arm64/kvm/arm.c
> +++ b/arch/arm64/kvm/arm.c
> @@ -1857,9 +1857,12 @@ static int __kvm_vcpu_set_target(struct kvm_vcpu *vcpu,
>   
>   	ret = kvm_setup_vcpu(vcpu);
>   	if (ret) {
> -		/* Clear the bitmap if setup fails on the first vCPU to be initialized. */
> -		if (!test_bit(KVM_ARCH_FLAG_VCPU_FEATURES_CONFIGURED, &kvm->arch.flags))
> +		/* Clear the bitmap and PMU if setup fails on the first vCPU to be initialized. */
> +		if (!test_bit(KVM_ARCH_FLAG_VCPU_FEATURES_CONFIGURED, &kvm->arch.flags)) {
>   			bitmap_zero(kvm->arch.vcpu_features, KVM_VCPU_MAX_FEATURES);
> +			kvm->arch.arm_pmu = NULL;
> +			kvm->arch.nr_pmu_counters = 0;
> +		}

minor nit: While the above works, it looks a bit too much extracting the 
PMU details to arm.c. Alternatively we could do something like this:


diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c
index e2b28dbc0451..7a669cccf912 100644
--- a/arch/arm64/kvm/pmu-emul.c
+++ b/arch/arm64/kvm/pmu-emul.c
@@ -1088,6 +1088,11 @@ int kvm_arm_set_default_pmu(struct kvm *kvm)
         return 0;
  }

+int kvm_arm_clear_default_pmu(struct kvm *kvm)
+{
+       kvm_arm_set_pmu(kvm, NULL);
+}
+
diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h
index 6b4a118d17ca..571c0ba8507c 100644
--- a/include/kvm/arm_pmu.h
+++ b/include/kvm/arm_pmu.h
@@ -92,6 +92,7 @@ void kvm_vcpu_pmu_resync_el0(void);
  u8 kvm_arm_pmu_get_pmuver_limit(void);
  u64 kvm_pmu_evtyper_mask(struct kvm *kvm);
  int kvm_arm_set_default_pmu(struct kvm *kvm);
+int kvm_arm_clear_default_pmu(struct kvm *kvm);
  u8 kvm_arm_pmu_get_max_counters(struct kvm *kvm);

  u64 kvm_vcpu_read_pmcr(struct kvm_vcpu *vcpu);



Either ways,

Reviewed-by: Suzuki K Poulose <suzuki.poulose at arm.com