OSDN Git Service

Merge branch kvm-arm64/per-vcpu-host-pmu-data into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Mon, 16 May 2022 16:48:36 +0000 (17:48 +0100)
committerMarc Zyngier <maz@kernel.org>
Mon, 16 May 2022 16:48:36 +0000 (17:48 +0100)
commit8794b4f510f722f37ae6b583e4b12b1af2fb692a
tree0737d4f000a3f0a436f37c2bc456f2a608ff9ba8
parentec2cff6cbdbecc4897f97b01992efc0ab86aa492
parent20492a62b99bd4367b79a76ca288d018f11980db
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>
arch/arm64/include/asm/kvm_host.h
arch/arm64/kvm/arm.c
arch/arm64/kvm/hyp/nvhe/switch.c
arch/arm64/kvm/pmu-emul.c