Merge tag 'kvm-riscv-6.3-1' of https://github.com/kvm-riscv/linux into HEAD

KVM/riscv changes for 6.3

- Fix wrong usage of PGDIR_SIZE to check page sizes
- Fix privilege mode setting in kvm_riscv_vcpu_trap_redirect()
- Redirect illegal instruction traps to guest
- SBI PMU support for guest

diff --cc Documentation/virt/kvm/api.rst
Simple merge

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

diff --cc arch/riscv/include/asm/kvm_host.h
index cf24da8,b90be9a..cc7da66
--- 1/arch/riscv/include/asm/kvm_host.h
--- 2/arch/riscv/include/asm/kvm_host.h
+++ b/arch/riscv/include/asm/kvm_host.h
@@@ -228,8 -229,12 +229,11 @@@ struct kvm_vcpu_arch 
  
        /* Don't run the VCPU (blocked) */
        bool pause;
+ 
+       /* Performance monitoring context */
+       struct kvm_pmu pmu_context;
  };
  
 -static inline void kvm_arch_hardware_unsetup(void) {}
  static inline void kvm_arch_sync_events(struct kvm *kvm) {}
  static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}
  

diff --cc arch/riscv/kvm/main.c
Simple merge

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

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

diff --cc arch/x86/events/intel/core.c
Simple merge

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

diff --cc include/kvm/arm_vgic.h
Simple merge

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