Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / lib / spinlock_debug.c

diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c
index e249970..8ebd8ea 100644 (file)
--- a/lib/spinlock_debug.c
+++ b/lib/spinlock_debug.c
@@ -6,73 +6,55 @@
  * DEBUG_SPINLOCK.
  */
 
+#include <linux/config.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
-#include <linux/debug_locks.h>
 #include <linux/delay.h>
 #include <linux/module.h>
 
-void __spin_lock_init(spinlock_t *lock, const char *name,
-                     struct lock_class_key *key)
+int nopanic;
+static int __init nopanic_setup(char *str)
 {
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-       /*
-        * Make sure we are not reinitializing a held lock:
-        */
-       debug_check_no_locks_freed((void *)lock, sizeof(*lock));
-       lockdep_init_map(&lock->dep_map, name, key, 0);
-#endif
-       lock->raw_lock = (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED;
-       lock->magic = SPINLOCK_MAGIC;
-       lock->owner = SPINLOCK_OWNER_INIT;
-       lock->owner_cpu = -1;
+       nopanic = 1;
+       return 1;
 }
+EXPORT_SYMBOL_GPL(nopanic);
+__setup("dontpanic", nopanic_setup);
 
-EXPORT_SYMBOL(__spin_lock_init);
-
-void __rwlock_init(rwlock_t *lock, const char *name,
-                  struct lock_class_key *key)
-{
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-       /*
-        * Make sure we are not reinitializing a held lock:
-        */
-       debug_check_no_locks_freed((void *)lock, sizeof(*lock));
-       lockdep_init_map(&lock->dep_map, name, key, 0);
-#endif
-       lock->raw_lock = (raw_rwlock_t) __RAW_RW_LOCK_UNLOCKED;
-       lock->magic = RWLOCK_MAGIC;
-       lock->owner = SPINLOCK_OWNER_INIT;
-       lock->owner_cpu = -1;
-}
-
-EXPORT_SYMBOL(__rwlock_init);
 
 static void spin_bug(spinlock_t *lock, const char *msg)
 {
+       static long print_once = 1;
        struct task_struct *owner = NULL;
 
-       if (!debug_locks_off())
-               return;
-
-       if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT)
-               owner = lock->owner;
-       printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d (%s)\n",
-               msg, raw_smp_processor_id(),
-               current->comm, current->pid, print_tainted());
-       printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, "
-                       ".owner_cpu: %d\n",
-               lock, lock->magic,
-               owner ? owner->comm : "<none>",
-               owner ? owner->pid : -1,
-               lock->owner_cpu);
-       dump_stack();
+       if (xchg(&print_once, 0)) {
+               if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT)
+                       owner = lock->owner;
+               printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d (%s)\n",
+                       msg, raw_smp_processor_id(),
+                      current->comm, current->pid, print_tainted());
+               printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, "
+                               ".owner_cpu: %d\n",
+                       lock, lock->magic,
+                       owner ? owner->comm : "<none>",
+                       owner ? owner->pid : -1,
+                       lock->owner_cpu);
+               dump_stack();
+#ifdef CONFIG_SMP
+               /*
+                * We cannot continue on SMP:
+                */
+               if (nopanic)
+                       printk("bad locking\n");
+               else
+                       panic("bad locking");
+#endif
+       }
 }
 
 #define SPIN_BUG_ON(cond, lock, msg) if (unlikely(cond)) spin_bug(lock, msg)
 
-static inline void
-debug_spin_lock_before(spinlock_t *lock)
+static inline void debug_spin_lock_before(spinlock_t *lock)
 {
        SPIN_BUG_ON(lock->magic != SPINLOCK_MAGIC, lock, "bad magic");
        SPIN_BUG_ON(lock->owner == current, lock, "recursion");
@@ -99,12 +81,11 @@ static inline void debug_spin_unlock(spinlock_t *lock)
 
 static void __spin_lock_debug(spinlock_t *lock)
 {
-       u64 i;
-       u64 loops = loops_per_jiffy * HZ;
        int print_once = 1;
+       u64 i;
 
        for (;;) {
-               for (i = 0; i < loops; i++) {
+               for (i = 0; i < loops_per_jiffy * HZ; i++) {
                        if (__raw_spin_trylock(&lock->raw_lock))
                                return;
                }
@@ -151,13 +132,20 @@ void _raw_spin_unlock(spinlock_t *lock)
 
 static void rwlock_bug(rwlock_t *lock, const char *msg)
 {
-       if (!debug_locks_off())
-               return;
-
-       printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p (%s)\n",
-               msg, raw_smp_processor_id(), current->comm,
-               current->pid, lock, print_tainted());
-       dump_stack();
+       static long print_once = 1;
+
+       if (xchg(&print_once, 0)) {
+               printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p (%s)\n",
+                       msg, raw_smp_processor_id(), current->comm,
+                       current->pid, lock, print_tainted());
+               dump_stack();
+#ifdef CONFIG_SMP
+               /*
+                * We cannot continue on SMP:
+                */
+               panic("bad locking");
+#endif
+       }
 }
 
 #define RWLOCK_BUG_ON(cond, lock, msg) if (unlikely(cond)) rwlock_bug(lock, msg)
@@ -165,12 +153,11 @@ static void rwlock_bug(rwlock_t *lock, const char *msg)
 #if 0          /* __write_lock_debug() can lock up - maybe this can too? */
 static void __read_lock_debug(rwlock_t *lock)
 {
-       u64 i;
-       u64 loops = loops_per_jiffy * HZ;
        int print_once = 1;
+       u64 i;
 
        for (;;) {
-               for (i = 0; i < loops; i++) {
+               for (i = 0; i < loops_per_jiffy * HZ; i++) {
                        if (__raw_read_trylock(&lock->raw_lock))
                                return;
                }
@@ -239,12 +226,11 @@ static inline void debug_write_unlock(rwlock_t *lock)
 #if 0          /* This can cause lockups */
 static void __write_lock_debug(rwlock_t *lock)
 {
-       u64 i;
-       u64 loops = loops_per_jiffy * HZ;
        int print_once = 1;
+       u64 i;
 
        for (;;) {
-               for (i = 0; i < loops; i++) {
+               for (i = 0; i < loops_per_jiffy * HZ; i++) {
                        if (__raw_write_trylock(&lock->raw_lock))
                                return;
                }