Skip to contentSkip to conversation

lockdep stat fixes

GIT PULL New Frederic Weisbecker 2 participants 5 messages May 4, 2010

lore
Share & tools
lore
#0 lore raw

Ingo,

Please pull the core/locking branch that can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
core/locking

Thanks,
Frederic
---

Frederic Weisbecker (3):
lockdep: Provide off case for redundant_hardirqs_on increment
lockdep: Actually _dec_ in debug_atomic_dec
lockdep: No need to disable preemption in debug atomic ops

 kernel/lockdep.c           |    2 +-
 kernel/lockdep_internals.h |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
#1 lore raw

PATCH 1/3 lockdep: Provide off case for redundant_hardirqs_on increment

We forgot to provide a !CONFIG_DEBUG_LOCKDEP case for the redundant_hardirqs_on stat handling.

Manage that in the headers with a new __debug_atomic_inc() helper.

Fixes:

kernel/lockdep.c:2306: error: 'lockdep_stats' undeclared (first use in this function) kernel/lockdep.c:2306: error: (Each undeclared identifier is reported only once kernel/lockdep.c:2306: error: for each function it appears in.)

---
 kernel/lockdep.c           |    2 +-
 kernel/lockdep_internals.h |    4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)
kernel/lockdep.c +1 -1
index 1b58a1b..9cf7985 100644
@@ -2303,7 +2303,7 @@ void trace_hardirqs_on_caller(unsigned long ip)
 		 * so this is racy by nature but loosing one hit
 		 * in a stat is not a big deal.
 		 */
-		this_cpu_inc(lockdep_stats.redundant_hardirqs_on);
+		__debug_atomic_inc(redundant_hardirqs_on);
 		return;
 	}
 	/* we'll do an OFF -> ON transition: */
kernel/lockdep_internals.h +4 -0
index 2b17476..7de27a8 100644
@@ -139,6 +139,9 @@ struct lockdep_stats {
 
 DECLARE_PER_CPU(struct lockdep_stats, lockdep_stats);
 
+#define __debug_atomic_inc(ptr)					\
+	this_cpu_inc(lockdep_stats.ptr);
+
 #define debug_atomic_inc(ptr)			{		\
 	WARN_ON_ONCE(!irqs_disabled());				\
 	this_cpu_inc(lockdep_stats.ptr);			\
@@ -160,6 +163,7 @@ DECLARE_PER_CPU(struct lockdep_stats, lockdep_stats);
 	__total;							\
 })
 #else
+# define __debug_atomic_inc(ptr)	do { } while (0)
 # define debug_atomic_inc(ptr)		do { } while (0)
 # define debug_atomic_dec(ptr)		do { } while (0)
 # define debug_atomic_read(ptr)		0
Signature · 1 line
1.6.2.3
#2 lore raw

PATCH 2/3 lockdep: Actually _dec_ in debug_atomic_dec

In reply to Frederic Weisbecker

Fix a silly copy-paste mistake that was making debug_atomic_dec use this_cpu_inc instead of this_cpu_dec.

---
 kernel/lockdep_internals.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/lockdep_internals.h +1 -1
index 7de27a8..8d929c7 100644
@@ -149,7 +149,7 @@ DECLARE_PER_CPU(struct lockdep_stats, lockdep_stats);
 
 #define debug_atomic_dec(ptr)			{		\
 	WARN_ON_ONCE(!irqs_disabled());				\
-	this_cpu_inc(lockdep_stats.ptr);			\
+	this_cpu_dec(lockdep_stats.ptr);			\
 }
 
 #define debug_atomic_read(ptr)		({				\
Signature · 1 line
1.6.2.3
#3 lore raw

PATCH 3/3 lockdep: No need to disable preemption in debug atomic ops

In reply to Frederic Weisbecker

No need to disable preemption in the debug_atomic_* ops, as we ensure interrupts are disabled already.

So let's use the __this_cpu_ops() rather than this_cpu_ops() that enclose the ops in a preempt disabled section.

---
 kernel/lockdep_internals.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
kernel/lockdep_internals.h +2 -2
index 8d929c7..4f560cf 100644
@@ -144,12 +144,12 @@ DECLARE_PER_CPU(struct lockdep_stats, lockdep_stats);
 
 #define debug_atomic_inc(ptr)			{		\
 	WARN_ON_ONCE(!irqs_disabled());				\
-	this_cpu_inc(lockdep_stats.ptr);			\
+	__this_cpu_inc(lockdep_stats.ptr);			\
 }
 
 #define debug_atomic_dec(ptr)			{		\
 	WARN_ON_ONCE(!irqs_disabled());				\
-	this_cpu_dec(lockdep_stats.ptr);			\
+	__this_cpu_dec(lockdep_stats.ptr);			\
 }
 
 #define debug_atomic_read(ptr)		({				\
Signature · 1 line
1.6.2.3
#4 lore raw
In reply to Frederic Weisbecker
Quoted 17 lines · Frederic Weisbecker

Ingo,

Please pull the core/locking branch that can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
core/locking

Thanks,
Frederic
---

Frederic Weisbecker (3):
lockdep: Provide off case for redundant_hardirqs_on increment
lockdep: Actually _dec_ in debug_atomic_dec
lockdep: No need to disable preemption in debug atomic ops

Quoted 3 lines
 kernel/lockdep.c           |    2 +-
 kernel/lockdep_internals.h |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

Pulled, thanks!

Ingo