scheduler fixes for -rc3
Subsystems (3)
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
------------------>
Dmitry Adamushko (1):
sched, cpu hotplug: fix set_cpus_allowed() use in hotplug callbacks
Hugh Dickins (1):
sched: move sched_clock before first use
Ingo Molnar (5):
sched clock: revert various sched_clock() changes sched clock: clean up sched_clock_cpu()
sched: eliminate scd->prev_raw
sched clock: simplify __update_sched_clock() sched clock: couple local and remote clocks
Mike Galbraith (1):
sched: fix mysql+oltp regression
OGAWA Hirofumi (1):
sched: fix SCHED_HRTICK dependency
Peter Zijlstra (2):
sched: fix warning in hrtick_start_fair()
sched_clock: delay using sched_clock()
roel kluin (1):
sched: test runtime rather than period in global_rt_runtime()
include/linux/sched.h | 31 +------- kernel/Kconfig.hz | 2 +- kernel/cpu.c | 5 +- kernel/sched.c | 2 +- kernel/sched_clock.c | 178 ++++++++++++++------------------------------- kernel/sched_fair.c | 21 ++++-- kernel/time/tick-sched.c | 2 - 7 files changed, 77 insertions(+), 164 deletions(-)
include/linux/sched.h +4 -27
@@ -1551,16 +1551,10 @@ static inline int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask)extern unsigned long long sched_clock (void ); -#ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK -static inline void sched_clock_init (void ) -{ -} - -static inline u64 sched_clock_cpu (int cpu) -{ -return sched_clock (); -} +extern void sched_clock_init (void ); +extern u64 sched_clock_cpu (int cpu); +#ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK static inline void sched_clock_tick (void ) { }
@@ -1572,28 +1566,11 @@ static inline void sched_clock_idle_sleep_event(void)static inline void sched_clock_idle_wakeup_event (u64 delta_ns) { } - -#ifdef CONFIG_NO_HZ -static inline void sched_clock_tick_stop (int cpu) -{ -} - -static inline void sched_clock_tick_start (int cpu) -{ -} -#endif - -#else /* CONFIG_HAVE_UNSTABLE_SCHED_CLOCK */ -extern void sched_clock_init (void ); -extern u64 sched_clock_cpu (int cpu); +#else extern void sched_clock_tick (void );extern void sched_clock_idle_sleep_event (void );extern void sched_clock_idle_wakeup_event (u64 delta_ns); -#ifdef CONFIG_NO_HZ -extern void sched_clock_tick_stop (int cpu); -extern void sched_clock_tick_start (int cpu);#endif -#endif /* CONFIG_HAVE_UNSTABLE_SCHED_CLOCK */ /* * For kernel-internal use: high-speed (but slightly incorrect) per-cpu
kernel/Kconfig.hz +1 -1
@@ -55,4 +55,4 @@ config HZ default 1000 if HZ_1000 config SCHED_HRTICK - def_bool HIGH_RES_TIMERS && USE_GENERIC_SMP_HELPERS + def_bool HIGH_RES_TIMERS && (!SMP || USE_GENERIC_SMP_HELPERS)
kernel/cpu.c +2 -3
@@ -349,6 +349,8 @@ static int __cpuinit _cpu_up(unsigned int cpu, int tasks_frozen) goto out_notify;BUG_ON (!cpu_online (cpu)); +cpu_set (cpu, cpu_active_map); +/* Now call notifier in preparation. */ raw_notifier_call_chain (&cpu_chain,CPU_ONLINE | mod, hcpu);
@@ -383,9 +385,6 @@ int __cpuinit cpu_up(unsigned int cpu) err =_cpu_up (cpu,0 ); -if (cpu_online (cpu)) -cpu_set (cpu, cpu_active_map); - out:cpu_maps_update_done ();return err;
kernel/sched.c +1 -1
@@ -834,7 +834,7 @@ static inline u64 global_rt_period(void)static inline u64 global_rt_runtime (void ) { -if (sysctl_sched_rt_period <0 ) +if (sysctl_sched_rt_runtime <0 )return RUNTIME_INF ;return (u64 )sysctl_sched_rt_runtime *NSEC_PER_USEC ;
kernel/sched_clock.c +56 -122
306 lines not on this page · raw message
kernel/sched_fair.c +13 -8
@@ -899,7 +899,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p)* doesn't make sense. Rely on vruntime for fairness. */ if (rq->curr != p) - delta =max (10000LL , delta); + delta =max_t (s64,10000LL , delta);hrtick_start (rq, delta); }
@@ -1442,18 +1442,23 @@ __load_balance_iterator(struct cfs_rq *cfs_rq, struct list_head *next)struct task_struct *p =NULL ;struct sched_entity *se; -while (next != &cfs_rq->tasks) { +if (next == &cfs_rq->tasks) +return NULL ; + +/* Skip over entities that are not tasks */ +do { se = list_entry(next, struct sched_entity, group_node); next = next->next; + }while (next != &cfs_rq->tasks && !entity_is_task (se)); -/* Skip over entities that are not tasks */ -if (entity_is_task (se)) { - p =task_of (se); -break ; - } - } +if (next == &cfs_rq->tasks) +return NULL ; cfs_rq->balance_iterator = next; + +if (entity_is_task (se)) + p =task_of (se); +return p; }
kernel/time/tick-sched.c +0 -2
@@ -289,7 +289,6 @@ void tick_nohz_stop_sched_tick(int inidle) ts->tick_stopped =1 ; ts->idle_jiffies = last_jiffies;rcu_enter_nohz (); -sched_clock_tick_stop (cpu); }/*
@@ -392,7 +391,6 @@ void tick_nohz_restart_sched_tick(void)select_nohz_load_balancer (0 ); now =ktime_get ();tick_do_update_jiffies64 (now); -sched_clock_tick_start (cpu);cpu_clear (cpu, nohz_cpu_mask);/*