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

KVM/arm64 updates for 7.1

* New features:

- Add support for tracing in the standalone EL2 hypervisor code,
  which should help both debugging and performance analysis.
  This comes with a full infrastructure for 'remote' trace buffers
  that can be exposed by non-kernel entities such as firmware.

- Add support for GICv5 Per Processor Interrupts (PPIs), as the
  starting point for supporting the new GIC architecture in KVM.

- Finally add support for pKVM protected guests, with anonymous
  memory being used as a backing store. About time!

* Improvements and bug fixes:

- Rework the dreaded user_mem_abort() function to make it more
  maintainable, reducing the amount of state being exposed to
  the various helpers and rendering a substantial amount of
  state immutable.

- Expand the Stage-2 page table dumper to support NV shadow
  page tables on a per-VM basis.

- Tidy up the pKVM PSCI proxy code to be slightly less hard
  to follow.

- Fix both SPE and TRBE in non-VHE configurations so that they
  do not generate spurious, out of context table walks that
  ultimately lead to very bad HW lockups.

- A small set of patches fixing the Stage-2 MMU freeing in error
  cases.

- Tighten-up accepted SMC immediate value to be only #0 for host
  SMCCC calls.

- The usual cleanups and other selftest churn.

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

diff --cc include/uapi/linux/kvm.h
index 7fb4fea9d38e607a0e51c50f6035b9046d45f06d,ae659566e44f4edf1509aa38958de88384b43674..1cc0c9463f711009f8f75f400ae4fcb54d0a92e1
--- 1/include/uapi/linux/kvm.h
--- 2/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -1225,8 -1229,8 +1230,10 @@@ enum kvm_device_type 
  #define KVM_DEV_TYPE_LOONGARCH_EIOINTC        KVM_DEV_TYPE_LOONGARCH_EIOINTC
        KVM_DEV_TYPE_LOONGARCH_PCHPIC,
  #define KVM_DEV_TYPE_LOONGARCH_PCHPIC KVM_DEV_TYPE_LOONGARCH_PCHPIC
 +      KVM_DEV_TYPE_LOONGARCH_DMSINTC,
 +#define KVM_DEV_TYPE_LOONGARCH_DMSINTC        KVM_DEV_TYPE_LOONGARCH_DMSINTC
+       KVM_DEV_TYPE_ARM_VGIC_V5,
+ #define KVM_DEV_TYPE_ARM_VGIC_V5      KVM_DEV_TYPE_ARM_VGIC_V5
  
        KVM_DEV_TYPE_MAX,
  

diff --cc kernel/trace/ring_buffer.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc tools/include/uapi/linux/kvm.h
Simple merge

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