Skip to contentSkip to conversation

lockdep: special s390 print_symbol() version

PATCH In review Heiko Carstens 4 participants 5 messages Jun 28, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lockdep: special s390 print_symbol() version

From: Heiko Carstens <[email protected]>

Have a special version of print_symbol() for s390 which clears the most significant bit of addr before calling __print_symbol(). This seems to be better than checking/changing each place in the kernel that saves an instruction pointer.

Without this the output would look like:

hardirqs last  enabled at (30907): [<80018c6a>] 0x80018c6a
hardirqs last disabled at (30908): [<8001e48c>] 0x8001e48c
softirqs last  enabled at (30904): [<8001dc96>] 0x8001dc96
softirqs last disabled at (30897): [<8001dc50>] 0x8001dc50

instead of this:

hardirqs last  enabled at (19421): [<80018c72>] cpu_idle+0x176/0x1c4
hardirqs last disabled at (19422): [<8001e494>] io_no_vtime+0xa/0x1a
softirqs last  enabled at (19418): [<8001dc9e>] do_softirq+0xa6/0xe8
softirqs last disabled at (19411): [<8001dc58>] do_softirq+0x60/0xe8
Cc Ingo Molnar <[email protected]>
Cc Arjan van de Ven <[email protected]>
Cc Martin Schwidefsky <[email protected]>

---

Patch is against 2.6.17-mm3.

 include/linux/kallsyms.h |    9 +++++++++
 1 file changed, 9 insertions(+)
include/linux/kallsyms.h +9 -0
Index: linux-2.6.17-mm3/include/linux/kallsyms.h
===================================================================
@@ -57,11 +57,20 @@ do {						\
 #define print_fn_descriptor_symbol(fmt, addr) print_symbol(fmt, addr)
 #endif
 
+/* need to clear the most significant bit on s390 31bit */
+#if defined(CONFIG_S390) && !defined(CONFIG_64BIT)
+#define print_symbol(fmt, addr)			\
+do {						\
+	__check_printsym_format(fmt, "");	\
+	__print_symbol(fmt, addr & 0x7fffffff);	\
+} while(0)
+#else
 #define print_symbol(fmt, addr)			\
 do {						\
 	__check_printsym_format(fmt, "");	\
 	__print_symbol(fmt, addr);		\
 } while(0)
+#endif
 
 #ifndef CONFIG_64BIT
 #define print_ip_sym(ip)		\
#1 lore raw
Quoted 10 lines
include/linux/kallsyms.h +4 -0
@@ -57,11 +57,20 @@ do {						\
 #define print_fn_descriptor_symbol(fmt, addr) print_symbol(fmt, addr)
 #endif
 
+/* need to clear the most significant bit on s390 31bit */
+#if defined(CONFIG_S390) && !defined(CONFIG_64BIT)
+#define print_symbol(fmt, addr)			\
+do {						\

include/linux/kallsyms.h do { \ · line 73

Quoted 10 lines
include/linux/kallsyms.h +5 -0
+	__check_printsym_format(fmt, "");	\
+	__print_symbol(fmt, addr & 0x7fffffff);	\
+} while(0)
+#else
 #define print_symbol(fmt, addr)			\
 do {						\
 	__check_printsym_format(fmt, "");	\
 	__print_symbol(fmt, addr);		\
 } while(0)
+#endif

Martin made me just aware of __builtin_extract_return_addr() which will do the trick as well and avoids adding yet another ifdef. So, how about this one instead:

From: Heiko Carstens <[email protected]>

Use __builtin_extract_return_addr() in print_symbol() to deal with s390 which has the most significant bit set in instruction pointers.

Without this the output would look like:

hardirqs last  enabled at (30907): [<80018c6a>] 0x80018c6a
hardirqs last disabled at (30908): [<8001e48c>] 0x8001e48c
softirqs last  enabled at (30904): [<8001dc96>] 0x8001dc96
softirqs last disabled at (30897): [<8001dc50>] 0x8001dc50

instead of this:

hardirqs last  enabled at (19421): [<80018c72>] cpu_idle+0x176/0x1c4
hardirqs last disabled at (19422): [<8001e494>] io_no_vtime+0xa/0x1a
softirqs last  enabled at (19418): [<8001dc9e>] do_softirq+0xa6/0xe8
softirqs last disabled at (19411): [<8001dc58>] do_softirq+0x60/0xe8
Cc Ingo Molnar <[email protected]>
Cc Arjan van de Ven <[email protected]>
Cc Martin Schwidefsky <[email protected]>

---

 include/linux/kallsyms.h |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
include/linux/kallsyms.h +6 -5
Index: linux-2.6.17-mm3/include/linux/kallsyms.h
===================================================================
@@ -57,11 +57,12 @@ do {						\
 #define print_fn_descriptor_symbol(fmt, addr) print_symbol(fmt, addr)
 #endif
 
-#define print_symbol(fmt, addr)			\
-do {						\
-	__check_printsym_format(fmt, "");	\
-	__print_symbol(fmt, addr);		\
-} while(0)
+static inline void print_symbol(const char *fmt, unsigned long addr)
+{
+	__check_printsym_format(fmt, "");
+	__print_symbol(fmt, (unsigned long)
+		       __builtin_extract_return_addr((void *)addr));
+}
 
 #ifndef CONFIG_64BIT
 #define print_ip_sym(ip)		\
#2 lore raw
Quoted 2 lines · On Wed, 28 Jun 2006 14:06:35 +0200 Heiko Carstens <[email protected]>…

Martin made me just aware of __builtin_extract_return_addr() which will do the trick as well and avoids adding yet another ifdef.

Does gcc-3.2 support that?

#3 lore raw
Quoted 7 lines · Andrew Morton
Quoted 2 lines · On Wed, 28 Jun 2006 14:06:35 +0200 Heiko Carstens <[email protected]>…

Martin made me just aware of __builtin_extract_return_addr() which will do the trick as well and avoids adding yet another ifdef.

Does gcc-3.2 support that?

It was present in every version of gcc we used, even 2.95.3 had it.

Signature · 8 lines
blue skies,
  Martin.

Martin Schwidefsky
Linux for zSeries Development & Services
IBM Deutschland Entwicklung GmbH

"Reality continues to ruin my life." - Calvin.
#4 lore raw
In reply to Heiko Carstens

include/linux/kallsyms.h do { \ · line 65

Quoted 6 lines · Heiko Carstens
include/linux/kallsyms.h +6 -0
+static inline void print_symbol(const char *fmt, unsigned long addr)
+{
+	__check_printsym_format(fmt, "");
+	__print_symbol(fmt, (unsigned long)
+		       __builtin_extract_return_addr((void *)addr));
+}

yeah, this looks better i think than the #ifdef variant.

Ingo