x86/Centaur: show more HW features in /proc/cpuinfo
Quoted 13 lines
-----Original Mail-----
Sender: Thomas Gleixner [mailto:[email protected]]
Time: 2018/4/17 18:19
Receiver: David Wang <[email protected]>
CC: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; linux- [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH] x86/Centaur: show more HW features in/proc/cpuinfo
Quoted 8 lines
Quoted 2 lines · David Wang
We add this patch to show correct HW
features(arch_perfmon, tpr_shadow, vnmi, flexpriority, ept and vpid)when user execute "cat
/proc/cpuinfo".See the other mail vs. the changelog.
OK. Thanks.
Quoted 16 lines
arch/x86/kernel/cpu/centaur.c static void early_init_centaur(struct cpuinfo_x86
Quoted 12 lines
Signed-off-by David Wang <[email protected]>--- arch/x86/kernel/cpu/centaur.c | 49 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+)(quoted diff) +0
-0
b/arch/x86/kernel/cpu/centaur.cindex e5ec0f1..969fb8f 100644arch/x86/kernel/cpu/centaur.c +0
-0@@ -112,6 +112,44 @@ static void early_init_centaur(struct cpuinfo_x86*c)
Quoted 3 lines
arch/x86/kernel/cpu/centaur.c +0
-0} }
Quoted 9 lines
arch/x86/kernel/cpu/centaur.c static void early_init_centaur(struct cpuinfo_x86 · line 121
Quoted 7 lines
arch/x86/kernel/cpu/centaur.c +7
-0+static void centaur_detect_vmx_virtcap (struct cpuinfo_x86 *c) { +#define X86_VMX_FEATURE_PROC_CTLS_TPR_SHADOW 0x00200000 +#define X86_VMX_FEATURE_PROC_CTLS_VNMI 0x00400000 +#define X86_VMX_FEATURE_PROC_CTLS_2ND_CTLS 0x80000000 +#define X86_VMX_FEATURE_PROC_CTLS2_VIRT_APIC 0x00000001 +#define X86_VMX_FEATURE_PROC_CTLS2_EPT 0x00000002 +#define X86_VMX_FEATURE_PROC_CTLS2_VPID 0x00000020Please move the defines outside the function. This is horrible to read,
OK.
Quoted 12 lines
arch/x86/kernel/cpu/centaur.c static void early_init_centaur(struct cpuinfo_x86 · line 129
Quoted 9 lines
arch/x86/kernel/cpu/centaur.c +8
-0+ +u32 vmx_msr_low, vmx_msr_high, msr_ctl, msr_ctl2; + +clear_cpu_cap (c,X86_FEATURE_TPR_SHADOW ); +clear_cpu_cap (c,X86_FEATURE_VNMI ); +clear_cpu_cap (c,X86_FEATURE_FLEXPRIORITY ); +clear_cpu_cap (c,X86_FEATURE_EPT ); +clear_cpu_cap (c,X86_FEATURE_VPID );Why are you clearing the capabilities? They are cleared at boot time.
OK. It's really useless.
Quoted 28 lines
arch/x86/kernel/cpu/centaur.c static void early_init_centaur(struct cpuinfo_x86 · line 130
Quoted 1 line
arch/x86/kernel/cpu/centaur.c +1
-0+ rdmsr(MSR_IA32_VMX_PROCBASED_CTLS, vmx_msr_low,
vmx_msr_high);arch/x86/kernel/cpu/centaur.c static void early_init_centaur(struct cpuinfo_x86 · line 141
Quoted 11 lines
arch/x86/kernel/cpu/centaur.c +11
-0+ msr_ctl = vmx_msr_high | vmx_msr_low; + +if (msr_ctl &X86_VMX_FEATURE_PROC_CTLS_TPR_SHADOW ) +set_cpu_cap (c,X86_FEATURE_TPR_SHADOW ); +if (msr_ctl &X86_VMX_FEATURE_PROC_CTLS_VNMI ) +set_cpu_cap (c,X86_FEATURE_VNMI ); +if (msr_ctl &X86_VMX_FEATURE_PROC_CTLS_2ND_CTLS ) { +rdmsr (MSR_IA32_VMX_PROCBASED_CTLS2 , + vmx_msr_low, vmx_msr_high); + msr_ctl2 = vmx_msr_high | vmx_msr_low; + if ((msr_ctl2 &
X86_VMX_FEATURE_PROC_CTLS2_VIRT_APIC) &&arch/x86/kernel/cpu/centaur.c static void early_init_centaur(struct cpuinfo_x86 · line 142
Quoted 1 line
arch/x86/kernel/cpu/centaur.c +1
-0+ (msr_ctl &
X86_VMX_FEATURE_PROC_CTLS_TPR_SHADOW))Quoted 12 lines
arch/x86/kernel/cpu/centaur.c +8
-0+set_cpu_cap (c,X86_FEATURE_FLEXPRIORITY ); +if (msr_ctl2 &X86_VMX_FEATURE_PROC_CTLS2_EPT ) +set_cpu_cap (c,X86_FEATURE_EPT ); +if (msr_ctl2 &X86_VMX_FEATURE_PROC_CTLS2_VPID ) +set_cpu_cap (c,X86_FEATURE_VPID ); + } +} + static void init_centaur(struct cpuinfo_x86 *c) { #ifdef
CONFIG_X86_32@@ -128,6 +166,14 @@ static voidinit_centaur(struct cpuinfo_x86 *c)
clear_cpu_cap(c, 0*32+31);
Quoted 9 lines
arch/x86/kernel/cpu/centaur.c
Quoted 5 lines
#endif
arch/x86/kernel/cpu/centaur.c +3
-0early_init_centaur (c); + +if (c->cpuid_level >9 ) { +unsigned eax =cpuid_eax (10 );Missing newline between variable declaration and code. checkpatch.pl should have told you that.
OK.
Quoted 6 lines
arch/x86/kernel/cpu/centaur.c
Quoted 2 lines
arch/x86/kernel/cpu/centaur.c +2
-0+/* Check for version and the number of counters */ +if ((eax &0xff ) && (((eax >>8 ) &0xff ) >1 ))Magic constants and a comment which does not explain how the check works.
OK. I will explain more detail in the comments.
Quoted 5 lines
arch/x86/kernel/cpu/centaur.c
Quoted 1 line
arch/x86/kernel/cpu/centaur.c +1
-0+set_cpu_cap (c,X86_FEATURE_ARCH_PERFMON );Thanks,
tglx
Thanks,
---
David