• Heiko Carstens's avatar
    [PATCH] timer/hrtimer: take per cpu locks in sane order · e81ce1f7
    Heiko Carstens authored
    Doing something like this on a two cpu system
    
      # echo 0 > /sys/devices/system/cpu/cpu0/online
      # echo 1 > /sys/devices/system/cpu/cpu0/online
      # echo 0 > /sys/devices/system/cpu/cpu1/online
    
    will give me this:
    
      =======================================================
      [ INFO: possible circular locking dependency detected ]
      2.6.21-rc2-g562aa1d4-dirty #7
      -------------------------------------------------------
      bash/1282 is trying to acquire lock:
       (&cpu_base->lock_key){.+..}, at: [<000000000005f17e>] hrtimer_cpu_notify+0xc6/0x240
    
      but task is already holding lock:
       (&cpu_base->lock_key#2){.+..}, at: [<000000000005f174>] hrtimer_cpu_notify+0xbc/0x240
    
      which lock already depends on the new lock.
    
    This happens because we have the following code in kernel/hrtimer.c:
    
      migrate_hrtimers(int cpu)
      [...]
      old_base = &per_cpu(hrtimer_bases, cpu);
      new_base = &get_cpu_var(hrtimer_bases);
      [...]
      spin_lock(&new_base->lock);
      spin_lock(&old_base->lock);
    
    Which means the spinlocks are taken in an order which depends on which cpu
    gets shut down from which other cpu. Therefore lockdep complains that there
    might be an ABBA deadlock. Since migrate_hrtimers() gets only called on
    cpu hotplug it's safe to assume that it isn't executed concurrently on a
    
    The same problem exists in kernel/timer.c: migrate_timers().
    
    As pointed out by Christian Borntraeger one possible solution to avoid
    the locking order complaints would be to make sure that the locks are
    always taken in the same order. E.g. by taking the lock of the cpu with
    the lower number first.
    
    To achieve this we introduce two new spinlock functions double_spin_lock
    and double_spin_unlock which lock or unlock two locks in a given order.
    
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Roman Zippel <zippel@linux-m68k.org>
    Cc: John Stultz <johnstul@us.ibm.com>
    Cc: Christian Borntraeger <cborntra@de.ibm.com>
    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    e81ce1f7
timer.c 49.9 KB