scheduler updates
Subsystems (2)
Linus, please pull the latest scheduler fixes git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched.git
warning: the rcupreempt patch is a bit larger than what i'd like to do for -rc4 but rcupreempt is a new feature, the fix has been in the queue for ages (with no changes to it) - and half of the patch's size is comments. It has no effect on !RCUPREEMPT || !NOHZ kernels. [this fix became more urgent because on larger SMP it's rather easy to trigger a boot time hang.]
Thanks,
Ingo
------------------>
Dmitry Adamushko (1):
softlockup: fix task state setting
Steven Rostedt (1):
rcu: add support for dynamic ticks and preempt rcu
include/linux/hardirq.h | 10 ++ include/linux/rcuclassic.h | 3 + include/linux/rcupreempt.h | 22 +++++ kernel/rcupreempt.c | 224 +++++++++++++++++++++++++++++++++++++++++++- kernel/softirq.c | 1 + kernel/softlockup.c | 13 ++- kernel/time/tick-sched.c | 3 + 7 files changed, 266 insertions(+), 10 deletions(-)
include/linux/hardirq.h +10 -0
@@ -109,6 +109,14 @@ static inline void account_system_vtime(struct task_struct *tsk) }#endif +#if defined(CONFIG_PREEMPT_RCU ) && defined(CONFIG_NO_HZ ) +extern void rcu_irq_enter (void ); +extern void rcu_irq_exit (void ); +#else +# define rcu_irq_enter () do { } while (0) +# define rcu_irq_exit () do { } while (0) +#endif /* CONFIG_PREEMPT_RCU */ +/* * It is safe to do non-atomic ops on ->hardirq_context, * because NMI handlers may not preempt and the ops are
@@ -117,6 +125,7 @@ static inline void account_system_vtime(struct task_struct *tsk)*/ #define __irq_enter () \ do { \ + rcu_irq_enter(); \ account_system_vtime(current); \ add_preempt_count(HARDIRQ_OFFSET); \ trace_hardirq_enter(); \
@@ -135,6 +144,7 @@ extern void irq_enter(void);trace_hardirq_exit (); \account_system_vtime (current); \sub_preempt_count (HARDIRQ_OFFSET ); \ +rcu_irq_exit (); \ }while (0 )/*
include/linux/rcuclassic.h +3 -0
@@ -160,5 +160,8 @@ extern void rcu_restart_cpu(int cpu);extern long rcu_batches_completed (void );extern long rcu_batches_completed_bh (void ); +#define rcu_enter_nohz () do { } while (0) +#define rcu_exit_nohz () do { } while (0) +#endif /* __KERNEL__ */ #endif /* __LINUX_RCUCLASSIC_H */
include/linux/rcupreempt.h +22 -0
@@ -82,5 +82,27 @@ extern struct rcupreempt_trace *rcupreempt_trace_cpu(int cpu);struct softirq_action ; +#ifdef CONFIG_NO_HZ +DECLARE_PER_CPU (long, dynticks_progress_counter); + +static inline void rcu_enter_nohz (void ) +{ +__get_cpu_var (dynticks_progress_counter)++; +WARN_ON (__get_cpu_var (dynticks_progress_counter) &0x1 ); +mb (); +} + +static inline void rcu_exit_nohz (void ) +{ +mb (); +__get_cpu_var (dynticks_progress_counter)++; +WARN_ON (!(__get_cpu_var (dynticks_progress_counter) &0x1 )); +} + +#else /* CONFIG_NO_HZ */ +#define rcu_enter_nohz () do { } while (0) +#define rcu_exit_nohz () do { } while (0) +#endif /* CONFIG_NO_HZ */ +#endif /* __KERNEL__ */ #endif /* __LINUX_RCUPREEMPT_H */
kernel/rcupreempt.c +220 -4
262 lines not on this page · raw message
kernel/softirq.c +1 -0
@@ -313,6 +313,7 @@ void irq_exit(void)/* Make sure that timer wheel updates are propagated */ if (!in_interrupt () &&idle_cpu (smp_processor_id ()) && !need_resched ())tick_nohz_stop_sched_tick (); +rcu_irq_exit ();#endif preempt_enable_no_resched (); }
kernel/softlockup.c +7 -6
@@ -216,26 +216,27 @@ static int watchdog(void *__bind_cpu)/* initialize timestamp */ touch_softlockup_watchdog (); +set_current_state (TASK_INTERRUPTIBLE );/* * Run briefly once per second to reset the softlockup timestamp. * If this gets delayed for more than 60 seconds then the * debug-printout triggers in softlockup_tick(). */ while (!kthread_should_stop ()) { -set_current_state (TASK_INTERRUPTIBLE );touch_softlockup_watchdog ();schedule ();if (kthread_should_stop ())break ; -if (this_cpu != check_cpu) -continue ; - -if (sysctl_hung_task_timeout_secs) -check_hung_uninterruptible_tasks (this_cpu); +if (this_cpu == check_cpu) { +if (sysctl_hung_task_timeout_secs) +check_hung_uninterruptible_tasks (this_cpu); + } +set_current_state (TASK_INTERRUPTIBLE ); } +__set_current_state (TASK_RUNNING );return 0 ; }
kernel/time/tick-sched.c +3 -0
@@ -282,6 +282,7 @@ void tick_nohz_stop_sched_tick(void) ts->idle_tick = ts->sched_timer.expires; ts->tick_stopped =1 ; ts->idle_jiffies = last_jiffies; +rcu_enter_nohz (); }/*
@@ -375,6 +376,8 @@ void tick_nohz_restart_sched_tick(void)return ; } +rcu_exit_nohz (); +/* Update jiffies first */ select_nohz_load_balancer (0 ); now =ktime_get ();