x86: cpu/proc.c grouping of cpuid in /proc/cpuinfo
PATCH 1/1 x86: cpu/proc.c grouping of cpuid in /proc/cpuinfo
Unification of cpuid_level.
Also added extended_cpuid_level to make it complete.
So cpuid* and cpufeature flag come in same group and /proc/cpuinfo looks like on AMD box:
cpuid level : 1
ext cpuid level : 0x8000001a
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt rdtscp lm 3dnowext 3dnow constant_tsc rep_good nonstop_tsc pni cx16 lahf_lm cmp_legacy svm extapic cr8_legacy 3dnowprefetch osvw skinit
--- arch/x86/kernel/cpu/proc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/proc.c +6 -6
@@ -38,7 +38,6 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)"coma_bug\t: %s\n" "fpu\t\t: %s\n" "fpu_exception\t: %s\n" -"cpuid level\t: %d\n" "wp\t\t: %s\n" , c->fdiv_bug ?"yes" :"no" , c->hlt_works_ok ? "no" : "yes",
@@ -46,7 +45,6 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c) c->coma_bug ?"yes" :"no" , c->hard_math ?"yes" :"no" , fpu_exception ?"yes" :"no" , - c->cpuid_level, c->wp_works_ok ? "yes" : "no"); }#else
@@ -55,9 +53,7 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)seq_printf (m,"fpu\t\t: yes\n" "fpu_exception\t: yes\n" -"cpuid level\t: %d\n" -"wp\t\t: yes\n" , - c->cpuid_level); + "wp\t\t: yes\n"); }#endif
@@ -102,7 +98,11 @@ static int show_cpuinfo(struct seq_file *m, void *v)show_cpuinfo_core (m, c, cpu);show_cpuinfo_misc (m, c); -seq_printf (m,"flags\t\t:" ); +seq_printf (m,"cpuid level\t: %d\n" +"ext cpuid level\t: 0x%x\n" +"flags\t\t:" , + c->cpuid_level, + c->extended_cpuid_level);for (i =0 ; i <32 *NCAPINTS ; i++)if (cpu_has (c, i) && x86_cap_flags[i] !=NULL )seq_printf (m," %s" , x86_cap_flags[i]);
Signature · 1 line
1.6.0.6
H. Peter Anvin
reviewerQuoted 11 lines · Jaswinder Singh Rajput
Unification of
cpuid_level.
Also addedextended_cpuid_levelto make it complete.So cpuid* and cpufeature flag come in same group and
/proc/cpuinfolooks like on AMD box:cpuid level : 1
ext cpuid level :0x8000001a
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxextfxsr_optrdtscp lm 3dnowext 3dnowconstant_tscrep_goodnonstop_tscpni cx16lahf_lmcmp_legacysvm extapiccr8_legacy3dnowprefetch osvw skinitSigned-off-by Jaswinder Singh Rajput <[email protected]>
Jaswinder,
/proc/cpuinfo is a userspace API. You CANNOT change the format of it without breaking applications.
Therefore, any change which moves flags between fields or removes fields is unacceptable. Adding new fields is possible, however.
-hpa
Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center I work for Intel. I don't speak on their behalf.
Quoted 13 lines · H. Peter Anvin
Quoted 11 lines · Jaswinder Singh Rajput
Unification of
cpuid_level.
Also addedextended_cpuid_levelto make it complete.So cpuid* and cpufeature flag come in same group and
/proc/cpuinfolooks like on AMD box:cpuid level : 1
ext cpuid level :0x8000001a
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxextfxsr_optrdtscp lm 3dnowext 3dnowconstant_tscrep_goodnonstop_tscpni cx16lahf_lmcmp_legacysvm extapiccr8_legacy3dnowprefetch osvw skinitSigned-off-by Jaswinder Singh Rajput <[email protected]>
Quoted 8 lines
Jaswinder,
/proc/cpuinfois a userspace API. You CANNOT change the format of it without breaking applications.Therefore, any change which moves flags between fields or removes fields is unacceptable. Adding new fields is possible, however.
Here are 2 patches for adding new field extended_cpuid_level, please choose PATCH whichever is more appropriate:
PATCH 1:
Subject: [PATCH] x86: cpu/proc.c adding extended_cpuid_level for /proc/cpuinfo
extended_cpuid_level also gives useful information like cpuid_level and very useful for AMD processors.
Adding extended_cpuid_level in /proc/cpuinfo completes cpuid_level info.
--- arch/x86/kernel/cpu/proc.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/proc.c +5 -1
@@ -39,6 +39,7 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)"fpu\t\t: %s\n" "fpu_exception\t: %s\n" "cpuid level\t: %d\n" +"ext cpuid level\t: 0x%x\n" "wp\t\t: %s\n" , c->fdiv_bug ?"yes" :"no" , c->hlt_works_ok ? "no" : "yes",
@@ -47,6 +48,7 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c) c->hard_math ?"yes" :"no" , fpu_exception ?"yes" :"no" , c->cpuid_level, + c->extended_cpuid_level, c->wp_works_ok ? "yes" : "no"); }#else
@@ -56,8 +58,10 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)"fpu\t\t: yes\n" "fpu_exception\t: yes\n" "cpuid level\t: %d\n" +"ext cpuid level\t: 0x%x\n" "wp\t\t: yes\n" , - c->cpuid_level); + c->cpuid_level, + c->extended_cpuid_level); }#endif
Signature · 17 lines
1.6.0.6 OR PATCH 2: Subject: [PATCH] x86: cpu/proc.c adding extended_cpuid_level for /proc/cpuinfo extended_cpuid_level also gives useful information like cpuid_level and very useful for AMD processors. Adding extended_cpuid_level in /proc/cpuinfo completes cpuid_level info. Signed-off-by: Jaswinder Singh Rajput <[email protected]> --- arch/x86/kernel/cpu/proc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/proc.c +3 -1
@@ -102,7 +102,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)show_cpuinfo_core (m, c, cpu);show_cpuinfo_misc (m, c); -seq_printf (m,"flags\t\t:" ); +seq_printf (m,"ext cpuid level\t: 0x%x\n" +"flags\t\t:" , + c->extended_cpuid_level);for (i =0 ; i <32 *NCAPINTS ; i++)if (cpu_has (c, i) && x86_cap_flags[i] !=NULL )seq_printf (m," %s" , x86_cap_flags[i]);
Signature · 1 line
1.6.0.6