Merge branch 'kvm-master' into kvm-next

Fixes to get_mmio_spte, destined to 5.10 stable branch.

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

diff --cc arch/arm64/Kconfig
Simple merge

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

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

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

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

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

diff --cc arch/arm64/kernel/sdei.c
index e04b3e90c0030405abba602b3ef4318081cddf0a,793c46d6a44791c11eee1600956ec3f35c54050f..2132bd953a87baa4d634a6fa2f76c91d1cab9dca
--- 1/arch/arm64/kernel/sdei.c
--- 2/arch/arm64/kernel/sdei.c
+++ b/arch/arm64/kernel/sdei.c
@@@ -216,40 -223,13 +217,40 @@@ static __kprobes unsigned long _sdei_ha
        return vbar + 0x480;
  }
  
 +static void __kprobes notrace __sdei_pstate_entry(void)
 +{
 +      /*
 +       * The original SDEI spec (ARM DEN 0054A) can be read ambiguously as to
 +       * whether PSTATE bits are inherited unchanged or generated from
 +       * scratch, and the TF-A implementation always clears PAN and always
 +       * clears UAO. There are no other known implementations.
 +       *
 +       * Subsequent revisions (ARM DEN 0054B) follow the usual rules for how
 +       * PSTATE is modified upon architectural exceptions, and so PAN is
 +       * either inherited or set per SCTLR_ELx.SPAN, and UAO is always
 +       * cleared.
 +       *
 +       * We must explicitly reset PAN to the expected state, including
 +       * clearing it when the host isn't using it, in case a VM had it set.
 +       */
 +      if (system_uses_hw_pan())
 +              set_pstate_pan(1);
 +      else if (cpu_has_pan())
 +              set_pstate_pan(0);
 +}
  
- asmlinkage __kprobes notrace unsigned long
+ asmlinkage noinstr unsigned long
  __sdei_handler(struct pt_regs *regs, struct sdei_registered_event *arg)
  {
        unsigned long ret;
  
-       nmi_enter();
 +      /*
 +       * We didn't take an exception to get here, so the HW hasn't
 +       * set/cleared bits in PSTATE that we may rely on. Initialize PAN.
 +       */
 +      __sdei_pstate_entry();
 +
+       arm64_enter_nmi(regs);
  
        ret = _sdei_handler(regs, arg);
  

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

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

diff --cc arch/arm64/mm/fault.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/kvm_host.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 941e5251e13feb5e1f72d1abea90f4772e9207f4,da7eb4aaf44f85e7e891b5fb8b047277670d5afd..cce0143a6f8015a61a575dc66ec3a3ce3a7cc28a
--- 1/arch/x86/kvm/svm/svm.c
--- 2/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@@ -1347,8 -1309,10 +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