scheduler fixes
Subsystems (2)
Linus,
Please pull the latest sched-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus
Thanks,
Ingo
------------------>
Jiri Kosina (1):
sched: fix documentation reference for sched_min_granularity_ns
Li Zefan (1):
sched: add CONFIG_SMP consistency
Mike Galbraith (1):
sched: weaken sync hint
Peter Zijlstra (4):
sched: fix a find_busiest_group buglet
sched: more accurate min_vruntime accounting
sched: re-instate vruntime based wakeup preemption
sched: virtual time buddy preemption
Documentation/scheduler/sched-design-CFS.txt | 2 +- include/linux/sched.h | 12 +- kernel/sched.c | 3 +- kernel/sched_fair.c | 169 +++++++++++++++++++------- kernel/sched_idletask.c | 5 +- kernel/sched_rt.c | 5 +- 6 files changed, 139 insertions(+), 57 deletions(-)
Documentation/scheduler/sched-design-CFS.txt +1 -1
@@ -92,7 +92,7 @@ other HZ detail. Thus the CFS scheduler has no notion of "timeslices" in the way the previous scheduler had, and has no heuristics whatsoever. There is only one central tunable (you have to switch on CONFIG_SCHED_DEBUG): - /proc/sys/kernel/sched_granularity_ns + /proc/sys/kernel/sched_min_granularity_ns which can be used to tune the scheduler from "desktop" (i.e., low latencies) to "server" (i.e., good batching) workloads. It defaults to a setting suitable
include/linux/sched.h +7 -5
@@ -936,7 +936,6 @@ struct sched_class {void (*enqueue_task) (struct rq *rq,struct task_struct *p,int wakeup);void (*dequeue_task) (struct rq *rq,struct task_struct *p,int sleep);void (*yield_task) (struct rq *rq); -int (*select_task_rq)(struct task_struct *p,int sync);void (*check_preempt_curr) (struct rq *rq,struct task_struct *p,int sync);
@@ -944,6 +943,8 @@ struct sched_class {void (*put_prev_task) (struct rq *rq,struct task_struct *p);#ifdef CONFIG_SMP +int (*select_task_rq)(struct task_struct *p,int sync); + unsigned long (*load_balance) (struct rq *this_rq, int this_cpu, struct rq *busiest, unsigned long max_load_move, struct sched_domain *sd, enum cpu_idle_type idle,
@@ -955,16 +956,17 @@ struct sched_class {void (*pre_schedule) (struct rq *this_rq,struct task_struct *task);void (*post_schedule) (struct rq *this_rq);void (*task_wake_up) (struct rq *this_rq,struct task_struct *task); -#endif -void (*set_curr_task) (struct rq *rq); -void (*task_tick) (struct rq *rq,struct task_struct *p,int queued); -void (*task_new) (struct rq *rq,struct task_struct *p);void (*set_cpus_allowed)(struct task_struct *p,const cpumask_t *newmask);void (*rq_online)(struct rq *rq);void (*rq_offline)(struct rq *rq); +#endif + +void (*set_curr_task) (struct rq *rq); +void (*task_tick) (struct rq *rq,struct task_struct *p,int queued); +void (*task_new) (struct rq *rq,struct task_struct *p);void (*switched_from) (struct rq *this_rq,struct task_struct *task,int running);
kernel/sched.c +1 -2
@@ -386,7 +386,6 @@ struct cfs_rq {u64 exec_clock;u64 min_vruntime; -u64 pair_start;struct rb_root tasks_timeline;struct rb_node *rb_leftmost;
@@ -3344,7 +3343,7 @@ small_imbalance: }else this_load_per_task =cpu_avg_load_per_task (this_cpu); -if (max_load - this_load +2 *busiest_load_per_task >= +if (max_load - this_load + busiest_load_per_task >= busiest_load_per_task * imbn) { *imbalance = busiest_load_per_task;return busiest;
kernel/sched_fair.c +126 -43
272 lines not on this page · raw message
kernel/sched_idletask.c +2 -3
@@ -105,9 +105,6 @@ static const struct sched_class idle_sched_class = {/* dequeue is not valid, we print a debug message there: */ .dequeue_task = dequeue_task_idle, -#ifdef CONFIG_SMP - .select_task_rq = select_task_rq_idle, -#endif /* CONFIG_SMP */ .check_preempt_curr = check_preempt_curr_idle,
@@ -115,6 +112,8 @@ static const struct sched_class idle_sched_class = { .put_prev_task = put_prev_task_idle, #ifdef CONFIG_SMP + .select_task_rq = select_task_rq_idle, + .load_balance = load_balance_idle, .move_one_task = move_one_task_idle, #endif
kernel/sched_rt.c +2 -3
@@ -1504,9 +1504,6 @@ static const struct sched_class rt_sched_class = { .enqueue_task = enqueue_task_rt, .dequeue_task = dequeue_task_rt, .yield_task = yield_task_rt, -#ifdef CONFIG_SMP - .select_task_rq = select_task_rq_rt, -#endif /* CONFIG_SMP */ .check_preempt_curr = check_preempt_curr_rt,
@@ -1514,6 +1511,8 @@ static const struct sched_class rt_sched_class = { .put_prev_task = put_prev_task_rt, #ifdef CONFIG_SMP + .select_task_rq = select_task_rq_rt, + .load_balance = load_balance_rt, .move_one_task = move_one_task_rt, .set_cpus_allowed = set_cpus_allowed_rt,