diff options
| author |   Marc Zyngier <maz@kernel.org> | 2022-05-16 17:48:36 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2022-05-16 17:48:36 +0100 |
| commit | 8794b4f510f722f37ae6b583e4b12b1af2fb692a (patch) | |
| tree | 0737d4f000a3f0a436f37c2bc456f2a608ff9ba8 /arch/arm64/kvm/arm.c | |
| parent | Merge branch kvm-arm64/vgic-invlpir into kvmarm-master/next (diff) | |
| parent | KVM: arm64: pmu: Restore compilation when HW_PERF_EVENTS isn't selected (diff) | |
| download | linux-dev-8794b4f510f722f37ae6b583e4b12b1af2fb692a.tar.xz linux-dev-8794b4f510f722f37ae6b583e4b12b1af2fb692a.zip | |
Merge branch kvm-arm64/per-vcpu-host-pmu-data into kvmarm-master/next
* kvm-arm64/per-vcpu-host-pmu-data:
: .
: Pass the host PMU state in the vcpu to avoid the use of additional
: shared memory between EL1 and EL2 (this obviously only applies
: to nVHE and Protected setups).
:
: Patches courtesy of Fuad Tabba.
: .
KVM: arm64: pmu: Restore compilation when HW_PERF_EVENTS isn't selected
KVM: arm64: Reenable pmu in Protected Mode
KVM: arm64: Pass pmu events to hyp via vcpu
KVM: arm64: Repack struct kvm_pmu to reduce size
KVM: arm64: Wrapper for getting pmu_events
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/arm.c')
| -rw-r--r-- | arch/arm64/kvm/arm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 114184781bba..12b3b47fdf2c 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -882,6 +882,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) kvm_vgic_flush_hwstate(vcpu); + kvm_pmu_update_vcpu_events(vcpu); + /* * Ensure we set mode to IN_GUEST_MODE after we disable * interrupts and before the final VCPU requests check. |