From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 29 Dec 2022 20:35:48 +0000 (-0500)
Subject: Merge branch 'kvm-late-6.1' into HEAD
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fc471e831016c1741f3e8042997969ace0b5a013;p=linux.git

Merge branch 'kvm-late-6.1' into HEAD

x86:

* Change tdp_mmu to a read-only parameter

* Separate TDP and shadow MMU page fault paths

* Enable Hyper-V invariant TSC control

selftests:

* Use TAP interface for kvm_binary_stats_test and tsc_msrs_test

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

fc471e831016c1741f3e8042997969ace0b5a013
diff --cc arch/x86/kvm/reverse_cpuid.h
index 042d0aca3c92b,25b9b51abb20d..4945456fd646d
--- a/arch/x86/kvm/reverse_cpuid.h
+++ b/arch/x86/kvm/reverse_cpuid.h
@@@ -98,8 -102,8 +103,10 @@@ static __always_inline u32 __feature_tr
  		return KVM_X86_FEATURE_SGX1;
  	else if (x86_feature == X86_FEATURE_SGX2)
  		return KVM_X86_FEATURE_SGX2;
 +	else if (x86_feature == X86_FEATURE_SGX_EDECCSSA)
 +		return KVM_X86_FEATURE_SGX_EDECCSSA;
+ 	else if (x86_feature == X86_FEATURE_CONSTANT_TSC)
+ 		return KVM_X86_FEATURE_CONSTANT_TSC;
  
  	return x86_feature;
  }