diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-06-03 16:50:02 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-06-18 14:18:37 +0100 |
| commit | d0c94c49792cf780cbfefe29f81bb8c3b73bc76b (patch) | |
| tree | 632cd74cd7d4cbf7122bf3235de72d974359c9ae /arch/arm64/kvm/arm.c | |
| parent | 2a71fabf6a1bc9162a84e18d6ab991230ca4d588 (diff) | |
| download | linux-d0c94c49792cf780cbfefe29f81bb8c3b73bc76b.tar.gz linux-d0c94c49792cf780cbfefe29f81bb8c3b73bc76b.tar.bz2 linux-d0c94c49792cf780cbfefe29f81bb8c3b73bc76b.zip | |
KVM: arm64: Restore PMU configuration on first run
Restoring a guest with an active virtual PMU results in no perf
counters being instanciated on the host side. Not quite what
you'd expect from a restore.
In order to fix this, force a writeback of PMCR_EL0 on the first
run of a vcpu (using a new request so that it happens once the
vcpu has been loaded). This will in turn create all the host-side
counters that were missing.
Reported-by: Jinank Jain <jinankj@amazon.de>
Tested-by: Jinank Jain <jinankj@amazon.de>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/87wnrbylxv.wl-maz@kernel.org
Link: https://lore.kernel.org/r/b53dfcf9bbc4db7f96154b1cd5188d72b9766358.camel@amazon.de
Diffstat (limited to 'arch/arm64/kvm/arm.c')
| -rw-r--r-- | arch/arm64/kvm/arm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index e720148232a0..facf4d41d32a 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -689,6 +689,10 @@ static void check_vcpu_requests(struct kvm_vcpu *vcpu) vgic_v4_load(vcpu); preempt_enable(); } + + if (kvm_check_request(KVM_REQ_RELOAD_PMU, vcpu)) + kvm_pmu_handle_pmcr(vcpu, + __vcpu_sys_reg(vcpu, PMCR_EL0)); } } |