scheduler fixes
Subsystems (2)
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: 6e998916dfe327e785e7c2447959b2c1a3ea4930 sched/cputime: Fix clock_nanosleep()/clock_gettime() inconsistency
Misc fixes: two NUMA fixes, two cputime fixes and an RCU/lockdep fix.
Thanks,
Ingo
------------------>
Andrey Ryabinin (1):
sched/numa: Fix out of bounds read in sched_init_numa()
Kirill Tkhai (1):
sched: Remove lockdep check in sched_move_task()
Peter Zijlstra (2):
sched/numa: Avoid selecting oneself as swap target sched/cputime: Fix cpu_timer_sample_group() double accounting
Stanislaw Gruszka (1):
sched/cputime: Fix clock_nanosleep()/clock_gettime() inconsistency
include/linux/kernel_stat.h | 5 ---- kernel/sched/core.c | 63 ++++++++++++++---------------------------- kernel/sched/deadline.c | 2 ++ kernel/sched/fair.c | 14 ++++++++++ kernel/sched/rt.c | 2 ++ kernel/sched/sched.h | 2 ++ kernel/time/posix-cpu-timers.c | 2 +- 7 files changed, 42 insertions(+), 48 deletions(-)
include/linux/kernel_stat.h +0 -5
@@ -77,11 +77,6 @@ static inline unsigned int kstat_cpu_irqs_sum(unsigned int cpu)return kstat_cpu (cpu).irqs_sum; } -/* -* Lock/unlock the current runqueue - to extract task statistics: -*/ -extern unsigned long long task_delta_exec (struct task_struct *); -extern void account_user_time (struct task_struct *,cputime_t ,cputime_t );extern void account_system_time (struct task_struct *,int ,cputime_t ,cputime_t );extern void account_steal_time (cputime_t );
kernel/sched/core.c +21 -42
93 lines not on this page · raw message
kernel/sched/deadline.c +2 -0
@@ -1701,4 +1701,6 @@ const struct sched_class dl_sched_class = { .prio_changed = prio_changed_dl, .switched_from = switched_from_dl, .switched_to = switched_to_dl, + + .update_curr = update_curr_dl, };
kernel/sched/fair.c +14 -0
@@ -726,6 +726,11 @@ static void update_curr(struct cfs_rq *cfs_rq)account_cfs_rq_runtime (cfs_rq, delta_exec); } +static void update_curr_fair (struct rq *rq) +{ +update_curr (cfs_rq_of (&rq->curr->se)); +} +static inline void update_stats_wait_start (struct cfs_rq *cfs_rq,struct sched_entity *se) {
@@ -1180,6 +1185,13 @@ static void task_numa_compare(struct task_numa_env *env,raw_spin_unlock_irq (&dst_rq->lock);/* +* Because we have preemption enabled we can get migrated around and +* end try selecting ourselves (current == env->p) as a swap candidate. +*/ +if (cur == env->p) + goto unlock; + +/* * "imp" is the fault differential for the source task between the * source and destination node. Calculate the total differential for * the source task and potential destination task. The more negative
@@ -7949,6 +7961,8 @@ const struct sched_class fair_sched_class = { .get_rr_interval = get_rr_interval_fair, + .update_curr = update_curr_fair, +#ifdef CONFIG_FAIR_GROUP_SCHED .task_move_group = task_move_group_fair,#endif
kernel/sched/rt.c +2 -0
@@ -2128,6 +2128,8 @@ const struct sched_class rt_sched_class = { .prio_changed = prio_changed_rt, .switched_to = switched_to_rt, + + .update_curr = update_curr_rt, };#ifdef CONFIG_SCHED_DEBUG
kernel/sched/sched.h +2 -0
@@ -1135,6 +1135,8 @@ struct sched_class {unsigned int (*get_rr_interval) (struct rq *rq,struct task_struct *task); +void (*update_curr) (struct rq *rq); +#ifdef CONFIG_FAIR_GROUP_SCHED void (*task_move_group) (struct task_struct *p,int on_rq);#endif
kernel/time/posix-cpu-timers.c +1 -1
@@ -553,7 +553,7 @@ static int cpu_timer_sample_group(const clockid_t which_clock, *sample =cputime_to_expires (cputime.utime);break ;case CPUCLOCK_SCHED : - *sample = cputime.sum_exec_runtime +task_delta_exec (p); + *sample = cputime.sum_exec_runtime;break ; }return 0 ;