Skip to content

Commit fe8d76c

Browse files
Like Xusean-jc
authored andcommitted
KVM: x86/cpuid: Add a KVM-only leaf to redirect AMD PerfMonV2 flag
Add a KVM-only leaf for AMD's PerfMonV2 to redirect the kernel's scattered version to its architectural location, e.g. so that KVM can query guest support via guest_cpuid_has(). Suggested-by: Sean Christopherson <seanjc@google.com> Signed-off-by: Like Xu <likexu@tencent.com> [sean: massage changelog] Link: https://lore.kernel.org/r/20230603011058.1038821-11-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 1c2bf8a commit fe8d76c

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

arch/x86/kvm/reverse_cpuid.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ enum kvm_only_cpuid_leafs {
1515
CPUID_12_EAX = NCAPINTS,
1616
CPUID_7_1_EDX,
1717
CPUID_8000_0007_EDX,
18+
CPUID_8000_0022_EAX,
1819
NR_KVM_CPU_CAPS,
1920

2021
NKVMCAPINTS = NR_KVM_CPU_CAPS - NCAPINTS,
@@ -47,6 +48,9 @@ enum kvm_only_cpuid_leafs {
4748
/* CPUID level 0x80000007 (EDX). */
4849
#define KVM_X86_FEATURE_CONSTANT_TSC KVM_X86_FEATURE(CPUID_8000_0007_EDX, 8)
4950

51+
/* CPUID level 0x80000022 (EAX) */
52+
#define KVM_X86_FEATURE_PERFMON_V2 KVM_X86_FEATURE(CPUID_8000_0022_EAX, 0)
53+
5054
struct cpuid_reg {
5155
u32 function;
5256
u32 index;
@@ -74,6 +78,7 @@ static const struct cpuid_reg reverse_cpuid[] = {
7478
[CPUID_7_1_EDX] = { 7, 1, CPUID_EDX},
7579
[CPUID_8000_0007_EDX] = {0x80000007, 0, CPUID_EDX},
7680
[CPUID_8000_0021_EAX] = {0x80000021, 0, CPUID_EAX},
81+
[CPUID_8000_0022_EAX] = {0x80000022, 0, CPUID_EAX},
7782
};
7883

7984
/*
@@ -108,6 +113,8 @@ static __always_inline u32 __feature_translate(int x86_feature)
108113
return KVM_X86_FEATURE_SGX_EDECCSSA;
109114
else if (x86_feature == X86_FEATURE_CONSTANT_TSC)
110115
return KVM_X86_FEATURE_CONSTANT_TSC;
116+
else if (x86_feature == X86_FEATURE_PERFMON_V2)
117+
return KVM_X86_FEATURE_PERFMON_V2;
111118

112119
return x86_feature;
113120
}

0 commit comments

Comments
 (0)