timer fixes
Subsystems (8)
Linus,
Please pull the latest timer fixes git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git timers-fixes-for-linus
Thanks,
Ingo
------------------>
Thomas Gleixner (2):
nohz: prevent tick stop outside of the idle loop
nohz: adjust tick_nohz_stop_sched_tick() call of s390 as well
arch/arm/kernel/process.c | 2 +- arch/avr32/kernel/process.c | 2 +- arch/blackfin/kernel/process.c | 2 +- arch/mips/kernel/process.c | 2 +- arch/powerpc/kernel/idle.c | 2 +- arch/powerpc/platforms/iseries/setup.c | 4 ++-- arch/s390/kernel/process.c | 2 +- arch/sh/kernel/process_32.c | 2 +- arch/sparc64/kernel/process.c | 2 +- arch/um/kernel/process.c | 2 +- arch/x86/kernel/process_32.c | 2 +- arch/x86/kernel/process_64.c | 2 +- include/linux/tick.h | 5 +++-- kernel/softirq.c | 2 +- kernel/time/tick-sched.c | 12 ++++++++++-- 15 files changed, 27 insertions(+), 18 deletions(-)
arch/arm/kernel/process.c +1 -1
@@ -162,7 +162,7 @@ void cpu_idle(void)if (!idle) idle = default_idle;leds_event (led_idle_start); -tick_nohz_stop_sched_tick (); +tick_nohz_stop_sched_tick (1 );while (!need_resched ())idle ();leds_event (led_idle_end);
arch/avr32/kernel/process.c +1 -1
@@ -31,7 +31,7 @@ void cpu_idle(void) {/* endless idle loop with no priority at all */ while (1 ) { -tick_nohz_stop_sched_tick (); +tick_nohz_stop_sched_tick (1 );while (!need_resched ())cpu_idle_sleep ();tick_nohz_restart_sched_tick ();
arch/blackfin/kernel/process.c +1 -1
@@ -105,7 +105,7 @@ void cpu_idle(void)#endif if (!idle) idle = default_idle; -tick_nohz_stop_sched_tick (); +tick_nohz_stop_sched_tick (1 );while (!need_resched ())idle ();tick_nohz_restart_sched_tick ();
arch/mips/kernel/process.c +1 -1
@@ -53,7 +53,7 @@ void __noreturn cpu_idle(void) {/* endless idle loop with no priority at all */ while (1 ) { -tick_nohz_stop_sched_tick (); +tick_nohz_stop_sched_tick (1 );while (!need_resched ()) {#ifdef CONFIG_SMTC_IDLE_HOOK_DEBUG extern void smtc_idle_loop_hook (void );
arch/powerpc/kernel/idle.c +1 -1
@@ -60,7 +60,7 @@ void cpu_idle(void)set_thread_flag (TIF_POLLING_NRFLAG );while (1 ) { -tick_nohz_stop_sched_tick (); +tick_nohz_stop_sched_tick (1 );while (!need_resched () && !cpu_should_die ()) {ppc64_runlatch_off ();
arch/powerpc/platforms/iseries/setup.c +2 -2
@@ -561,7 +561,7 @@ static void yield_shared_processor(void)static void iseries_shared_idle (void ) {while (1 ) { -tick_nohz_stop_sched_tick (); +tick_nohz_stop_sched_tick (1 );while (!need_resched () && !hvlpevent_is_pending ()) {local_irq_disable ();ppc64_runlatch_off ();
@@ -591,7 +591,7 @@ static void iseries_dedicated_idle(void)set_thread_flag (TIF_POLLING_NRFLAG );while (1 ) { -tick_nohz_stop_sched_tick (); +tick_nohz_stop_sched_tick (1 );if (!need_resched ()) {while (!need_resched ()) {ppc64_runlatch_off ();
arch/s390/kernel/process.c +1 -1
@@ -142,7 +142,7 @@ static void default_idle(void)void cpu_idle (void ) {for (;;) { -tick_nohz_stop_sched_tick (); +tick_nohz_stop_sched_tick (1 );while (!need_resched ())default_idle ();tick_nohz_restart_sched_tick ();
arch/sh/kernel/process_32.c +1 -1
@@ -86,7 +86,7 @@ void cpu_idle(void)if (!idle) idle = default_idle; -tick_nohz_stop_sched_tick (); +tick_nohz_stop_sched_tick (1 );while (!need_resched ())idle ();tick_nohz_restart_sched_tick ();
arch/sparc64/kernel/process.c +1 -1
@@ -97,7 +97,7 @@ void cpu_idle(void)set_thread_flag (TIF_POLLING_NRFLAG );while (1 ) { -tick_nohz_stop_sched_tick (); +tick_nohz_stop_sched_tick (1 );while (!need_resched () && !cpu_is_offline (cpu))sparc64_yield (cpu);
arch/um/kernel/process.c +1 -1
@@ -243,7 +243,7 @@ void default_idle(void)if (need_resched ())schedule (); -tick_nohz_stop_sched_tick (); +tick_nohz_stop_sched_tick (1 ); nsecs =disable_timer ();idle_sleep (nsecs);tick_nohz_restart_sched_tick ();
arch/x86/kernel/process_32.c +1 -1
@@ -128,7 +128,7 @@ void cpu_idle(void)/* endless idle loop with no priority at all */ while (1 ) { -tick_nohz_stop_sched_tick (); +tick_nohz_stop_sched_tick (1 );while (!need_resched ()) {check_pgt_cache ();
arch/x86/kernel/process_64.c +1 -1
@@ -120,7 +120,7 @@ void cpu_idle(void)current_thread_info ()->status |=TS_POLLING ;/* endless idle loop with no priority at all */ while (1 ) { -tick_nohz_stop_sched_tick (); +tick_nohz_stop_sched_tick (1 );while (!need_resched ()) {rmb ();
include/linux/tick.h +3 -2
@@ -49,6 +49,7 @@ struct tick_sched {unsigned long check_clocks;enum tick_nohz_mode nohz_mode;ktime_t idle_tick; +int inidle;int tick_stopped;unsigned long idle_jiffies;unsigned long idle_calls;
@@ -105,14 +106,14 @@ static inline int tick_check_oneshot_change(int allow_nohz) { return 0; }#endif /* !CONFIG_GENERIC_CLOCKEVENTS */ # ifdef CONFIG_NO_HZ -extern void tick_nohz_stop_sched_tick (void ); +extern void tick_nohz_stop_sched_tick (int inidle);extern void tick_nohz_restart_sched_tick (void );extern void tick_nohz_update_jiffies (void );extern ktime_t tick_nohz_get_sleep_length (void );extern void tick_nohz_stop_idle (int cpu);extern u64 get_cpu_idle_time_us (int cpu,u64 *last_update_time);# else -static inline void tick_nohz_stop_sched_tick (void ) { } +static inline void tick_nohz_stop_sched_tick (int inidle) { }static inline void tick_nohz_restart_sched_tick (void ) { }static inline void tick_nohz_update_jiffies (void ) { }static inline ktime_t tick_nohz_get_sleep_length (void )
kernel/softirq.c +1 -1
@@ -286,7 +286,7 @@ void irq_exit(void)#ifdef CONFIG_NO_HZ /* Make sure that timer wheel updates are propagated */ if (!in_interrupt () &&idle_cpu (smp_processor_id ()) && !need_resched ()) -tick_nohz_stop_sched_tick (); +tick_nohz_stop_sched_tick (0 );rcu_irq_exit ();#endif preempt_enable_no_resched ();
kernel/time/tick-sched.c +10 -2
@@ -195,7 +195,7 @@ u64 get_cpu_idle_time_us(int cpu, u64 *last_update_time)* Called either from the idle loop or from irq_exit() when an idle period was * just interrupted by an interrupt which did not cause a reschedule. */ -void tick_nohz_stop_sched_tick (void ) +void tick_nohz_stop_sched_tick (int inidle) {unsigned long seq, last_jiffies, next_jiffies, delta_jiffies, flags;struct tick_sched *ts;
@@ -224,6 +224,11 @@ void tick_nohz_stop_sched_tick(void)if (unlikely (ts->nohz_mode ==NOHZ_MODE_INACTIVE )) goto end; +if (!inidle && !ts->inidle) + goto end; + + ts->inidle =1 ; +if (need_resched ()) goto end;
@@ -373,11 +378,14 @@ void tick_nohz_restart_sched_tick(void)local_irq_disable ();tick_nohz_stop_idle (cpu); -if (!ts->tick_stopped) { +if (!ts->inidle || !ts->tick_stopped) { + ts->inidle =0 ;local_irq_enable ();return ; } + ts->inidle =0 ; +rcu_exit_nohz ();/* Update jiffies first */