Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM updates from Paolo Bonzini:
 "Much x86 work was pushed out to 5.12, but ARM more than made up for it.

  ARM:
   - PSCI relay at EL2 when "protected KVM" is enabled
   - New exception injection code
   - Simplification of AArch32 system register handling
   - Fix PMU accesses when no PMU is enabled
   - Expose CSV3 on non-Meltdown hosts
   - Cache hierarchy discovery fixes
   - PV steal-time cleanups
   - Allow function pointers at EL2
   - Various host EL2 entry cleanups
   - Simplification of the EL2 vector allocation

  s390:
   - memcg accouting for s390 specific parts of kvm and gmap
   - selftest for diag318
   - new kvm_stat for when async_pf falls back to sync

  x86:
   - Tracepoints for the new pagetable code from 5.10
   - Catch VFIO and KVM irqfd events before userspace
   - Reporting dirty pages to userspace with a ring buffer
   - SEV-ES host support
   - Nested VMX support for wait-for-SIPI activity state
   - New feature flag (AVX512 FP16)
   - New system ioctl to report Hyper-V-compatible paravirtualization features

  Generic:
   - Selftest improvements"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (171 commits)
  KVM: SVM: fix 32-bit compilation
  KVM: SVM: Add AP_JUMP_TABLE support in prep for AP booting
  KVM: SVM: Provide support to launch and run an SEV-ES guest
  KVM: SVM: Provide an updated VMRUN invocation for SEV-ES guests
  KVM: SVM: Provide support for SEV-ES vCPU loading
  KVM: SVM: Provide support for SEV-ES vCPU creation/loading
  KVM: SVM: Update ASID allocation to support SEV-ES guests
  KVM: SVM: Set the encryption mask for the SVM host save area
  KVM: SVM: Add NMI support for an SEV-ES guest
  KVM: SVM: Guest FPU state save/restore not needed for SEV-ES guest
  KVM: SVM: Do not report support for SMM for an SEV-ES guest
  KVM: x86: Update __get_sregs() / __set_sregs() to support SEV-ES
  KVM: SVM: Add support for CR8 write traps for an SEV-ES guest
  KVM: SVM: Add support for CR4 write traps for an SEV-ES guest
  KVM: SVM: Add support for CR0 write traps for an SEV-ES guest
  KVM: SVM: Add support for EFER write traps for an SEV-ES guest
  KVM: SVM: Support string IO operations for an SEV-ES guest
  KVM: SVM: Support MMIO for an SEV-ES guest
  KVM: SVM: Create trace events for VMGEXIT MSR protocol processing
  KVM: SVM: Create trace events for VMGEXIT processing
  ...

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc Documentation/arm64/memory.rst
Simple merge

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

diff --cc arch/arm64/include/asm/kvm_asm.h
index 8e5fa28,7ccf770..8a33d83
--- 1/arch/arm64/include/asm/kvm_asm.h
--- 2/arch/arm64/include/asm/kvm_asm.h
+++ b/arch/arm64/include/asm/kvm_asm.h
@@@ -198,14 -199,6 +199,12 @@@ extern void __vgic_v3_init_lrs(void)
  
  extern u32 __kvm_get_mdcr_el2(void);
  
- extern char __smccc_workaround_1_smc[__SMCCC_WORKAROUND_1_SMC_SZ];
- 
 +#if defined(GCC_VERSION) && GCC_VERSION < 50000
 +#define SYM_CONSTRAINT        "i"
 +#else
 +#define SYM_CONSTRAINT        "S"
 +#endif
 +
  /*
   * Obtain the PC-relative address of a kernel symbol
   * s: symbol

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

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

diff --cc arch/arm64/kernel/cpufeature.c
Simple merge

diff --cc arch/arm64/kernel/head.S
Simple merge

diff --cc arch/arm64/kernel/setup.c
Simple merge

diff --cc arch/arm64/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/arm64/kvm/hyp/nvhe/hyp.lds.S
Simple merge

diff --cc arch/arm64/kvm/mmu.c
Simple merge

diff --cc arch/s390/kvm/kvm-s390.c
Simple merge

diff --cc arch/s390/kvm/pv.c
Simple merge

diff --cc arch/s390/mm/gmap.c
Simple merge

diff --cc arch/x86/include/asm/cpufeatures.h
Simple merge

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

diff --cc arch/x86/include/asm/msr-index.h
Simple merge

diff --cc arch/x86/kvm/lapic.c
Simple merge

diff --cc arch/x86/kvm/mmu/mmu.c
Simple merge

diff --cc arch/x86/kvm/mmu/tdp_mmu.c
Simple merge

diff --cc arch/x86/kvm/svm/sev.c
Simple merge

diff --cc arch/x86/kvm/svm/svm.c
index da7eb4a,941e525..cce0143
--- 1/arch/x86/kvm/svm/svm.c
--- 2/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@@ -1309,10 -1347,8 +1347,10 @@@ static int svm_create_vcpu(struct kvm_v
                svm->avic_is_running = true;
  
        svm->msrpm = svm_vcpu_alloc_msrpm();
 -      if (!svm->msrpm)
 +      if (!svm->msrpm) {
 +              err = -ENOMEM;
-               goto error_free_vmcb_page;
+               goto error_free_vmsa_page;
 +      }
  
        svm_vcpu_init_msrpm(vcpu, svm->msrpm);
  

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc drivers/irqchip/irq-gic-v3-its.c
Simple merge

diff --cc tools/testing/selftests/kvm/set_memory_region_test.c
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge