sched: Tweak wake_idx
Subsystems (4)
Commit-ID: 78e7ed53c9f42f04f9401ada6f7047db60781676 Gitweb: http://git.kernel.org/tip/78e7ed53c9f42f04f9401ada6f7047db60781676 Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 3 Sep 2009 13:16:51 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 15 Sep 2009 16:01:07 +0200
sched: Tweak wake_idx
When merging select_task_rq_fair() and sched_balance_self() we lost the use of wake_idx, restore that and set them to 0 to make wake balancing more aggressive.
Signed-off-by Peter Zijlstra <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/ia64/include/asm/topology.h | 5 +++-- arch/powerpc/include/asm/topology.h | 3 ++- arch/sh/include/asm/topology.h | 2 +- arch/sparc/include/asm/topology_64.h | 2 +- arch/x86/include/asm/topology.h | 2 +- include/linux/topology.h | 4 ++-- kernel/sched_fair.c | 21 ++++++++++++++++++--- 7 files changed, 28 insertions(+), 11 deletions(-)
arch/ia64/include/asm/topology.h +3 -2
@@ -62,11 +62,12 @@ void build_cpu_to_node_map(void); .busy_idx = 2, \ .idle_idx = 1, \ .newidle_idx = 2, \ - .wake_idx = 1, \ + .wake_idx = 0, \ .forkexec_idx = 1, \ .flags =SD_LOAD_BALANCE \ |SD_BALANCE_NEWIDLE \ |SD_BALANCE_EXEC \ + |SD_BALANCE_FORK \ |SD_BALANCE_WAKE \ | SD_WAKE_AFFINE, \ .last_balance = jiffies, \
@@ -87,7 +88,7 @@ void build_cpu_to_node_map(void); .busy_idx = 3, \ .idle_idx = 2, \ .newidle_idx = 2, \ - .wake_idx = 1, \ + .wake_idx = 0, \ .forkexec_idx =1 , \ .flags = SD_LOAD_BALANCE \ |SD_BALANCE_EXEC \
arch/powerpc/include/asm/topology.h +2 -1
@@ -58,9 +58,10 @@ static inline int pcibus_to_node(struct pci_bus *bus) .busy_idx = 3, \ .idle_idx = 1, \ .newidle_idx = 2, \ - .wake_idx = 1, \ + .wake_idx = 0, \ .flags =SD_LOAD_BALANCE \ |SD_BALANCE_EXEC \ + |SD_BALANCE_FORK \ |SD_BALANCE_NEWIDLE \ |SD_BALANCE_WAKE \ | SD_SERIALIZE, \
arch/sh/include/asm/topology.h +1 -1
@@ -16,7 +16,7 @@ .busy_idx = 3, \ .idle_idx = 2, \ .newidle_idx = 2, \ - .wake_idx = 1, \ + .wake_idx = 0, \ .forkexec_idx =1 , \ .flags = SD_LOAD_BALANCE \ |SD_BALANCE_FORK \
arch/sparc/include/asm/topology_64.h +1 -1
@@ -52,7 +52,7 @@ static inline int pcibus_to_node(struct pci_bus *pbus) .busy_idx = 3, \ .idle_idx = 2, \ .newidle_idx = 0, \ - .wake_idx = 1, \ + .wake_idx = 0, \ .forkexec_idx =1 , \ .flags = SD_LOAD_BALANCE \ |SD_BALANCE_FORK \
arch/x86/include/asm/topology.h +1 -1
@@ -138,7 +138,7 @@ extern unsigned long node_remap_size[]; .busy_idx = 3, \ .idle_idx = SD_IDLE_IDX, \ .newidle_idx = SD_NEWIDLE_IDX, \ - .wake_idx = 1, \ + .wake_idx = 0, \ .forkexec_idx =SD_FORKEXEC_IDX , \ \ .flags = 1*SD_LOAD_BALANCE \
include/linux/topology.h +2 -2
@@ -120,7 +120,7 @@ int arch_update_cpu_topology(void); .imbalance_pct = 125, \ .cache_nice_tries = 1, \ .busy_idx = 2, \ - .wake_idx = 1, \ + .wake_idx = 0, \ .forkexec_idx =1 , \ \ .flags = 1*SD_LOAD_BALANCE \
@@ -152,7 +152,7 @@ int arch_update_cpu_topology(void); .busy_idx = 2, \ .idle_idx = 1, \ .newidle_idx = 2, \ - .wake_idx = 1, \ + .wake_idx = 0, \ .forkexec_idx =1 , \ \ .flags = 1*SD_LOAD_BALANCE \
kernel/sched_fair.c +18 -3
@@ -1232,12 +1232,27 @@ static int wake_affine(struct sched_domain *sd, struct task_struct *p, int sync)* domain. */ static struct sched_group * -find_idlest_group (struct sched_domain *sd,struct task_struct *p,int this_cpu) +find_idlest_group (struct sched_domain *sd,struct task_struct *p, +int this_cpu,int flag) {struct sched_group *idlest =NULL , *this =NULL , *group = sd->groups;unsigned long min_load =ULONG_MAX , this_load =0 ; -int load_idx = sd->forkexec_idx;int imbalance =100 + (sd->imbalance_pct-100 )/2 ; +int load_idx =0 ; + +switch (flag) { +case SD_BALANCE_FORK : +case SD_BALANCE_EXEC : + load_idx = sd->forkexec_idx; +break ; + +case SD_BALANCE_WAKE : + load_idx = sd->wake_idx; +break ; + +default : +break ; + } do { unsigned long load, avg_load;
@@ -1392,7 +1407,7 @@ static int select_task_rq_fair(struct task_struct *p, int flag, int sync)continue ; } - group =find_idlest_group (sd, p, cpu); + group =find_idlest_group (sd, p, cpu, flag);if (!group) { sd = sd->child;continue ;