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

Pull kvm updates from Paolo Bonzini:
 "ARM:
   - GICv4.1 support

   - 32bit host removal

  PPC:
   - secure (encrypted) using under the Protected Execution Framework
     ultravisor

  s390:
   - allow disabling GISA (hardware interrupt injection) and protected
     VMs/ultravisor support.

  x86:
   - New dirty bitmap flag that sets all bits in the bitmap when dirty
     page logging is enabled; this is faster because it doesn't require
     bulk modification of the page tables.

   - Initial work on making nested SVM event injection more similar to
     VMX, and less buggy.

   - Various cleanups to MMU code (though the big ones and related
     optimizations were delayed to 5.8). Instead of using cr3 in
     function names which occasionally means eptp, KVM too has
     standardized on "pgd".

   - A large refactoring of CPUID features, which now use an array that
     parallels the core x86_features.

   - Some removal of pointer chasing from kvm_x86_ops, which will also
     be switched to static calls as soon as they are available.

   - New Tigerlake CPUID features.

   - More bugfixes, optimizations and cleanups.

  Generic:
   - selftests: cleanups, new MMU notifier stress test, steal-time test

   - CSV output for kvm_stat"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (277 commits)
  x86/kvm: fix a missing-prototypes "vmread_error"
  KVM: x86: Fix BUILD_BUG() in __cpuid_entry_get_reg() w/ CONFIG_UBSAN=y
  KVM: VMX: Add a trampoline to fix VMREAD error handling
  KVM: SVM: Annotate svm_x86_ops as __initdata
  KVM: VMX: Annotate vmx_x86_ops as __initdata
  KVM: x86: Drop __exit from kvm_x86_ops' hardware_unsetup()
  KVM: x86: Copy kvm_x86_ops by value to eliminate layer of indirection
  KVM: x86: Set kvm_x86_ops only after ->hardware_setup() completes
  KVM: VMX: Configure runtime hooks using vmx_x86_ops
  KVM: VMX: Move hardware_setup() definition below vmx_x86_ops
  KVM: x86: Move init-only kvm_x86_ops to separate struct
  KVM: Pass kvm_init()'s opaque param to additional arch funcs
  s390/gmap: return proper error code on ksm unsharing
  KVM: selftests: Fix cosmetic copy-paste error in vm_mem_region_move()
  KVM: Fix out of range accesses to memslots
  KVM: X86: Micro-optimize IPI fastpath delay
  KVM: X86: Delay read msr data iff writes ICR MSR
  KVM: PPC: Book3S HV: Add a capability for enabling secure guests
  KVM: arm64: GICv4.1: Expose HW-based SGIs in debugfs
  KVM: arm64: GICv4.1: Allow non-trapping WFI when using HW SGIs
  ...

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm64/kvm/hyp/switch.c
Simple merge

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

diff --cc arch/powerpc/kvm/book3s_hv_uvmem.c
Simple merge

diff --cc arch/s390/include/asm/pgtable.h
Simple merge

diff --cc arch/s390/kernel/Makefile
Simple merge

diff --cc arch/s390/kvm/kvm-s390.c
index c2e6d4ba4e2369db946ecb6339045d91c1715c88,f6268dfb83623d0945357c4de404ee635a6fe1e6..19a81024fe16b0cedf8d78a4d7d6410cedff5ba7
--- 1/arch/s390/kvm/kvm-s390.c
--- 2/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@@ -3280,24 -3532,18 +3535,31 @@@ static void kvm_arch_vcpu_ioctl_initial
        memset(vcpu->arch.sie_block->gcr, 0, sizeof(vcpu->arch.sie_block->gcr));
        vcpu->arch.sie_block->gcr[0] = CR0_INITIAL_MASK;
        vcpu->arch.sie_block->gcr[14] = CR14_INITIAL_MASK;
 +
 +      /* ... the data in sync regs */
 +      memset(vcpu->run->s.regs.crs, 0, sizeof(vcpu->run->s.regs.crs));
 +      vcpu->run->s.regs.ckc = 0;
 +      vcpu->run->s.regs.crs[0] = CR0_INITIAL_MASK;
 +      vcpu->run->s.regs.crs[14] = CR14_INITIAL_MASK;
 +      vcpu->run->psw_addr = 0;
 +      vcpu->run->psw_mask = 0;
 +      vcpu->run->s.regs.todpr = 0;
 +      vcpu->run->s.regs.cputm = 0;
 +      vcpu->run->s.regs.ckc = 0;
 +      vcpu->run->s.regs.pp = 0;
 +      vcpu->run->s.regs.gbea = 1;
        vcpu->run->s.regs.fpc = 0;
-       vcpu->arch.sie_block->gbea = 1;
-       vcpu->arch.sie_block->pp = 0;
-       vcpu->arch.sie_block->fpf &= ~FPF_BPBC;
+       /*
+        * Do not reset these registers in the protected case, as some of
+        * them are overlayed and they are not accessible in this case
+        * anyway.
+        */
+       if (!kvm_s390_pv_cpu_is_protected(vcpu)) {
+               vcpu->arch.sie_block->gbea = 1;
+               vcpu->arch.sie_block->pp = 0;
+               vcpu->arch.sie_block->fpf &= ~FPF_BPBC;
+               vcpu->arch.sie_block->todpr = 0;
+       }
  }
  
  static void kvm_arch_vcpu_ioctl_clear_reset(struct kvm_vcpu *vcpu)

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

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

diff --cc arch/x86/kvm/kvm_emulate.h
index c06e8353efd3297ee44878b91f58798dd04b0664,4688b26c17eee4293f27fb88b3c3c5e0a29b7158..43c93ffa76edf8bb87559ea0e7b2b3f72d667034
--- 1/arch/x86/include/asm/kvm_emulate.h
--- 2/arch/x86/kvm/kvm_emulate.h
+++ b/arch/x86/kvm/kvm_emulate.h
@@@ -359,7 -361,13 +361,12 @@@ struct x86_emulate_ctxt 
        u8 seg_override;
        u64 d;
        unsigned long _eip;
+ 
+       /* Here begins the usercopy section. */
+       struct operand src;
+       struct operand src2;
+       struct operand dst;
        struct operand memop;
 -      /* Fields above regs are cleared together. */
        unsigned long _regs[NR_VCPU_REGS];
        struct operand *memopp;
        struct fetch_cache fetch;

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

diff --cc arch/x86/kvm/mmu/paging_tmpl.h
Simple merge

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

diff --cc arch/x86/kvm/trace.h
Simple merge

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

diff --cc arch/x86/kvm/vmx/vmx.h
index 0695ea177e22141563e4ce6b2788efbe22530fcd,79d38f41ef7a191ac77a90f1880494c3943e6f79..aab9df55336ef6e46e102450365f7ef28457e823
--- 1/arch/x86/kvm/vmx/vmx.h
--- 2/arch/x86/kvm/vmx/vmx.h
+++ b/arch/x86/kvm/vmx/vmx.h
@@@ -12,8 -12,9 +12,7 @@@
  #include "vmcs.h"
  
  extern const u32 vmx_msr_index[];
- extern u64 host_efer;
  
 -extern u32 get_umwait_control_msr(void);
 -
  #define MSR_TYPE_R    1
  #define MSR_TYPE_W    2
  #define MSR_TYPE_RW   3

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