]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
KVM: arm64: Remove redundant call to kvm_pmu_vcpu_reset()
authorAlexandru Elisei <alexandru.elisei@arm.com>
Tue, 1 Dec 2020 15:01:57 +0000 (15:01 +0000)
committerMarc Zyngier <maz@kernel.org>
Sun, 27 Dec 2020 14:38:25 +0000 (14:38 +0000)
KVM_ARM_VCPU_INIT ioctl calls kvm_reset_vcpu(), which in turn resets the
PMU with a call to kvm_pmu_vcpu_reset(). The function zeroes the PMU
chained counters bitmap and stops all the counters with a perf event
attached. Because it is called before the VCPU has had the chance to run,
no perf events are in use and none are released.

kvm_arm_pmu_v3_enable(), called by kvm_vcpu_first_run_init() only if the
VCPU has been initialized, also resets the PMU. kvm_pmu_vcpu_reset() in
this case does the exact same thing as the previous call, so remove it.

Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20201201150157.223625-6-alexandru.elisei@arm.com
arch/arm64/kvm/pmu-emul.c

index 398f6df1bbe40ad298831b2a7acc109f8acad0ab..4ad66a532e38b37007fd75610e15a426b7123bd8 100644 (file)
@@ -850,8 +850,6 @@ int kvm_arm_pmu_v3_enable(struct kvm_vcpu *vcpu)
                   return -EINVAL;
        }
 
-       kvm_pmu_vcpu_reset(vcpu);
-
        return 0;
 }