Merge branch kvm-arm64/pmu-bl into kvmarm-master/next

* kvm-arm64/pmu-bl:
  : .
  : Improve PMU support on heterogeneous systems, courtesy of Alexandru Elisei
  : .
  KVM: arm64: Refuse to run VCPU if the PMU doesn't match the physical CPU
  KVM: arm64: Add KVM_ARM_VCPU_PMU_V3_SET_PMU attribute
  KVM: arm64: Keep a list of probed PMUs
  KVM: arm64: Keep a per-VM pointer to the default PMU
  perf: Fix wrong name in comment for struct perf_cpu_context
  KVM: arm64: Do not change the PMU event filter after a VCPU has run

Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --cc arch/arm64/include/asm/kvm_host.h
Simple merge

diff --cc arch/arm64/kvm/arm.c
index 4180149,13c1318..fefd577
--- 1/arch/arm64/kvm/arm.c
--- 2/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@@ -417,8 -430,8 +425,9 @@@ void kvm_arch_vcpu_put(struct kvm_vcpu 
        kvm_timer_vcpu_put(vcpu);
        kvm_vgic_put(vcpu);
        kvm_vcpu_pmu_restore_host(vcpu);
 +      kvm_arm_vmid_clear_active();
  
+       vcpu_clear_on_unsupported_cpu(vcpu);
        vcpu->cpu = -1;
  }
  
@@@ -707,7 -805,16 +720,15 @@@ static bool kvm_vcpu_exit_request(struc
                }
        }
  
+       if (unlikely(vcpu_on_unsupported_cpu(vcpu))) {
+               run->exit_reason = KVM_EXIT_FAIL_ENTRY;
+               run->fail_entry.hardware_entry_failure_reason = KVM_EXIT_FAIL_ENTRY_CPU_UNSUPPORTED;
+               run->fail_entry.cpu = smp_processor_id();
+               *ret = 0;
+               return true;
+       }
+ 
        return kvm_request_pending(vcpu) ||
 -                      need_new_vmid_gen(&vcpu->arch.hw_mmu->vmid) ||
                        xfer_to_guest_mode_work_pending();
  }