Merge branch 'kvm-5.20-early'

s390:

* add an interface to provide a hypervisor dump for secure guests

* improve selftests to show tests

x86:

* Intel IPI virtualization

* Allow getting/setting pending triple fault with KVM_GET/SET_VCPU_EVENTS

* PEBS virtualization

* Simplify PMU emulation by just using PERF_TYPE_RAW events

* More accurate event reinjection on SVM (avoid retrying instructions)

* Allow getting/setting the state of the speaker port data bit

* Rewrite gfn-pfn cache refresh

* Refuse starting the module if VM-Entry/VM-Exit controls are inconsistent

* "Notify" VM exit

diff --cc arch/x86/include/asm/kvm_host.h
index 9217bd6cf0d14888bd2e8e7034858100934feaf1,6cf5d77d78969939a071e5ddeb797aa16d0ff9c4..7e98b2876380e84a28cf482810b07da78e2586ac
--- 1/arch/x86/include/asm/kvm_host.h
--- 2/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@@ -1364,9 -1330,8 +1394,10 @@@ struct kvm_vcpu_stat 
        u64 nested_run;
        u64 directed_yield_attempted;
        u64 directed_yield_successful;
 +      u64 preemption_reported;
 +      u64 preemption_other;
        u64 guest_mode;
+       u64 notify_window_exits;
  };
  
  struct x86_instruction_info;

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

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

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

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

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

diff --cc arch/x86/kvm/x86.c
index 158b2e135efce57d5b89e79e43dbdf283413d96a,79efdc19b4c83287524aba22a554a3d5da0e3106..e8177d8b378e9031da95efdf8f9f103640f8259b
--- 1/arch/x86/kvm/x86.c
--- 2/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -296,9 -284,8 +284,10 @@@ const struct _kvm_stats_desc kvm_vcpu_s
        STATS_DESC_COUNTER(VCPU, nested_run),
        STATS_DESC_COUNTER(VCPU, directed_yield_attempted),
        STATS_DESC_COUNTER(VCPU, directed_yield_successful),
-       STATS_DESC_ICOUNTER(VCPU, guest_mode)
 +      STATS_DESC_COUNTER(VCPU, preemption_reported),
 +      STATS_DESC_COUNTER(VCPU, preemption_other),
+       STATS_DESC_ICOUNTER(VCPU, guest_mode),
+       STATS_DESC_COUNTER(VCPU, notify_window_exits),
  };
  
  const struct kvm_stats_header kvm_vcpu_stats_header = {

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

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

diff --cc virt/kvm/kvm_main.c
Simple merge