locking updates
Linus,
Please pull the latest locking-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git locking-for-linus
These are two bits from Peter which were still cooking independently of other locking items, but which are ready now.
Thanks,
Ingo
------------------>
Peter Zijlstra (2):
hrtimer: fix rq->lock inversion (again)
lockdep: add stack dumps to asserts
include/linux/hrtimer.h | 5 ++++ include/linux/interrupt.h | 1 + kernel/hrtimer.c | 55 +++++++++++++++++++++++++++----------------- kernel/lockdep.c | 5 ++++ kernel/sched.c | 14 +++++++++-- kernel/softirq.c | 2 +- 6 files changed, 57 insertions(+), 25 deletions(-)
include/linux/hrtimer.h +5 -0
@@ -336,6 +336,11 @@ extern int hrtimer_start(struct hrtimer *timer, ktime_t tim, const enum hrtimer_mode mode);extern int hrtimer_start_range_ns (struct hrtimer *timer,ktime_t tim,unsigned long range_ns,const enum hrtimer_mode mode); +extern int +__hrtimer_start_range_ns (struct hrtimer *timer,ktime_t tim, +unsigned long delta_ns, +const enum hrtimer_mode mode,int wakeup); +extern int hrtimer_cancel (struct hrtimer *timer);extern int hrtimer_try_to_cancel (struct hrtimer *timer);
include/linux/interrupt.h +1 -0
@@ -294,6 +294,7 @@ extern void softirq_init(void);#define __raise_softirq_irqoff (nr) do { or_softirq_pending(1UL << (nr)); } while (0)extern void raise_softirq_irqoff (unsigned int nr);extern void raise_softirq (unsigned int nr); +extern void wakeup_softirqd (void );/* This is the worklist that queues up per-cpu softirq work. *
kernel/hrtimer.c +34 -21
94 lines not on this page · raw message
kernel/lockdep.c +5 -0
@@ -792,6 +792,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)printk ("BUG: MAX_LOCKDEP_KEYS too low!\n" );printk ("turning off the locking correctness validator.\n" ); +dump_stack ();return NULL ; } class = lock_classes + nr_lock_classes++;
@@ -855,6 +856,7 @@ static struct lock_list *alloc_list_entry(void)printk ("BUG: MAX_LOCKDEP_ENTRIES too low!\n" );printk ("turning off the locking correctness validator.\n" ); +dump_stack ();return NULL ; }return list_entries + nr_list_entries++;
@@ -1681,6 +1683,7 @@ cache_hit:printk ("BUG: MAX_LOCKDEP_CHAINS too low!\n" );printk ("turning off the locking correctness validator.\n" ); +dump_stack ();return 0 ; } chain = lock_chains + nr_lock_chains++;
@@ -2540,6 +2543,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,debug_locks_off ();printk ("BUG: MAX_LOCKDEP_SUBCLASSES too low!\n" );printk ("turning off the locking correctness validator.\n" ); +dump_stack ();return 0 ; }
@@ -2636,6 +2640,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,debug_locks_off ();printk ("BUG: MAX_LOCK_DEPTH too low!\n" );printk ("turning off the locking correctness validator.\n" ); +dump_stack ();return 0 ; }
kernel/sched.c +11 -3
@@ -231,13 +231,20 @@ static void start_rt_bandwidth(struct rt_bandwidth *rt_b)spin_lock (&rt_b->rt_runtime_lock);for (;;) { +unsigned long delta; +ktime_t soft, hard; +if (hrtimer_active (&rt_b->rt_period_timer))break ; now =hrtimer_cb_get_time (&rt_b->rt_period_timer);hrtimer_forward (&rt_b->rt_period_timer, now, rt_b->rt_period); -hrtimer_start_expires (&rt_b->rt_period_timer, -HRTIMER_MODE_ABS ); + + soft =hrtimer_get_softexpires (&rt_b->rt_period_timer); + hard =hrtimer_get_expires (&rt_b->rt_period_timer); + delta =ktime_to_ns (ktime_sub (hard, soft)); +__hrtimer_start_range_ns (&rt_b->rt_period_timer, soft, delta, +HRTIMER_MODE_ABS ,0 ); }spin_unlock (&rt_b->rt_runtime_lock); }
@@ -1146,7 +1153,8 @@ static __init void init_hrtick(void)*/ static void hrtick_start (struct rq *rq,u64 delay) { -hrtimer_start (&rq->hrtick_timer,ns_to_ktime (delay),HRTIMER_MODE_REL ); +__hrtimer_start_range_ns (&rq->hrtick_timer,ns_to_ktime (delay),0 , +HRTIMER_MODE_REL ,0 ); }static inline void init_hrtick (void )
kernel/softirq.c +1 -1
@@ -58,7 +58,7 @@ static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);* to the pending events, so lets the scheduler to balance * the softirq load for us. */ -static inline void wakeup_softirqd (void ) +void wakeup_softirqd (void ) {/* Interrupts are disabled: no need to stop preemption */ struct task_struct *tsk =__get_cpu_var (ksoftirqd);