Merge tag 'kvmarm-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmar...

KVM/arm64 updates for Linux 5.16

- More progress on the protected VM front, now with the full
  fixed feature set as well as the limitation of some hypercalls
  after initialisation.

- Cleanup of the RAZ/WI sysreg handling, which was pointlessly
  complicated

- Fixes for the vgic placement in the IPA space, together with a
  bunch of selftests

- More memcg accounting of the memory allocated on behalf of a guest

- Timer and vgic selftests

- Workarounds for the Apple M1 broken vgic implementation

- KConfig cleanups

- New kvmarm.mode=none option, for those who really dislike us

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc arch/arm64/kvm/arm.c
index 7838e9f,24a1e86..f5490af
--- 1/arch/arm64/kvm/arm.c
--- 2/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@@ -291,12 -291,22 +291,14 @@@ long kvm_arch_dev_ioctl(struct file *fi
  
  struct kvm *kvm_arch_alloc_vm(void)
  {
+       size_t sz = sizeof(struct kvm);
+ 
        if (!has_vhe())
-               return kzalloc(sizeof(struct kvm), GFP_KERNEL);
+               return kzalloc(sz, GFP_KERNEL_ACCOUNT);
  
-       return vzalloc(sizeof(struct kvm));
+       return __vmalloc(sz, GFP_KERNEL_ACCOUNT | __GFP_HIGHMEM | __GFP_ZERO);
  }
  
 -void kvm_arch_free_vm(struct kvm *kvm)
 -{
 -      if (!has_vhe())
 -              kfree(kvm);
 -      else
 -              vfree(kvm);
 -}
 -
  int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)
  {
        if (irqchip_in_kernel(kvm) && vgic_initialized(kvm))

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

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

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

diff --cc tools/testing/selftests/kvm/.gitignore
Simple merge

diff --cc tools/testing/selftests/kvm/Makefile
index fd20f27,36ccd29..c23e89d
--- 1/tools/testing/selftests/kvm/Makefile
--- 2/tools/testing/selftests/kvm/Makefile
+++ b/tools/testing/selftests/kvm/Makefile
@@@ -86,8 -85,8 +86,9 @@@ TEST_GEN_PROGS_x86_64 += rseq_tes
  TEST_GEN_PROGS_x86_64 += set_memory_region_test
  TEST_GEN_PROGS_x86_64 += steal_time
  TEST_GEN_PROGS_x86_64 += kvm_binary_stats_test
 +TEST_GEN_PROGS_x86_64 += system_counter_offset_test
  
+ TEST_GEN_PROGS_aarch64 += aarch64/arch_timer
  TEST_GEN_PROGS_aarch64 += aarch64/debug-exceptions
  TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list
  TEST_GEN_PROGS_aarch64 += aarch64/psci_cpu_on_test

diff --cc tools/testing/selftests/kvm/include/kvm_util.h
Simple merge