scheduler fixes
Linus,
Please pull the latest sched-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-for-linus
# HEAD: 5e3c1afd4587e70c201bf7224b51f747c9a3dfa8 sched/x86/tsc: Initialize multiplier to 0
A couple of regression fixes mostly hitting virtualized setups, but also some bare metal systems.
Thanks,
Ingo
------------------>
Peter Zijlstra (3):
sched/preempt/x86: Fix voluntary preempt for x86 sched/clock: Fixup early initialization sched/x86/tsc: Initialize multiplier to 0
Vincent Guittot (1):
Revert "sched: Fix sleep time double accounting in enqueue entity"
arch/x86/kernel/tsc.c | 2 +- include/linux/preempt.h | 5 ----- kernel/sched/clock.c | 53 ++++++++++++++++++++++++++++++++++++++----------- kernel/sched/fair.c | 8 +------- 4 files changed, 43 insertions(+), 25 deletions(-)
arch/x86/kernel/tsc.c +1 -1
@@ -180,7 +180,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)static void cyc2ns_data_init (struct cyc2ns_data *data) { - data->cyc2ns_mul =1U <<CYC2NS_SCALE_FACTOR ; + data->cyc2ns_mul =0 ; data->cyc2ns_shift =CYC2NS_SCALE_FACTOR ; data->cyc2ns_offset =0 ; data->__count =0 ;
include/linux/preempt.h +0 -5
@@ -134,7 +134,6 @@ do { \#undef preempt_check_resched#endif -#ifdef CONFIG_PREEMPT #define preempt_set_need_resched () \ do { \ set_preempt_need_resched(); \
@@ -144,10 +143,6 @@ do { \if (tif_need_resched ()) \set_preempt_need_resched (); \ }while (0 ) -#else -#define preempt_set_need_resched () do { } while (0) -#define preempt_fold_need_resched () do { } while (0) -#endif #ifdef CONFIG_PREEMPT_NOTIFIERS
kernel/sched/clock.c +41 -12
96 lines not on this page · raw message
kernel/sched/fair.c +1 -7
@@ -2356,13 +2356,7 @@ static inline void enqueue_entity_load_avg(struct cfs_rq *cfs_rq, } wakeup =0 ; }else { -/* -* Task re-woke on same cpu (or else migrate_task_rq_fair() -* would have made count negative); we must be careful to avoid -* double-accounting blocked time after synchronizing decays. -*/ - se->avg.last_runnable_update +=__synchronize_entity_decay (se) - <<20 ; +__synchronize_entity_decay (se); }/* migrated tasks did not contribute to our blocked load */