sched: new sched domain for representing multi-core
PATCH 1/1 sched: new sched domain for representing multi-core
Appended patch adds a new sched domain for representing multi-core with shared caches between cores. Consider a dual package system, each package containing two cores and with last level cache shared between cores with in a package. If there are two runnable processes, with this appended patch those two processes will be scheduled on different packages.
On such system, with this patch we have observed 8% perf improvement with specJBB(2 warehouse) benchmark and 35% improvement with CFP2000 rate(with 2 users).
This new domain will come into play only on multi-core systems with shared caches. On other systems, this sched domain will be removed by domain degeneration code. This new domain can be also used for implementing power savings policy (see OLS 2005 CMP kernel scheduler paper for more details.. I will post another patch for power savings policy soon)
Most of the arch/* file changes are for cpu_coregroup_map() implementation.
arch/i386/Kconfig +9 -0
@@ -235,6 +235,15 @@ config SCHED_SMT cost of slightly increased overhead in some places. If unsure say N here. +config SCHED_MC + bool "Multi-core scheduler support" + depends on SMP + default off + help + Multi-core scheduler support improves the CPU scheduler's decision + making when dealing with multi-core CPU chips at a cost of slightly + increased overhead in some places. If unsure say N here. + source "kernel/Kconfig.preempt" config X86_UP_APIC
arch/i386/kernel/cpu/common.c +3 -3
@@ -244,7 +244,7 @@ static void __init early_cpu_detect(voidvoid __devinit generic_identify (struct cpuinfo_x86 * c) {u32 tfms, xlvl; -int junk; +int ebx;if (have_cpuid_p ()) {/* Get vendor name */
@@ -260,7 +260,7 @@ void __devinit generic_identify(struct c/* Intel-defined flags: level 0x00000001 */ if ( c->cpuid_level >=0x00000001 ) {u32 capability, excap; -cpuid (0x00000001 , &tfms, &junk, &excap, &capability); +cpuid (0x00000001 , &tfms, &ebx, &excap, &capability); c->x86_capability[0 ] = capability; c->x86_capability[4 ] = excap; c->x86 = (tfms >>8 ) &15 ;
@@ -270,6 +270,7 @@ void __devinit generic_identify(struct c c->x86_model += ((tfms >>16 ) &0xF ) <<4 ; } c->x86_mask = tfms &15 ; + c->apicid =phys_pkg_id ((ebx >>24 ) &0xFF ,0 ); }else {/* Have CPUID level 0 only - unheard of */ c->x86 =4 ;
@@ -448,7 +449,6 @@ void __devinit detect_ht(struct cpuinfo_cpuid (1 , &eax, &ebx, &ecx, &edx); - c->apicid =phys_pkg_id ((ebx >>24 ) &0xFF ,0 );if (!cpu_has (c,X86_FEATURE_HT ) ||cpu_has (c,X86_FEATURE_CMP_LEGACY ))return ;
arch/i386/kernel/cpu/intel_cacheinfo.c +20 -2
@@ -161,6 +161,10 @@ unsigned int __cpuinit init_intel_cacheiunsigned int trace =0 , l1i =0 , l1d =0 , l2 =0 , l3 =0 ;/* Cache sizes */ unsigned int new_l1d =0 , new_l1i =0 ;/* Cache sizes from cpuid(4) */ unsigned int new_l2 =0 , new_l3 =0 , i;/* Cache sizes from cpuid(4) */ +unsigned int l2_id =0 , l3_id =0 , num_threads_sharing, index_msb; +#ifdef CONFIG_SMP +unsigned int cpu = (c == &boot_cpu_data) ?0 : (c - cpu_data); +#endif if (c->cpuid_level >4 ) {static int is_initialized;
@@ -193,9 +197,15 @@ unsigned int __cpuinit init_intel_cacheibreak ;case 2 : new_l2 = this_leaf.size/1024 ; + num_threads_sharing =1 + this_leaf.eax.split.num_threads_sharing; + index_msb =get_count_order (num_threads_sharing); + l2_id = c->apicid >> index_msb;break ;case 3 : new_l3 = this_leaf.size/1024 ; + num_threads_sharing =1 + this_leaf.eax.split.num_threads_sharing; + index_msb =get_count_order (num_threads_sharing); + l3_id = c->apicid >> index_msb;break ;default :break ;
@@ -261,11 +271,19 @@ unsigned int __cpuinit init_intel_cacheiif (new_l1i) l1i = new_l1i; -if (new_l2) +if (new_l2) { l2 = new_l2; +#ifdef CONFIG_SMP + cpu_llc_id[cpu] = l2_id; +#endif + } -if (new_l3) +if (new_l3) { l3 = new_l3; +#ifdef CONFIG_SMP + cpu_llc_id[cpu] = l3_id; +#endif + }if ( trace )printk (KERN_INFO "CPU: Trace cache: %dK uops" , trace);
arch/i386/kernel/smpboot.c +24 -0
@@ -72,6 +72,8 @@ int phys_proc_id[NR_CPUS] __read_mostly/* Core ID of each logical CPU */ int cpu_core_id[NR_CPUS ]__read_mostly = {[0 ...NR_CPUS -1 ] =BAD_APICID }; +int cpu_llc_id[NR_CPUS ]__read_mostly = {[0 ...NR_CPUS -1 ] =BAD_APICID }; +/* representing HT siblings of each logical CPU */ cpumask_t cpu_sibling_map[NR_CPUS ]__read_mostly ;EXPORT_SYMBOL (cpu_sibling_map);
@@ -84,6 +86,8 @@ EXPORT_SYMBOL(cpu_core_map);cpumask_t cpu_online_map__read_mostly ;EXPORT_SYMBOL (cpu_online_map); +cpumask_t cpu_llc_shared_map[NR_CPUS ]__read_mostly ; +cpumask_t cpu_callin_map;cpumask_t cpu_callout_map;EXPORT_SYMBOL (cpu_callout_map);
@@ -444,6 +448,17 @@ static void __devinit smp_callin(void)static int cpucount; +/* maps the cpu to the sched domain representing multi-core */ +cpumask_t cpu_coregroup_map (int cpu) +{ +/* +* For perf, we return last level cache shared map. +* TBD: when power saving sched policy is added, we will return +* cpu_core_map when power saving policy is enabled +*/ +return cpu_llc_shared_map[cpu]; +} +/* representing cpus for which sibling maps can be computed */ static cpumask_t cpu_sibling_setup_map;
@@ -463,12 +478,16 @@ set_cpu_sibling_map(int cpu)cpu_set (cpu, cpu_sibling_map[i]);cpu_set (i, cpu_core_map[cpu]);cpu_set (cpu, cpu_core_map[i]); +cpu_set (i, cpu_llc_shared_map[cpu]); +cpu_set (cpu, cpu_llc_shared_map[i]); } } }else {cpu_set (cpu, cpu_sibling_map[cpu]); } +cpu_set (cpu, cpu_llc_shared_map[cpu]); +if (current_cpu_data.x86_max_cores ==1 ) { cpu_core_map[cpu] = cpu_sibling_map[cpu]; c[cpu].booted_cores =1 ;
@@ -476,6 +495,11 @@ set_cpu_sibling_map(int cpu) }for_each_cpu_mask (i, cpu_sibling_setup_map) { +if (cpu_llc_id[cpu] !=BAD_APICID && + cpu_llc_id[cpu] == cpu_llc_id[i]) { +cpu_set (i, cpu_llc_shared_map[cpu]); +cpu_set (cpu, cpu_llc_shared_map[i]); + }if (phys_proc_id[cpu] == phys_proc_id[i]) {cpu_set (i, cpu_core_map[cpu]);cpu_set (cpu, cpu_core_map[i]);
arch/x86_64/Kconfig +9 -0
@@ -246,6 +246,15 @@ config SCHED_SMT cost of slightly increased overhead in some places. If unsure say N here. +config SCHED_MC + bool "Multi-core scheduler support" + depends on SMP + default n + help + Multi-core scheduler support improves the CPU scheduler's decision + making when dealing with multi-core CPU chips at a cost of slightly + increased overhead in some places. If unsure say N here. + source "kernel/Kconfig.preempt" config NUMA
arch/x86_64/kernel/setup.c +2 -1
@@ -935,7 +935,6 @@ static void __cpuinit detect_ht(struct ccpuid (1 , &eax, &ebx, &ecx, &edx); - c->apicid =phys_pkg_id (0 );if (!cpu_has (c,X86_FEATURE_HT ) ||cpu_has (c,X86_FEATURE_CMP_LEGACY ))return ;
@@ -1144,6 +1143,8 @@ void __cpuinit identify_cpu(struct cpuin c->x86_capability[2 ] =cpuid_edx (0x80860001 ); } + c->apicid =phys_pkg_id (0 ); +/* * Vendor-specific initialization. In this section we * canonicalize the feature flags, meaning if there are
arch/x86_64/kernel/smpboot.c +24 -0
@@ -67,6 +67,8 @@ u8 phys_proc_id[NR_CPUS] __read_mostly =/* core ID of each logical CPU */ u8 cpu_core_id[NR_CPUS ]__read_mostly = { [0 ...NR_CPUS -1 ] =BAD_APICID }; +u8 cpu_llc_id[NR_CPUS ]__read_mostly = {[0 ...NR_CPUS -1 ] =BAD_APICID }; +/* Bitmask of currently online CPUs */ cpumask_t cpu_online_map__read_mostly ;
@@ -95,6 +97,8 @@ cpumask_t cpu_sibling_map[NR_CPUS] __reacpumask_t cpu_core_map[NR_CPUS ]__read_mostly ;EXPORT_SYMBOL (cpu_core_map); +cpumask_t cpu_llc_shared_map[NR_CPUS ]__read_mostly ; +/* * Trampoline 80x86 program as an array. */
@@ -444,6 +448,17 @@ void __cpuinit smp_callin(void)cpu_set (cpuid, cpu_callin_map); } +/* maps the cpu to the sched domain representing multi-core */ +cpumask_t cpu_coregroup_map (int cpu) +{ +/* +* For perf, we return last level cache shared map. +* TBD: when power saving sched policy is added, we will return +* cpu_core_map when power saving policy is enabled +*/ +return cpu_llc_shared_map[cpu]; +} +/* representing cpus for which sibling maps can be computed */ static cpumask_t cpu_sibling_setup_map;
@@ -462,12 +477,16 @@ static inline void set_cpu_sibling_map(icpu_set (cpu, cpu_sibling_map[i]);cpu_set (i, cpu_core_map[cpu]);cpu_set (cpu, cpu_core_map[i]); +cpu_set (i, cpu_llc_shared_map[cpu]); +cpu_set (cpu, cpu_llc_shared_map[i]); } } }else {cpu_set (cpu, cpu_sibling_map[cpu]); } +cpu_set (cpu, cpu_llc_shared_map[cpu]); +if (current_cpu_data.x86_max_cores ==1 ) { cpu_core_map[cpu] = cpu_sibling_map[cpu]; c[cpu].booted_cores =1 ;
@@ -475,6 +494,11 @@ static inline void set_cpu_sibling_map(i }for_each_cpu_mask (i, cpu_sibling_setup_map) { +if (cpu_llc_id[cpu] !=BAD_APICID && + cpu_llc_id[cpu] == cpu_llc_id[i]) { +cpu_set (i, cpu_llc_shared_map[cpu]); +cpu_set (cpu, cpu_llc_shared_map[i]); + }if (phys_proc_id[cpu] == phys_proc_id[i]) {cpu_set (i, cpu_core_map[cpu]);cpu_set (cpu, cpu_core_map[i]);
include/asm-i386/processor.h +1 -0
@@ -103,6 +103,7 @@ extern struct cpuinfo_x86 cpu_data[];extern int phys_proc_id[NR_CPUS ];extern int cpu_core_id[NR_CPUS ]; +extern int cpu_llc_id[NR_CPUS ];extern char ignore_fpu_irq;extern void identify_cpu (struct cpuinfo_x86 *);
include/asm-i386/smp.h +1 -0
@@ -36,6 +36,7 @@ extern int pic_mode;extern int smp_num_siblings;extern cpumask_t cpu_sibling_map[];extern cpumask_t cpu_core_map[]; +extern cpumask_t cpu_llc_shared_map[];extern void (*mtrr_hook) (void );extern void zap_low_mappings (void );
include/asm-i386/topology.h +2 -0
@@ -103,4 +103,6 @@ extern unsigned long node_remap_size[];#endif /* CONFIG_NUMA */ +extern cpumask_t cpu_coregroup_map (int cpu); +#endif /* _ASM_I386_TOPOLOGY_H */
include/asm-x86_64/smp.h +2 -0
@@ -54,8 +54,10 @@ extern int smp_call_function_single(intextern cpumask_t cpu_sibling_map[NR_CPUS ];extern cpumask_t cpu_core_map[NR_CPUS ]; +extern cpumask_t cpu_llc_shared_map[NR_CPUS ];extern u8 phys_proc_id[NR_CPUS ];extern u8 cpu_core_id[NR_CPUS ]; +extern u8 cpu_llc_id[NR_CPUS ];#define SMP_TRAMPOLINE_BASE 0x6000
include/asm-x86_64/topology.h +2 -0
@@ -59,4 +59,6 @@ extern int __node_distance(int, int);#include <asm-generic/topology.h> +extern cpumask_t cpu_coregroup_map (int cpu); +#endif
include/linux/topology.h +9 -0
@@ -156,6 +156,15 @@ .nr_balance_failed = 0, \ } +#ifdef CONFIG_SCHED_MC +#ifndef SD_MC_INIT +/* for now its same as SD_CPU_INIT. +* TBD: Tune Domain parameters! +*/ +#define SD_MC_INIT SD_CPU_INIT +#endif +#endif +#ifdef CONFIG_NUMA #ifndef SD_NODE_INIT #error Please define an appropriate SD_NODE_INIT in include/asm/topology.h!!!
kernel/sched.c +65 -6
124 lines not on this page · raw message
a few minor nits:
arch/i386/Kconfig config SCHED_SMT · line 241
Quoted 4 lines · Siddha, Suresh B
arch/i386/Kconfig +4
-0+config SCHED_MC + bool "Multi-core scheduler support" + depends on SMP + default off
no need to add 'default off', that's the default.
kernel/sched.c next_sg: · line 5991
Quoted 2 lines
kernel/sched.c +1
-1-#ifdef CONFIG_SCHED_SMT +#if defined(CONFIG_SCHED_SMT )
stale change.
Otherwise, looks pretty clean to me, both the scheduler and the x86_* arch level bits! Would be nice to get this tested in -mm too.
Ingo
Siddha, Suresh B
Acked-by Ingo MolnarQuoted 4 lines · Ingo Molnar
Otherwise, looks pretty clean to me, both the scheduler and the x86_* arch level bits! Would be nice to get this tested in -mm too.
Acked-by Ingo Molnar <[email protected]>
Andrew, Please apply to -mm. Thanks.
--
Appended patch adds a new sched domain for representing multi-core with shared caches between cores. Consider a dual package system, each package containing two cores and with last level cache shared between cores with in a package. If there are two runnable processes, with this appended patch those two processes will be scheduled on different packages.
On such system, with this patch we have observed 8% perf improvement with specJBB(2 warehouse) benchmark and 35% improvement with CFP2000 rate(with 2 users).
This new domain will come into play only on multi-core systems with shared caches. On other systems, this sched domain will be removed by domain degeneration code. This new domain can be also used for implementing power savings policy (see OLS 2005 CMP kernel scheduler paper for more details.. I will post another patch for power savings policy soon)
Most of the arch/* file changes are for cpu_coregroup_map() implementation.
arch/i386/Kconfig +8 -0
@@ -235,6 +235,14 @@ config SCHED_SMT cost of slightly increased overhead in some places. If unsure say N here. +config SCHED_MC + bool "Multi-core scheduler support" + depends on SMP + help + Multi-core scheduler support improves the CPU scheduler's decision + making when dealing with multi-core CPU chips at a cost of slightly + increased overhead in some places. If unsure say N here. + source "kernel/Kconfig.preempt" config X86_UP_APIC
arch/i386/kernel/cpu/common.c +3 -3
@@ -244,7 +244,7 @@ static void __init early_cpu_detect(voidvoid __devinit generic_identify (struct cpuinfo_x86 * c) {u32 tfms, xlvl; -int junk; +int ebx;if (have_cpuid_p ()) {/* Get vendor name */
@@ -260,7 +260,7 @@ void __devinit generic_identify(struct c/* Intel-defined flags: level 0x00000001 */ if ( c->cpuid_level >=0x00000001 ) {u32 capability, excap; -cpuid (0x00000001 , &tfms, &junk, &excap, &capability); +cpuid (0x00000001 , &tfms, &ebx, &excap, &capability); c->x86_capability[0 ] = capability; c->x86_capability[4 ] = excap; c->x86 = (tfms >>8 ) &15 ;
@@ -270,6 +270,7 @@ void __devinit generic_identify(struct c c->x86_model += ((tfms >>16 ) &0xF ) <<4 ; } c->x86_mask = tfms &15 ; + c->apicid =phys_pkg_id ((ebx >>24 ) &0xFF ,0 ); }else {/* Have CPUID level 0 only - unheard of */ c->x86 =4 ;
@@ -448,7 +449,6 @@ void __devinit detect_ht(struct cpuinfo_cpuid (1 , &eax, &ebx, &ecx, &edx); - c->apicid =phys_pkg_id ((ebx >>24 ) &0xFF ,0 );if (!cpu_has (c,X86_FEATURE_HT ) ||cpu_has (c,X86_FEATURE_CMP_LEGACY ))return ;
arch/i386/kernel/cpu/intel_cacheinfo.c +20 -2
@@ -161,6 +161,10 @@ unsigned int __cpuinit init_intel_cacheiunsigned int trace =0 , l1i =0 , l1d =0 , l2 =0 , l3 =0 ;/* Cache sizes */ unsigned int new_l1d =0 , new_l1i =0 ;/* Cache sizes from cpuid(4) */ unsigned int new_l2 =0 , new_l3 =0 , i;/* Cache sizes from cpuid(4) */ +unsigned int l2_id =0 , l3_id =0 , num_threads_sharing, index_msb; +#ifdef CONFIG_SMP +unsigned int cpu = (c == &boot_cpu_data) ?0 : (c - cpu_data); +#endif if (c->cpuid_level >4 ) {static int is_initialized;
@@ -193,9 +197,15 @@ unsigned int __cpuinit init_intel_cacheibreak ;case 2 : new_l2 = this_leaf.size/1024 ; + num_threads_sharing =1 + this_leaf.eax.split.num_threads_sharing; + index_msb =get_count_order (num_threads_sharing); + l2_id = c->apicid >> index_msb;break ;case 3 : new_l3 = this_leaf.size/1024 ; + num_threads_sharing =1 + this_leaf.eax.split.num_threads_sharing; + index_msb =get_count_order (num_threads_sharing); + l3_id = c->apicid >> index_msb;break ;default :break ;
@@ -261,11 +271,19 @@ unsigned int __cpuinit init_intel_cacheiif (new_l1i) l1i = new_l1i; -if (new_l2) +if (new_l2) { l2 = new_l2; +#ifdef CONFIG_SMP + cpu_llc_id[cpu] = l2_id; +#endif + } -if (new_l3) +if (new_l3) { l3 = new_l3; +#ifdef CONFIG_SMP + cpu_llc_id[cpu] = l3_id; +#endif + }if ( trace )printk (KERN_INFO "CPU: Trace cache: %dK uops" , trace);
arch/i386/kernel/smpboot.c +24 -0
@@ -72,6 +72,8 @@ int phys_proc_id[NR_CPUS] __read_mostly/* Core ID of each logical CPU */ int cpu_core_id[NR_CPUS ]__read_mostly = {[0 ...NR_CPUS -1 ] =BAD_APICID }; +int cpu_llc_id[NR_CPUS ]__read_mostly = {[0 ...NR_CPUS -1 ] =BAD_APICID }; +/* representing HT siblings of each logical CPU */ cpumask_t cpu_sibling_map[NR_CPUS ]__read_mostly ;EXPORT_SYMBOL (cpu_sibling_map);
@@ -84,6 +86,8 @@ EXPORT_SYMBOL(cpu_core_map);cpumask_t cpu_online_map__read_mostly ;EXPORT_SYMBOL (cpu_online_map); +cpumask_t cpu_llc_shared_map[NR_CPUS ]__read_mostly ; +cpumask_t cpu_callin_map;cpumask_t cpu_callout_map;EXPORT_SYMBOL (cpu_callout_map);
@@ -444,6 +448,17 @@ static void __devinit smp_callin(void)static int cpucount; +/* maps the cpu to the sched domain representing multi-core */ +cpumask_t cpu_coregroup_map (int cpu) +{ +/* +* For perf, we return last level cache shared map. +* TBD: when power saving sched policy is added, we will return +* cpu_core_map when power saving policy is enabled +*/ +return cpu_llc_shared_map[cpu]; +} +/* representing cpus for which sibling maps can be computed */ static cpumask_t cpu_sibling_setup_map;
@@ -463,12 +478,16 @@ set_cpu_sibling_map(int cpu)cpu_set (cpu, cpu_sibling_map[i]);cpu_set (i, cpu_core_map[cpu]);cpu_set (cpu, cpu_core_map[i]); +cpu_set (i, cpu_llc_shared_map[cpu]); +cpu_set (cpu, cpu_llc_shared_map[i]); } } }else {cpu_set (cpu, cpu_sibling_map[cpu]); } +cpu_set (cpu, cpu_llc_shared_map[cpu]); +if (current_cpu_data.x86_max_cores ==1 ) { cpu_core_map[cpu] = cpu_sibling_map[cpu]; c[cpu].booted_cores =1 ;
@@ -476,6 +495,11 @@ set_cpu_sibling_map(int cpu) }for_each_cpu_mask (i, cpu_sibling_setup_map) { +if (cpu_llc_id[cpu] !=BAD_APICID && + cpu_llc_id[cpu] == cpu_llc_id[i]) { +cpu_set (i, cpu_llc_shared_map[cpu]); +cpu_set (cpu, cpu_llc_shared_map[i]); + }if (phys_proc_id[cpu] == phys_proc_id[i]) {cpu_set (i, cpu_core_map[cpu]);cpu_set (cpu, cpu_core_map[i]);
arch/x86_64/Kconfig +8 -0
@@ -246,6 +246,14 @@ config SCHED_SMT cost of slightly increased overhead in some places. If unsure say N here. +config SCHED_MC + bool "Multi-core scheduler support" + depends on SMP + help + Multi-core scheduler support improves the CPU scheduler's decision + making when dealing with multi-core CPU chips at a cost of slightly + increased overhead in some places. If unsure say N here. + source "kernel/Kconfig.preempt" config NUMA
arch/x86_64/kernel/setup.c +2 -1
@@ -935,7 +935,6 @@ static void __cpuinit detect_ht(struct ccpuid (1 , &eax, &ebx, &ecx, &edx); - c->apicid =phys_pkg_id (0 );if (!cpu_has (c,X86_FEATURE_HT ) ||cpu_has (c,X86_FEATURE_CMP_LEGACY ))return ;
@@ -1144,6 +1143,8 @@ void __cpuinit identify_cpu(struct cpuin c->x86_capability[2 ] =cpuid_edx (0x80860001 ); } + c->apicid =phys_pkg_id (0 ); +/* * Vendor-specific initialization. In this section we * canonicalize the feature flags, meaning if there are
arch/x86_64/kernel/smpboot.c +24 -0
@@ -67,6 +67,8 @@ u8 phys_proc_id[NR_CPUS] __read_mostly =/* core ID of each logical CPU */ u8 cpu_core_id[NR_CPUS ]__read_mostly = { [0 ...NR_CPUS -1 ] =BAD_APICID }; +u8 cpu_llc_id[NR_CPUS ]__read_mostly = {[0 ...NR_CPUS -1 ] =BAD_APICID }; +/* Bitmask of currently online CPUs */ cpumask_t cpu_online_map__read_mostly ;
@@ -95,6 +97,8 @@ cpumask_t cpu_sibling_map[NR_CPUS] __reacpumask_t cpu_core_map[NR_CPUS ]__read_mostly ;EXPORT_SYMBOL (cpu_core_map); +cpumask_t cpu_llc_shared_map[NR_CPUS ]__read_mostly ; +/* * Trampoline 80x86 program as an array. */
@@ -444,6 +448,17 @@ void __cpuinit smp_callin(void)cpu_set (cpuid, cpu_callin_map); } +/* maps the cpu to the sched domain representing multi-core */ +cpumask_t cpu_coregroup_map (int cpu) +{ +/* +* For perf, we return last level cache shared map. +* TBD: when power saving sched policy is added, we will return +* cpu_core_map when power saving policy is enabled +*/ +return cpu_llc_shared_map[cpu]; +} +/* representing cpus for which sibling maps can be computed */ static cpumask_t cpu_sibling_setup_map;
@@ -462,12 +477,16 @@ static inline void set_cpu_sibling_map(icpu_set (cpu, cpu_sibling_map[i]);cpu_set (i, cpu_core_map[cpu]);cpu_set (cpu, cpu_core_map[i]); +cpu_set (i, cpu_llc_shared_map[cpu]); +cpu_set (cpu, cpu_llc_shared_map[i]); } } }else {cpu_set (cpu, cpu_sibling_map[cpu]); } +cpu_set (cpu, cpu_llc_shared_map[cpu]); +if (current_cpu_data.x86_max_cores ==1 ) { cpu_core_map[cpu] = cpu_sibling_map[cpu]; c[cpu].booted_cores =1 ;
@@ -475,6 +494,11 @@ static inline void set_cpu_sibling_map(i }for_each_cpu_mask (i, cpu_sibling_setup_map) { +if (cpu_llc_id[cpu] !=BAD_APICID && + cpu_llc_id[cpu] == cpu_llc_id[i]) { +cpu_set (i, cpu_llc_shared_map[cpu]); +cpu_set (cpu, cpu_llc_shared_map[i]); + }if (phys_proc_id[cpu] == phys_proc_id[i]) {cpu_set (i, cpu_core_map[cpu]);cpu_set (cpu, cpu_core_map[i]);
include/asm-i386/processor.h +1 -0
@@ -103,6 +103,7 @@ extern struct cpuinfo_x86 cpu_data[];extern int phys_proc_id[NR_CPUS ];extern int cpu_core_id[NR_CPUS ]; +extern int cpu_llc_id[NR_CPUS ];extern char ignore_fpu_irq;extern void identify_cpu (struct cpuinfo_x86 *);
include/asm-i386/smp.h +1 -0
@@ -36,6 +36,7 @@ extern int pic_mode;extern int smp_num_siblings;extern cpumask_t cpu_sibling_map[];extern cpumask_t cpu_core_map[]; +extern cpumask_t cpu_llc_shared_map[];extern void (*mtrr_hook) (void );extern void zap_low_mappings (void );
include/asm-i386/topology.h +2 -0
@@ -103,4 +103,6 @@ extern unsigned long node_remap_size[];#endif /* CONFIG_NUMA */ +extern cpumask_t cpu_coregroup_map (int cpu); +#endif /* _ASM_I386_TOPOLOGY_H */
include/asm-x86_64/smp.h +2 -0
@@ -54,8 +54,10 @@ extern int smp_call_function_single(intextern cpumask_t cpu_sibling_map[NR_CPUS ];extern cpumask_t cpu_core_map[NR_CPUS ]; +extern cpumask_t cpu_llc_shared_map[NR_CPUS ];extern u8 phys_proc_id[NR_CPUS ];extern u8 cpu_core_id[NR_CPUS ]; +extern u8 cpu_llc_id[NR_CPUS ];#define SMP_TRAMPOLINE_BASE 0x6000
include/asm-x86_64/topology.h +2 -0
@@ -59,4 +59,6 @@ extern int __node_distance(int, int);#include <asm-generic/topology.h> +extern cpumask_t cpu_coregroup_map (int cpu); +#endif
include/linux/topology.h +9 -0
@@ -156,6 +156,15 @@ .nr_balance_failed = 0, \ } +#ifdef CONFIG_SCHED_MC +#ifndef SD_MC_INIT +/* for now its same as SD_CPU_INIT. +* TBD: Tune Domain parameters! +*/ +#define SD_MC_INIT SD_CPU_INIT +#endif +#endif +#ifdef CONFIG_NUMA #ifndef SD_NODE_INIT #error Please define an appropriate SD_NODE_INIT in include/asm/topology.h!!!
kernel/sched.c +64 -5
121 lines not on this page · raw message
Quoted 44 lines · Suresh B
Appended patch adds a new sched domain for representing multi-core with shared caches between cores. Consider a dual package system, each package containing two cores and with last level cache shared between cores with in a package. If there are two runnable processes, with this appended patch those two processes will be scheduled on different packages.
On such system, with this patch we have observed 8% perf improvement with specJBB(2 warehouse) benchmark and 35% improvement with CFP2000 rate(with 2 users).
This new domain will come into play only on multi-core systems with shared caches. On other systems, this sched domain will be removed by domain degeneration code. This new domain can be also used for implementing power savings policy (see OLS 2005 CMP kernel scheduler paper for more details.. I will post another patch for power savings policy soon)
Most of the
arch/*file changes are forcpu_coregroup_map()implementation.Signed-off-by Suresh Siddha <[email protected]>Acked-by Ingo Molnar <[email protected]>include/linux/topology.h +9
-0+#ifdef CONFIG_SCHED_MC +#ifndef SD_MC_INIT +/* for now its same as SD_CPU_INIT. +* TBD: Tune Domain parameters! +*/ +#define SD_MC_INIT SD_CPU_INIT +#endif +#endif +#ifdef CONFIG_NUMA #ifndef SD_NODE_INIT #error Please define an appropriate SD_NODE_INIT in include/asm/topology.h!!!diff -pNru
linux-2.6.16-rc1/kernel/sched.clinux-core/kernel/sched.ckernel/sched.c +2
-0@@ -5658,11 +5658,27 @@ static int cpu_to_cpu_group(int cpu) }#endif +#ifdef CONFIG_SCHED_MC +static DEFINE_PER_CPU(struct sched_domain, core_domains);
kernel/sched.c static int cpu_to_cpu_group(int cpu) · line 5672
Quoted 10 lines
kernel/sched.c +10
-0+static struct sched_group sched_group_core[NR_CPUS ]; +static int cpu_to_core_group (int cpu) +{ +#ifdef CONFIG_SCHED_SMT +return first_cpu (cpu_sibling_map[cpu]); +#else +return cpu; +#endif +} +#endif
ifdefs are getting a bit crazy here.. It'd be nice if we could revisit this cometime with a view to cleaning them up a bit.
#if defined(A) && defined(B)
beats
#ifdef A #ifdef B ... #endif #endif
kernel/sched.c static int cpu_to_cpu_group(int cpu) · line 5683
Quoted 11 lines
kernel/sched.c +4
-1static DEFINE_PER_CPU(struct sched_domain, phys_domains);static struct sched_group sched_group_phys[NR_CPUS ];static int cpu_to_phys_group (int cpu) { -#ifdef CONFIG_SCHED_SMT +#if defined(CONFIG_SCHED_MC ) +cpumask_t mask =cpu_coregroup_map (cpu); +return first_cpu (mask); +#elif defined(CONFIG_SCHED_SMT )return first_cpu (cpu_sibling_map[cpu]);#else
So here, CONFIG_SCHED_SMT only comes into effect if CONFIG_SCHED_MC=n.
Quoted 9 lines
kernel/sched.c +4
-0return cpu;@@ -5760,6 +5776,17 @@ void build_sched_domains(const cpumask_t sd->parent = p; sd->groups = &sched_group_phys[group]; +#ifdef CONFIG_SCHED_MC + p = sd; + sd = &per_cpu (core_domains, i); + group =cpu_to_core_group (i);
kernel/sched.c void build_sched_domains(const cpumask_t · line 5792
Quoted 10 lines
kernel/sched.c +7
-0+ *sd =SD_MC_INIT ; + sd->span =cpu_coregroup_map (i); +cpus_and (sd->span, sd->span, *cpu_map); + sd->parent = p; + sd->groups = &sched_group_core[group]; +#endif +#ifdef CONFIG_SCHED_SMT p = sd; sd = &per_cpu (cpu_domains, i);
But here, if CONFIG_CHED_MC=y and CONFIG_SCHED_SMT=y, SMT will win.
Quoted 5 lines
kernel/sched.c +1
-0@@ -5785,6 +5812,19 @@ void build_sched_domains(const cpumask_t }#endif +#ifdef CONFIG_SCHED_MC
kernel/sched.c void build_sched_domains(const cpumask_t · line 5825
Quoted 10 lines
kernel/sched.c +10
-0+/* Set up CMP (core) groups */ +for_each_online_cpu (i) { +cpumask_t this_core_map =cpu_coregroup_map (i); +cpus_and (this_core_map, this_core_map, *cpu_map); +if (i !=first_cpu (this_core_map)) +continue ; +init_sched_build_groups (sched_group_core, this_core_map, + &cpu_to_core_group); + } +#endif
I think the for_each_online_cpu() is wrong. The CPU hotplug CPU_UP notifier is called _before_ the newly-upped CPU is marked in cpu_online_map. You'll see that the other code in build_sched_domains() is using for_each_cpu_mask with the cpu mask which is soon to become cpu_online_map.
Quoted 18 lines
kernel/sched.c +10
-0+/* Set up physical groups */ for (i =0 ; i <MAX_NUMNODES ; i++) {cpumask_t nodemask =node_to_cpumask (i);@@ -5881,11 +5921,31 @@ void build_sched_domains(const cpumask_t power =SCHED_LOAD_SCALE ; sd->groups->cpu_power = power;#endif +#ifdef CONFIG_SCHED_MC + sd = &per_cpu (core_domains, i); + power =SCHED_LOAD_SCALE + (cpus_weight (sd->groups->cpumask)-1 ) + *SCHED_LOAD_SCALE /10 ; + sd->groups->cpu_power = power; + + sd = &per_cpu (phys_domains, i); +/* +* This has to be < 2 * SCHED_LOAD_SCALE
kernel/sched.c void build_sched_domains(const cpumask_t · line 5943
Quoted 10 lines
kernel/sched.c +10
-0+* Lets keep it SCHED_LOAD_SCALE, so that +* while calculating NUMA group's cpu_power +* we can simply do +* numa_group->cpu_power += phys_group->cpu_power; +* +* See "only add power once for each physical pkg" +* comment below +*/ + sd->groups->cpu_power =SCHED_LOAD_SCALE ; +#else
And in this case, if CONFIG_SCHED_MC=y and CONFIG_SCHED_SMT=y, SMT will lose.
Perhaps we should just make SMT and MC disjoint in Kconfig. Your call.
I'll duck the patch for now.
Quoted 1 line · Andrew Morton
Perhaps we should just make SMT and MC disjoint in
Kconfig. Your call.
No. SMT and MC are not disjoint.
Quoted 1 line
I'll duck the patch for now.
Appended a new patch with all the feedback incorporated. Please apply.
thanks,
suresh
--
Appended patch adds a new sched domain for representing multi-core with shared caches between cores. Consider a dual package system, each package containing two cores and with last level cache shared between cores with in a package. If there are two runnable processes, with this appended patch those two processes will be scheduled on different packages.
On such system, with this patch we have observed 8% perf improvement with specJBB(2 warehouse) benchmark and 35% improvement with CFP2000 rate(with 2 users).
This new domain will come into play only on multi-core systems with shared caches. On other systems, this sched domain will be removed by domain degeneration code. This new domain can be also used for implementing power savings policy (see OLS 2005 CMP kernel scheduler paper for more details.. I will post another patch for power savings policy soon)
Most of the arch/* file changes are for cpu_coregroup_map() implementation.
arch/i386/Kconfig +8 -0
@@ -235,6 +235,14 @@ config SCHED_SMT cost of slightly increased overhead in some places. If unsure say N here. +config SCHED_MC + bool "Multi-core scheduler support" + depends on SMP + help + Multi-core scheduler support improves the CPU scheduler's decision + making when dealing with multi-core CPU chips at a cost of slightly + increased overhead in some places. If unsure say N here. + source "kernel/Kconfig.preempt" config X86_UP_APIC
arch/i386/kernel/cpu/common.c +7 -3
@@ -244,7 +244,7 @@ static void __init early_cpu_detect(voidvoid __devinit generic_identify (struct cpuinfo_x86 * c) {u32 tfms, xlvl; -int junk; +int ebx;if (have_cpuid_p ()) {/* Get vendor name */
@@ -260,7 +260,7 @@ void __devinit generic_identify(struct c/* Intel-defined flags: level 0x00000001 */ if ( c->cpuid_level >=0x00000001 ) {u32 capability, excap; -cpuid (0x00000001 , &tfms, &junk, &excap, &capability); +cpuid (0x00000001 , &tfms, &ebx, &excap, &capability); c->x86_capability[0 ] = capability; c->x86_capability[4 ] = excap; c->x86 = (tfms >>8 ) &15 ;
@@ -270,6 +270,11 @@ void __devinit generic_identify(struct c c->x86_model += ((tfms >>16 ) &0xF ) <<4 ; } c->x86_mask = tfms &15 ; +#ifdef CONFIG_SMP + c->apicid =phys_pkg_id ((ebx >>24 ) &0xFF ,0 ); +#else + c->apicid = (ebx >>24 ) &0xFF ; +#endif }else {/* Have CPUID level 0 only - unheard of */ c->x86 =4 ;
@@ -448,7 +453,6 @@ void __devinit detect_ht(struct cpuinfo_cpuid (1 , &eax, &ebx, &ecx, &edx); - c->apicid =phys_pkg_id ((ebx >>24 ) &0xFF ,0 );if (!cpu_has (c,X86_FEATURE_HT ) ||cpu_has (c,X86_FEATURE_CMP_LEGACY ))return ;
arch/i386/kernel/cpu/intel_cacheinfo.c +20 -2
@@ -161,6 +161,10 @@ unsigned int __cpuinit init_intel_cacheiunsigned int trace =0 , l1i =0 , l1d =0 , l2 =0 , l3 =0 ;/* Cache sizes */ unsigned int new_l1d =0 , new_l1i =0 ;/* Cache sizes from cpuid(4) */ unsigned int new_l2 =0 , new_l3 =0 , i;/* Cache sizes from cpuid(4) */ +unsigned int l2_id =0 , l3_id =0 , num_threads_sharing, index_msb; +#ifdef CONFIG_SMP +unsigned int cpu = (c == &boot_cpu_data) ?0 : (c - cpu_data); +#endif if (c->cpuid_level >4 ) {static int is_initialized;
@@ -193,9 +197,15 @@ unsigned int __cpuinit init_intel_cacheibreak ;case 2 : new_l2 = this_leaf.size/1024 ; + num_threads_sharing =1 + this_leaf.eax.split.num_threads_sharing; + index_msb =get_count_order (num_threads_sharing); + l2_id = c->apicid >> index_msb;break ;case 3 : new_l3 = this_leaf.size/1024 ; + num_threads_sharing =1 + this_leaf.eax.split.num_threads_sharing; + index_msb =get_count_order (num_threads_sharing); + l3_id = c->apicid >> index_msb;break ;default :break ;
@@ -261,11 +271,19 @@ unsigned int __cpuinit init_intel_cacheiif (new_l1i) l1i = new_l1i; -if (new_l2) +if (new_l2) { l2 = new_l2; +#ifdef CONFIG_SMP + cpu_llc_id[cpu] = l2_id; +#endif + } -if (new_l3) +if (new_l3) { l3 = new_l3; +#ifdef CONFIG_SMP + cpu_llc_id[cpu] = l3_id; +#endif + }if ( trace )printk (KERN_INFO "CPU: Trace cache: %dK uops" , trace);
arch/i386/kernel/smpboot.c +24 -0
@@ -72,6 +72,9 @@ int phys_proc_id[NR_CPUS] __read_mostly/* Core ID of each logical CPU */ int cpu_core_id[NR_CPUS ]__read_mostly = {[0 ...NR_CPUS -1 ] =BAD_APICID }; +/* Last level cache ID of each logical CPU */ +int cpu_llc_id[NR_CPUS ]__cpuinitdata = {[0 ...NR_CPUS -1 ] =BAD_APICID }; +/* representing HT siblings of each logical CPU */ cpumask_t cpu_sibling_map[NR_CPUS ]__read_mostly ;EXPORT_SYMBOL (cpu_sibling_map);
@@ -444,6 +447,18 @@ static void __devinit smp_callin(void)static int cpucount; +/* maps the cpu to the sched domain representing multi-core */ +cpumask_t cpu_coregroup_map (int cpu) +{ +struct cpuinfo_x86 *c = cpu_data + cpu; +/* +* For perf, we return last level cache shared map. +* TBD: when power saving sched policy is added, we will return +* cpu_core_map when power saving policy is enabled +*/ +return c->llc_shared_map; +} +/* representing cpus for which sibling maps can be computed */ static cpumask_t cpu_sibling_setup_map;
@@ -463,12 +478,16 @@ set_cpu_sibling_map(int cpu)cpu_set (cpu, cpu_sibling_map[i]);cpu_set (i, cpu_core_map[cpu]);cpu_set (cpu, cpu_core_map[i]); +cpu_set (i, c[cpu].llc_shared_map); +cpu_set (cpu, c[i].llc_shared_map); } } }else {cpu_set (cpu, cpu_sibling_map[cpu]); } +cpu_set (cpu, c[cpu].llc_shared_map); +if (current_cpu_data.x86_max_cores ==1 ) { cpu_core_map[cpu] = cpu_sibling_map[cpu]; c[cpu].booted_cores =1 ;
@@ -476,6 +495,11 @@ set_cpu_sibling_map(int cpu) }for_each_cpu_mask (i, cpu_sibling_setup_map) { +if (cpu_llc_id[cpu] !=BAD_APICID && + cpu_llc_id[cpu] == cpu_llc_id[i]) { +cpu_set (i, c[cpu].llc_shared_map); +cpu_set (cpu, c[i].llc_shared_map); + }if (phys_proc_id[cpu] == phys_proc_id[i]) {cpu_set (i, cpu_core_map[cpu]);cpu_set (cpu, cpu_core_map[i]);
arch/x86_64/Kconfig +8 -0
@@ -246,6 +246,14 @@ config SCHED_SMT cost of slightly increased overhead in some places. If unsure say N here. +config SCHED_MC + bool "Multi-core scheduler support" + depends on SMP + help + Multi-core scheduler support improves the CPU scheduler's decision + making when dealing with multi-core CPU chips at a cost of slightly + increased overhead in some places. If unsure say N here. + source "kernel/Kconfig.preempt" config NUMA
arch/x86_64/kernel/setup.c +2 -1
@@ -935,7 +935,6 @@ static void __cpuinit detect_ht(struct ccpuid (1 , &eax, &ebx, &ecx, &edx); - c->apicid =phys_pkg_id (0 );if (!cpu_has (c,X86_FEATURE_HT ) ||cpu_has (c,X86_FEATURE_CMP_LEGACY ))return ;
@@ -1144,6 +1143,8 @@ void __cpuinit identify_cpu(struct cpuin c->x86_capability[2 ] =cpuid_edx (0x80860001 ); } + c->apicid =phys_pkg_id (0 ); +/* * Vendor-specific initialization. In this section we * canonicalize the feature flags, meaning if there are
arch/x86_64/kernel/smpboot.c +24 -0
@@ -67,6 +67,9 @@ u8 phys_proc_id[NR_CPUS] __read_mostly =/* core ID of each logical CPU */ u8 cpu_core_id[NR_CPUS ]__read_mostly = { [0 ...NR_CPUS -1 ] =BAD_APICID }; +/* Last level cache ID of each logical CPU */ +u8 cpu_llc_id[NR_CPUS ]__cpuinitdata = {[0 ...NR_CPUS -1 ] =BAD_APICID }; +/* Bitmask of currently online CPUs */ cpumask_t cpu_online_map__read_mostly ;
@@ -444,6 +447,18 @@ void __cpuinit smp_callin(void)cpu_set (cpuid, cpu_callin_map); } +/* maps the cpu to the sched domain representing multi-core */ +cpumask_t cpu_coregroup_map (int cpu) +{ +struct cpuinfo_x86 *c = cpu_data + cpu; +/* +* For perf, we return last level cache shared map. +* TBD: when power saving sched policy is added, we will return +* cpu_core_map when power saving policy is enabled +*/ +return c->llc_shared_map; +} +/* representing cpus for which sibling maps can be computed */ static cpumask_t cpu_sibling_setup_map;
@@ -462,12 +477,16 @@ static inline void set_cpu_sibling_map(icpu_set (cpu, cpu_sibling_map[i]);cpu_set (i, cpu_core_map[cpu]);cpu_set (cpu, cpu_core_map[i]); +cpu_set (i, c[cpu].llc_shared_map); +cpu_set (cpu, c[i].llc_shared_map); } } }else {cpu_set (cpu, cpu_sibling_map[cpu]); } +cpu_set (cpu, c[cpu].llc_shared_map); +if (current_cpu_data.x86_max_cores ==1 ) { cpu_core_map[cpu] = cpu_sibling_map[cpu]; c[cpu].booted_cores =1 ;
@@ -475,6 +494,11 @@ static inline void set_cpu_sibling_map(i }for_each_cpu_mask (i, cpu_sibling_setup_map) { +if (cpu_llc_id[cpu] !=BAD_APICID && + cpu_llc_id[cpu] == cpu_llc_id[i]) { +cpu_set (i, c[cpu].llc_shared_map); +cpu_set (cpu, c[i].llc_shared_map); + }if (phys_proc_id[cpu] == phys_proc_id[i]) {cpu_set (i, cpu_core_map[cpu]);cpu_set (cpu, cpu_core_map[i]);
include/asm-i386/processor.h +5 -0
@@ -20,6 +20,7 @@#include <linux/config.h> #include <linux/threads.h> #include <asm/percpu.h> +#include <linux/cpumask.h> /* flag for disabling the tsc */ extern int tsc_disable;
@@ -67,6 +68,9 @@ struct cpuinfo_x86 {char pad0;int x86_power;unsigned long loops_per_jiffy; +#ifdef CONFIG_SMP +cpumask_t llc_shared_map;/* cpus sharing the last level cache */ +#endif unsigned char x86_max_cores;/* cpuid returned max cores value */ unsigned char booted_cores;/* number of cores as seen by OS */ unsigned char apicid;
@@ -103,6 +107,7 @@ extern struct cpuinfo_x86 cpu_data[];extern int phys_proc_id[NR_CPUS ];extern int cpu_core_id[NR_CPUS ]; +extern int cpu_llc_id[NR_CPUS ];extern char ignore_fpu_irq;extern void identify_cpu (struct cpuinfo_x86 *);
include/asm-i386/topology.h +2 -0
@@ -103,4 +103,6 @@ extern unsigned long node_remap_size[];#endif /* CONFIG_NUMA */ +extern cpumask_t cpu_coregroup_map (int cpu); +#endif /* _ASM_I386_TOPOLOGY_H */
include/asm-x86_64/processor.h +4 -0
@@ -20,6 +20,7 @@#include <asm/mmsegment.h> #include <asm/percpu.h> #include <linux/personality.h> +#include <linux/cpumask.h> #define TF_MASK 0x00000100#define IF_MASK 0x00000200
@@ -65,6 +66,9 @@ struct cpuinfo_x86 {__u32 x86_power;__u32 extended_cpuid_level;/* Max extended CPUID function supported */ unsigned long loops_per_jiffy; +#ifdef CONFIG_SMP +cpumask_t llc_shared_map;/* cpus sharing the last level cache */ +#endif __u8 apicid;__u8 booted_cores;/* number of cores as seen by OS */ }____cacheline_aligned ;
include/asm-x86_64/smp.h +1 -0
@@ -56,6 +56,7 @@ extern cpumask_t cpu_sibling_map[NR_CPUSextern cpumask_t cpu_core_map[NR_CPUS ];extern u8 phys_proc_id[NR_CPUS ];extern u8 cpu_core_id[NR_CPUS ]; +extern u8 cpu_llc_id[NR_CPUS ];#define SMP_TRAMPOLINE_BASE 0x6000
include/asm-x86_64/topology.h +2 -0
@@ -59,4 +59,6 @@ extern int __node_distance(int, int);#include <asm-generic/topology.h> +extern cpumask_t cpu_coregroup_map (int cpu); +#endif
include/linux/topology.h +9 -0
@@ -156,6 +156,15 @@ .nr_balance_failed = 0, \ } +#ifdef CONFIG_SCHED_MC +#ifndef SD_MC_INIT +/* for now its same as SD_CPU_INIT. +* TBD: Tune Domain parameters! +*/ +#define SD_MC_INIT SD_CPU_INIT +#endif +#endif +#ifdef CONFIG_NUMA #ifndef SD_NODE_INIT #error Please define an appropriate SD_NODE_INIT in include/asm/topology.h!!!
kernel/sched.c +68 -5
125 lines not on this page · raw message
Quoted 4 lines · Suresh B
Quoted 2 lines
Perhaps we should just make SMT and MC disjoint in
Kconfig. Your call.No. SMT and MC are not disjoint.
It's still not clear what's supposed to be happening here.
In build_sched_domains() we still have code which does:
for_each_cpu_mask(...) {
...
#ifdef CONFIG_SCHED_MC
...
#endif
#ifdef CONFIG_SCHED_SMT
...
#endif
...
}
...
#ifdef CONFIG_SCHED_SMT
...
#endif
...
#ifdef CONFIG_SCHED_MC
...#endif
So in the first case the SCHED_SMT code will win and in the second case the SCHED_MC code will win. I think. The code is so repetitive in there that `patch' may have put the hunks in the wrong place.
What is the design intention here? What do we _want_ to happen if both MC and SMT are enabled?
Also the path tests CONFIG_SCHED_MT in a few places where it meant to use CONFIG_SCHED_SMT, which rather casts doubt upon the testing quality.
Quoted 22 lines · Andrew Morton
It's still not clear what's supposed to be happening here.
In
build_sched_domains()we still have code which does:for_each_cpu_mask(...) { ... #ifdef CONFIG_SCHED_MC ... #endif #ifdef CONFIG_SCHED_SMT ... #endif ... } ... #ifdef CONFIG_SCHED_SMT ... #endif ... #ifdef CONFIG_SCHED_MC ...
Quoted 4 lines
#endif
So in the first case the
SCHED_SMTcode will win and in the second case theSCHED_MCcode will win. I think.
I am not sure what you mean here. At all the above pointed places, both MC and SMT will win if both are configured.
Quoted 2 lines
The code is so repetitive in there that
`patch' may have put the hunks in the wrong place.
I will check your -mm tree.
Quoted 3 lines
What is the design intention here? What do we _want_ to happen if both MC and SMT are enabled?
If both MC and SMT are enabled(and available on the system), then there will be two domain levels one for MC and another one for SMT.
Quoted 2 lines
Also the path tests
CONFIG_SCHED_MTin a few places where it meant to useCONFIG_SCHED_SMT, which rather casts doubt upon the testing quality.
:( Got introduced in my last version of the patch. Thanks for fixing it.
suresh
Quoted 26 lines · Suresh B
Quoted 24 lines · Andrew Morton
It's still not clear what's supposed to be happening here.
In
build_sched_domains()we still have code which does:for_each_cpu_mask(...) { ... #ifdef CONFIG_SCHED_MC ... #endif #ifdef CONFIG_SCHED_SMT ... #endif ... } ... #ifdef CONFIG_SCHED_SMT ... #endif ... #ifdef CONFIG_SCHED_MC ...#endif
Quoted 5 lines
Quoted 2 lines
So in the first case the
SCHED_SMTcode will win and in the second case theSCHED_MCcode will win. I think.I am not sure what you mean here. At all the above pointed places, both MC and SMT will win if both are configured.
I was assuming that the code really does something like:
#ifdef CONFIG_SCHED_MC
some_global_thing = <expr>
#endif
#ifdef CONFIG_SCHED_SMT
some_global_thing = <expr>
#endif } ...
#ifdef CONFIG_SCHED_SMT
some_other_global_thing = <expr>
#endif
#ifdef CONFIG_SCHED_MC
some_other_global_thing = <expr>
#endif
Which, looking a bit closer, was wrong (yes?)
It is a bit irregular that in one place we do the SMT processing first and in another we do the MC processing first, but I guess it'll work OK.
We do need to be super-careful in the reviewing and testing here. If we slip up we won't have a nice crash to tell us. Instead we'll find that some machines with some configs will, under some workloads, take a few percent longer than they should. We could waste people's time for years until some developer stumbles across something.
Quoted 10 lines · Andrew Morton
I was assuming that the code really does something like:
#ifdef
CONFIG_SCHED_MC
some_global_thing= <expr>
#endif
#ifdefCONFIG_SCHED_SMT
some_global_thing= <expr>#endif } ...
Quoted 8 lines
#ifdef
CONFIG_SCHED_SMT
some_other_global_thing= <expr>
#endif
#ifdefCONFIG_SCHED_MC
some_other_global_thing= <expr>
#endifWhich, looking a bit closer, was wrong (yes?)
yes.
Quoted 3 lines
It is a bit irregular that in one place we do the SMT processing first and in another we do the MC processing first, but I guess it'll work OK.
yes. It will work Ok.
Quoted 5 lines
We do need to be super-careful in the reviewing and testing here. If we slip up we won't have a nice crash to tell us. Instead we'll find that some machines with some configs will, under some workloads, take a few percent longer than they should. We could waste people's time for years until some developer stumbles across something.
I have done testing with specJBB, kernel-compilation, specrate and we are doing some testing with database workload.. I will also request our perf team to take a stab at this.
BTW, can you also apply this experimental only patch to -mm.
--
test patch for -mm.. enable CONFIG_SCHED_MC by default in Kconfig. on systems with no shared caches between cores, this should help validate domain setup and degeneration code..
arch/i386/Kconfig +1 -0
@@ -238,6 +238,7 @@ config SCHED_SMT config SCHED_MC bool "Multi-core scheduler support" depends on SMP + default y help Multi-core scheduler support improves the CPU scheduler's decision making when dealing with multi-core CPU chips at a cost of slightly
arch/x86_64/Kconfig +1 -0
@@ -249,6 +249,7 @@ config SCHED_SMT config SCHED_MC bool "Multi-core scheduler support" depends on SMP + default y help Multi-core scheduler support improves the CPU scheduler's decision making when dealing with multi-core CPU chips at a cost of slightly
On Thursday 26 January 2006 10:51, Siddha, Suresh B wrote:
With this patch does the new distance checking code in the scheduler from Ingo automatically discover all the relevant distances?
arch/i386/kernel/cpu/intel_cacheinfo.c unsigned int __cpuinit init_intel_cachei · line 167
Quoted 3 lines
arch/i386/kernel/cpu/intel_cacheinfo.c +3
-0+#ifdef CONFIG_SMP +unsigned int cpu = (c == &boot_cpu_data) ?0 : (c - cpu_data); +#endif
Wouldn't it be better to just put that information into the cpuinfo_x86? We're having too many per CPU arrays already.
Quoted 1 line
+int cpu_llc_id[NR_CPUS]
__read_mostly= {[0 ... NR_CPUS-1] =BAD_APICID};
This needs a comment on what a LLC actually is.
arch/i386/kernel/smpboot.c EXPORT_SYMBOL(cpu_core_map); · line 89
Quoted 9 lines
arch/i386/kernel/smpboot.c +2
-0+/* representing HT siblings of each logical CPU */ cpumask_t cpu_sibling_map[NR_CPUS ]__read_mostly ;EXPORT_SYMBOL (cpu_sibling_map);@@ -84,6 +86,8 @@ EXPORT_SYMBOL(cpu_core_map);cpumask_t cpu_online_map__read_mostly ;EXPORT_SYMBOL (cpu_online_map); +cpumask_t cpu_llc_shared_map[NR_CPUS ]__read_mostly ;
Dito.
arch/x86_64/kernel/smpboot.c u8 phys_proc_id[NR_CPUS] __read_mostly = · line 70
Quoted 1 line
arch/x86_64/kernel/smpboot.c +1
-0+u8 cpu_llc_id[NR_CPUS ]__read_mostly = {[0 ...NR_CPUS -1 ] =BAD_APICID };
This could be __cpuinitdata, no?
Actually it would be better to pass this information in some other way to smpboot.c than to add more and more arrays like this. It's only needed for the current CPU, because for the others the information is in cpu_llc_shared_map
Perhaps SMP boot up should pass around a pointer to temporary data like this? Or discover it in smpboot.c with a function call?
kernel/sched.c next_sg: · line 5993
Quoted 4 lines
kernel/sched.c +2
-1-#ifdef CONFIG_SCHED_SMT +#if defined(CONFIG_SCHED_SMT ) sd = &per_cpu (cpu_domains, i); +#elif defined(CONFIG_SCHED_MC )
elif? What happens where there are both shared caches and SMT?
kernel/sched.c next_sg: · line 5997
Quoted 4 lines
kernel/sched.c +1
-0+ sd = &per_cpu (core_domains, i);#else sd = &per_cpu (phys_domains, i);#endif
-Andi
Quoted 4 lines · Andi Kleen
On Thursday 26 January 2006 10:51, Siddha, Suresh B wrote:
With this patch does the new distance checking code in the scheduler from Ingo automatically discover all the relevant distances?
Yes.
Quoted 9 lines
arch/i386/kernel/cpu/intel_cacheinfo.c unsigned int __cpuinit init_intel_cachei · line 167
Quoted 4 lines
arch/i386/kernel/cpu/intel_cacheinfo.c +3
-0+#ifdef CONFIG_SMP +unsigned int cpu = (c == &boot_cpu_data) ?0 : (c - cpu_data); +#endif Wouldn't it be better to just put that information into the
cpuinfo_x86? We're having too many per CPU arrays already.
Quoted 4 lines
Actually it would be better to pass this information in some other way to
smpboot.cthan to add more and more arrays like this. It's only needed for the current CPU, because for the others the information is incpu_llc_shared_map
In smpboot.c we require the llc id of current CPU and all other online cpus. I will put cpu_llc_shared_map info into cpuinfo_x86 (in future with power savings sched policy, it will be used whenever someone changes sched policy) And will make cpu_llc_id[] as __cpuinitdata.
Quoted 10 lines
Perhaps SMP boot up should pass around a pointer to temporary data like this? Or discover it in
smpboot.cwith a function call?kernel/sched.c next_sg: · line 5993
Quoted 4 lines
kernel/sched.c +2
-1-#ifdef CONFIG_SCHED_SMT +#if defined(CONFIG_SCHED_SMT ) sd = &per_cpu (cpu_domains, i); +#elif defined(CONFIG_SCHED_MC )elif? What happens where there are both shared caches and SMT?
Lowest domain the cpu gets attached to it is SMT domain.
thanks,
suresh
Quoted 10 lines · Suresh B
Appended patch adds a new sched domain for representing multi-core with shared caches between cores. Consider a dual package system, each package containing two cores and with last level cache shared between cores with in a package. If there are two runnable processes, with this appended patch those two processes will be scheduled on different packages.
On such system, with this patch we have observed 8% perf improvement with specJBB(2 warehouse) benchmark and 35% improvement with CFP2000 rate(with 2 users).
Quoted 5 lines
This new domain will come into play only on multi-core systems with shared caches. On other systems, this sched domain will be removed by domain degeneration code. This new domain can be also used for implementing power savings policy (see OLS 2005 CMP kernel scheduler paper for more details.. I will post another patch for power savings policy soon)
Could we all do it with single CONFIG_SCHED_SMT or CONFIG_NUMA or something like that? No need for zillion options...
Pavel
Signature · 1 line
Thanks, Sharp!
Quoted 2 lines · Pavel Machek
Could we all do it with single
CONFIG_SCHED_SMTorCONFIG_NUMAor something like that? No need for zillion options...
We thought about it too before and felt that CONFIG_SCHED_MC is more appropriate and cleaner.
thanks,
suresh