|
@@ -768,8 +768,14 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
|
|
|
|
|
|
ideal_runtime = sched_slice(cfs_rq, curr);
|
|
|
delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
|
|
|
- if (delta_exec > ideal_runtime)
|
|
|
+ if (delta_exec > ideal_runtime) {
|
|
|
resched_task(rq_of(cfs_rq)->curr);
|
|
|
+ /*
|
|
|
+ * The current task ran long enough, ensure it doesn't get
|
|
|
+ * re-elected due to buddy favours.
|
|
|
+ */
|
|
|
+ clear_buddies(cfs_rq, curr);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
static void
|
|
@@ -1445,6 +1451,11 @@ static struct task_struct *pick_next_task_fair(struct rq *rq)
|
|
|
|
|
|
do {
|
|
|
se = pick_next_entity(cfs_rq);
|
|
|
+ /*
|
|
|
+ * If se was a buddy, clear it so that it will have to earn
|
|
|
+ * the favour again.
|
|
|
+ */
|
|
|
+ clear_buddies(cfs_rq, se);
|
|
|
set_next_entity(cfs_rq, se);
|
|
|
cfs_rq = group_cfs_rq(se);
|
|
|
} while (cfs_rq);
|