x86: clean up setup_clear/force_cpu_cap handling - resend
PATCH 1/1 x86: clean up setup_clear/force_cpu_cap handling - resend
it looks get lost somehow,... resend again.
Impact: fix and cleanup
setup_force_cpu_cap() only have one user xen
but it should not reuse cleared_cpu_cpus. it will have problem for smp.
need to have cpu_cpus_set array too.
also need to setup handling before all cpus cap AND
--- arch/x86/include/asm/cpufeature.h | 4 ++-- arch/x86/include/asm/processor.h | 3 ++- arch/x86/kernel/cpu/common.c | 17 ++++++++++++----- 3 files changed, 16 insertions(+), 8 deletions(-)
arch/x86/include/asm/cpufeature.h +2 -2
@@ -192,11 +192,11 @@ extern const char * const x86_power_flag#define clear_cpu_cap (c, bit) clear_bit(bit, (unsigned long *)((c)->x86_capability))#define setup_clear_cpu_cap (bit) do { \ clear_cpu_cap(&boot_cpu_data, bit); \ - set_bit(bit, (unsigned long *)cleared_cpu_caps); \ + set_bit(bit, (unsigned long *)cpu_caps_cleared); \ } while (0)#define setup_force_cpu_cap (bit) do { \ set_cpu_cap(&boot_cpu_data, bit); \ - clear_bit(bit, (unsigned long *)cleared_cpu_caps); \ + set_bit(bit, (unsigned long *)cpu_caps_set); \ } while (0)#define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU)
arch/x86/include/asm/processor.h +2 -1
@@ -135,7 +135,8 @@ extern struct cpuinfo_x86 boot_cpu_data;extern struct cpuinfo_x86 new_cpu_data;extern struct tss_struct doublefault_tss; -extern __u32 cleared_cpu_caps[NCAPINTS ]; +extern __u32 cpu_caps_cleared[NCAPINTS ]; +extern __u32 cpu_caps_set[NCAPINTS ];#ifdef CONFIG_SMP DECLARE_PER_CPU(struct cpuinfo_x86, cpu_info);
arch/x86/kernel/cpu/common.c +12 -5
@@ -293,7 +293,8 @@ static const char *__cpuinit table_lookureturn NULL ;/* Not found */ } -__u32 cleared_cpu_caps[NCAPINTS ]__cpuinitdata ; +__u32 cpu_caps_cleared[NCAPINTS ]__cpuinitdata ; +__u32 cpu_caps_set[NCAPINTS ]__cpuinitdata ;void load_percpu_segment (int cpu) {
@@ -807,6 +808,16 @@ static void __cpuinit identify_cpu(struc#endif init_hypervisor (c); + +/* +* Clear/Set all flags overriden by options, need do it +* before following smp all cpus cap AND. +*/ +for (i =0 ; i <NCAPINTS ; i++) { + c->x86_capability[i] &= ~cpu_caps_cleared[i]; + c->x86_capability[i] |= cpu_caps_set[i]; + } +/* * On SMP, boot_cpu_data holds the common feature set between * all CPUs; so make sure that we indicate which features are
@@ -819,10 +830,6 @@ static void __cpuinit identify_cpu(struc boot_cpu_data.x86_capability[i] &= c->x86_capability[i]; } -/* Clear all flags overriden by options */ -for (i =0 ; i <NCAPINTS ; i++) - c->x86_capability[i] &= ~cleared_cpu_caps[i]; -#ifdef CONFIG_X86_MCE /* Init Machine Check Exception if available. */ mcheck_init (c);
ping.
Ingo, can you pick it up?
YH
Quoted 94 lines · Yinghai Lu
it looks get lost somehow,... resend again.
Impact: fix and cleanup
setup_force_cpu_cap()only have one user xen
but it should not reusecleared_cpu_cpus. it will have problem for smp.need to have
cpu_cpus_setarray too.
also need to setup handling before all cpus cap ANDSigned-off-by Yinghai Lu <[email protected]>--- arch/x86/include/asm/cpufeature.h | 4 ++-- arch/x86/include/asm/processor.h | 3 ++- arch/x86/kernel/cpu/common.c | 17 ++++++++++++----- 3 files changed, 16 insertions(+), 8 deletions(-)Index:
linux-2.6/arch/x86/include/asm/cpufeature.h
===================================================================arch/x86/include/asm/cpufeature.h +2
-2@@ -192,11 +192,11 @@ extern const char * const x86_power_flag#define clear_cpu_cap (c, bit) clear_bit(bit, (unsigned long *)((c)->x86_capability))#define setup_clear_cpu_cap (bit) do { \ clear_cpu_cap(&boot_cpu_data, bit); \ - set_bit(bit, (unsigned long *)cleared_cpu_caps); \ + set_bit(bit, (unsigned long *)cpu_caps_cleared); \ } while (0)#define setup_force_cpu_cap (bit) do { \ set_cpu_cap(&boot_cpu_data, bit); \ - clear_bit(bit, (unsigned long *)cleared_cpu_caps); \ + set_bit(bit, (unsigned long *)cpu_caps_set); \ } while (0)#define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU)Index:
linux-2.6/arch/x86/include/asm/processor.h
===================================================================arch/x86/include/asm/processor.h +2
-1@@ -135,7 +135,8 @@ extern struct cpuinfo_x86 boot_cpu_data;extern struct cpuinfo_x86 new_cpu_data;extern struct tss_struct doublefault_tss; -extern __u32 cleared_cpu_caps[NCAPINTS ]; +extern __u32 cpu_caps_cleared[NCAPINTS ]; +extern __u32 cpu_caps_set[NCAPINTS ];#ifdef CONFIG_SMP DECLARE_PER_CPU(struct cpuinfo_x86, cpu_info);Index:
linux-2.6/arch/x86/kernel/cpu/common.c
===================================================================arch/x86/kernel/cpu/common.c +12
-5@@ -293,7 +293,8 @@ static const char *__cpuinit table_lookureturn NULL ;/* Not found */ } -__u32 cleared_cpu_caps[NCAPINTS ]__cpuinitdata ; +__u32 cpu_caps_cleared[NCAPINTS ]__cpuinitdata ; +__u32 cpu_caps_set[NCAPINTS ]__cpuinitdata ;void load_percpu_segment (int cpu) {@@ -807,6 +808,16 @@ static void __cpuinit identify_cpu(struc#endif init_hypervisor (c); + +/* +* Clear/Set all flags overriden by options, need do it +* before following smp all cpus cap AND. +*/ +for (i =0 ; i <NCAPINTS ; i++) { + c->x86_capability[i] &= ~cpu_caps_cleared[i]; + c->x86_capability[i] |= cpu_caps_set[i]; + } +/* * On SMP, boot_cpu_data holds the common feature set between * all CPUs; so make sure that we indicate which features are @@ -819,10 +830,6 @@ static void __cpuinit identify_cpu(struc boot_cpu_data.x86_capability[i] &= c->x86_capability[i]; } -/* Clear all flags overriden by options */ -for (i =0 ; i <NCAPINTS ; i++) - c->x86_capability[i] &= ~cleared_cpu_caps[i]; -#ifdef CONFIG_X86_MCE /* Init Machine Check Exception if available. */ mcheck_init (c);