1 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c
index f16a5f8ff2b4..e2a0500cd7a2 100644
--- a/arch/arm64/kvm/reset.c
+++ b/arch/arm64/kvm/reset.c
@@ -123,6 +123,9 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
         int ret = -EINVAL;
         bool loaded;
 
+        /* Reset PMU outside of the non-preemptible section */
+        kvm_pmu_vcpu_reset(vcpu);
+
         preempt_disable();
         loaded = (vcpu->cpu != -1);
         if (loaded)
@@ -170,9 +173,6 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
                 vcpu->arch.reset_state.reset = false;
         }
 
-        /* Reset PMU */
-        kvm_pmu_vcpu_reset(vcpu);
-
         /* Default workaround setup is enabled (if supported) */
         if (kvm_arm_have_ssbd() == KVM_SSBD_KERNEL)
                 vcpu->arch.workaround_flags |= VCPU_WORKAROUND_2_FLAG;