lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse Source 
* 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit]
  lockdep: remove duplicate CONFIG_DEBUG_LOCKDEP definitions
  lockdep: require framepointers for x86
  lockdep: remove extra "irq" string
  lockdep: fix incorrect state name
This commit is contained in:
Linus Torvalds
2009-04-03 17:29:53 -07:00
parent f945b7abcb 7bee946358
commit 492f59f526
4 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/irqflags.h
View File

@@ -24,8 +24,8 @@
# define trace_softirqs_enabled(p) ((p)->softirqs_enabled) # define trace_softirqs_enabled(p) ((p)->softirqs_enabled)
# define trace_hardirq_enter() do { current->hardirq_context++; } while (0) # define trace_hardirq_enter() do { current->hardirq_context++; } while (0)
# define trace_hardirq_exit() do { current->hardirq_context--; } while (0) # define trace_hardirq_exit() do { current->hardirq_context--; } while (0)
# define trace_softirq_enter() do { current->softirq_context++; } while (0) # define lockdep_softirq_enter() do { current->softirq_context++; } while (0)
# define trace_softirq_exit() do { current->softirq_context--; } while (0) # define lockdep_softirq_exit() do { current->softirq_context--; } while (0)
# define INIT_TRACE_IRQFLAGS .softirqs_enabled = 1, # define INIT_TRACE_IRQFLAGS .softirqs_enabled = 1,
#else #else
# define trace_hardirqs_on() do { } while (0) # define trace_hardirqs_on() do { } while (0)
@@ -38,8 +38,8 @@
# define trace_softirqs_enabled(p) 0 # define trace_softirqs_enabled(p) 0
# define trace_hardirq_enter() do { } while (0) # define trace_hardirq_enter() do { } while (0)
# define trace_hardirq_exit() do { } while (0) # define trace_hardirq_exit() do { } while (0)
# define trace_softirq_enter() do { } while (0) # define lockdep_softirq_enter() do { } while (0)
# define trace_softirq_exit() do { } while (0) # define lockdep_softirq_exit() do { } while (0)
# define INIT_TRACE_IRQFLAGS # define INIT_TRACE_IRQFLAGS
#endif #endif

16
kernel/lockdep.c
View File

@@ -433,13 +433,6 @@ atomic_t nr_find_usage_forwards_checks;
atomic_t nr_find_usage_forwards_recursions; atomic_t nr_find_usage_forwards_recursions;
atomic_t nr_find_usage_backwards_checks; atomic_t nr_find_usage_backwards_checks;
atomic_t nr_find_usage_backwards_recursions; atomic_t nr_find_usage_backwards_recursions;
# define debug_atomic_inc(ptr) atomic_inc(ptr)
# define debug_atomic_dec(ptr) atomic_dec(ptr)
# define debug_atomic_read(ptr) atomic_read(ptr)
#else
# define debug_atomic_inc(ptr) do { } while (0)
# define debug_atomic_dec(ptr) do { } while (0)
# define debug_atomic_read(ptr) 0
#endif #endif
/* /*
@@ -1900,9 +1893,9 @@ print_irq_inversion_bug(struct task_struct *curr, struct lock_class *other,
curr->comm, task_pid_nr(curr)); curr->comm, task_pid_nr(curr));
print_lock(this); print_lock(this);
if (forwards) if (forwards)
printk("but this lock took another, %s-irq-unsafe lock in the past:\n", irqclass); printk("but this lock took another, %s-unsafe lock in the past:\n", irqclass);
else else
printk("but this lock was taken by another, %s-irq-safe lock in the past:\n", irqclass); printk("but this lock was taken by another, %s-safe lock in the past:\n", irqclass);
print_lock_name(other); print_lock_name(other);
printk("\n\nand interrupts could create inverse lock ordering between them.\n\n"); printk("\n\nand interrupts could create inverse lock ordering between them.\n\n");
@@ -2015,7 +2008,8 @@ typedef int (*check_usage_f)(struct task_struct *, struct held_lock *,
enum lock_usage_bit bit, const char *name); enum lock_usage_bit bit, const char *name);
static int static int
mark_lock_irq(struct task_struct *curr, struct held_lock *this, int new_bit) mark_lock_irq(struct task_struct *curr, struct held_lock *this,
enum lock_usage_bit new_bit)
{ {
int excl_bit = exclusive_bit(new_bit); int excl_bit = exclusive_bit(new_bit);
int read = new_bit & 1; int read = new_bit & 1;
@@ -2043,7 +2037,7 @@ mark_lock_irq(struct task_struct *curr, struct held_lock *this, int new_bit)
* states. * states.
*/ */
if ((!read || !dir || STRICT_READ_CHECKS) && if ((!read || !dir || STRICT_READ_CHECKS) &&
!usage(curr, this, excl_bit, state_name(new_bit))) !usage(curr, this, excl_bit, state_name(new_bit & ~1)))
return 0; return 0;
/* /*

4
kernel/softirq.c
View File

@@ -180,7 +180,7 @@ asmlinkage void __do_softirq(void)
account_system_vtime(current); account_system_vtime(current);
__local_bh_disable((unsigned long)__builtin_return_address(0)); __local_bh_disable((unsigned long)__builtin_return_address(0));
trace_softirq_enter(); lockdep_softirq_enter();
cpu = smp_processor_id(); cpu = smp_processor_id();
restart: restart:
@@ -220,7 +220,7 @@ restart:
if (pending) if (pending)
wakeup_softirqd(); wakeup_softirqd();
trace_softirq_exit(); lockdep_softirq_exit();
account_system_vtime(current); account_system_vtime(current);
_local_bh_enable(); _local_bh_enable();

4
lib/locking-selftest.c
View File

@@ -157,11 +157,11 @@ static void init_shared_classes(void)
#define SOFTIRQ_ENTER() \ #define SOFTIRQ_ENTER() \
local_bh_disable(); \ local_bh_disable(); \
local_irq_disable(); \ local_irq_disable(); \
trace_softirq_enter(); \ lockdep_softirq_enter(); \
WARN_ON(!in_softirq()); WARN_ON(!in_softirq());
#define SOFTIRQ_EXIT() \ #define SOFTIRQ_EXIT() \
trace_softirq_exit(); \ lockdep_softirq_exit(); \
local_irq_enable(); \ local_irq_enable(); \
local_bh_enable(); local_bh_enable();