Merge branch 'kvm-late-6.1' into HEAD
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 29 Dec 2022 20:35:48 +0000 (15:35 -0500)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 29 Dec 2022 20:36:47 +0000 (15:36 -0500)
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>
1  2 
Documentation/virt/kvm/api.rst
MAINTAINERS
arch/x86/include/asm/hyperv-tlfs.h
arch/x86/kernel/cpu/mshyperv.c
arch/x86/kvm/cpuid.c
arch/x86/kvm/mmu/mmu.c
arch/x86/kvm/reverse_cpuid.h
arch/x86/kvm/x86.c

Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 042d0aca3c92b238602d93d0158e043bcd2b4447,25b9b51abb20de4cef932267b4619c76b821fc5b..4945456fd646ddde58b713720311a6981a53b4d5
@@@ -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;
  }
Simple merge