From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 9 Jun 2022 15:38:12 +0000 (-0400)
Subject: Merge branch 'kvm-5.20-early'
X-Git-Tag: v6.0-rc1~129^2~6^2~389
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e15f5e6fa6ca1b3baf087314b2541afa935d00e7;p=thirdparty%2Fkernel%2Flinux.git

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
---

e15f5e6fa6ca1b3baf087314b2541afa935d00e7
diff --cc arch/x86/include/asm/kvm_host.h
index 9217bd6cf0d14,6cf5d77d78969..7e98b2876380e
--- a/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/x86.c
index 158b2e135efce,79efdc19b4c83..e8177d8b378e9
--- a/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_COUNTER(VCPU, preemption_reported),
 +	STATS_DESC_COUNTER(VCPU, preemption_other),
- 	STATS_DESC_ICOUNTER(VCPU, guest_mode)
+ 	STATS_DESC_ICOUNTER(VCPU, guest_mode),
+ 	STATS_DESC_COUNTER(VCPU, notify_window_exits),
  };
  
  const struct kvm_stats_header kvm_vcpu_stats_header = {