diff options
author | Alexander Sverdlin <alexander.sverdlin@gmail.com> | 2017-05-25 08:58:46 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-06-05 03:28:08 -0400 |
commit | 20fb654aef1c929f7befb40678e2cb65a77ead7f (patch) | |
tree | df38ee90210e475e5eddc009669e1651af79a820 /tools/lib | |
parent | 24b4d0a1f952355566c0428aba4065a5c3a6ed2c (diff) |
tools/lib/lockdep: Don't mix fd-based and stream IO
Mixing fd-based and stream-base IO results in interleaved output like
following:
=====================================
liblockdep 4.7.6
-------------------------------------
conopal/372 is trying to release lock (0x3a45c) at:
/lib/libpt.so.2.17-alpha2(_ZN11PTimedMutex6SignalEv+0x3c) [0xb613c688]
but there are no more locks to release!
other info that might help us debug this:
no locks held by conopal/372.
stack backtrace:
=====================================
liblockdep 4.7.6
---------------------------------/usr/lib/liblockdep.so.4.7.6(+0x1e3c)[0xb67c2e3c]
/usr/lib/liblockdep.so.4.7.6(+0x5fe0)[0xb67c6fe0]
/usr/lib/liblockdep.so.4.7.6(+0x6450)[0xb67c7450]
/usr/lib/liblockdep.so.4.7.6(lock_release+0x5c)[0xb67c7c40]
/usr/lib/liblockdep.so.4.7.6(pthread_mutex_unlock+0x38)[0xb67c91d4]
/lib/libpt.so.2.17-alpha2(_ZN11PTimedMutex6SignalEv+0x3c)[0xb613c688]
/lib/libpt.so.2.17-alpha2(_ZN10PContainer14AssignContentsERKS_+0xe4)[0xb6160730]
/lib/libopal.so.3.17-alpha2(_ZN15OpalMediaFormat14AssignContentsERK10PContainer+0x90)[0xb6435edc]
/lib/libopal.so.3.17-alpha2(_ZN15OpalMediaFormataSERK7PString+0x68)[0xb643b610]
/lib/libopal.so.3.17-alpha2(_ZN15OpalMediaFormatC2EPKc+0x68)[0xb643b6cc]
/lib/libopal.so.3.17-alpha2(_ZN11OpalWAVFile14AddMediaFormatERK15OpalMediaFormat+0x330)[0xb66b2224]
/lib/libopal.so.3.17-alpha2(+0x2526f8)[0xb640c6f8]
/lib/ld-linux-armhf.so.3(+0x102f0)[0xb6f852f0]
/lib/ld-linux-armhf.so.3(+0x1044c)[0xb6f8544c]
/lib/ld-linux-armhf.so.3(+0xac4)[0xb6f75ac4]
/usr/lib/liblockdep.so.4.7.6(+0x1e3c)[0xb67c2e3c]
/usr/lib/liblockdep.so.4.7.6(+0x5fe0)[0xb67c6fe0]
/usr/lib/liblockdep.so.4.7.6(+0x6450)[0xb67c7450]
/usr/lib/liblockdep.so.4.7.6(lock_release+0x5c)[0xb67c7c40]
/usr/lib/liblockdep.so.4.7.6(pthread_mutex_unlock+0x38)[0xb67c91d4]
/lib/libpt.so.2.17-alpha2(_ZN11PTimedMutex6SignalEv+0x3c)[0xb613c688]
/lib/libopal.so.3.17-alpha2(_ZN15OpalMediaFormat14AssignContentsERK10PContainer+0x78)[0xb6435ec4]
/lib/libopal.so.3.17-alpha2(_ZN15OpalMediaFormataSERK7PString+0x68)[0xb643b610]
/lib/libopal.so.3.17-alpha2(_ZN15OpalMediaFormatC2EPKc+0x68)[0xb643b6cc]
/lib/libopal.so.3.17-alpha2(_ZN11OpalWAVFile14AddMediaFormatERK15OpalMediaFormat+0x330)[0xb66b2224]
/lib/libopal.so.3.17-alpha2(+0x2526f8)[0xb640c6f8]
/lib/ld-linux-armhf.so.3(+0x102f0)[0xb6f852f0]
/lib/ld-linux-armhf.so.3(+0x1044c)[0xb6f8544c]
/lib/ld-linux-armhf.so.3(+0xac4)[0xb6f75ac4]
Therefore change all bare printf(...) to dprintf(STDOUT_FILENO, ...) to
sychronize with backtrace_symbols_fd().
[ BUG: bad unlock balance detected! ]
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: a.p.zijlstra@chello.nl
Cc: ben@decadent.org.uk
Link: http://lkml.kernel.org/r/20170525130005.5947-12-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/lib')
-rw-r--r-- | tools/lib/lockdep/preload.c | 3 | ||||
-rw-r--r-- | tools/lib/lockdep/uinclude/linux/kallsyms.h | 3 | ||||
-rw-r--r-- | tools/lib/lockdep/uinclude/linux/lockdep.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/tools/lib/lockdep/preload.c b/tools/lib/lockdep/preload.c index 52844847569c..226aa26198a9 100644 --- a/tools/lib/lockdep/preload.c +++ b/tools/lib/lockdep/preload.c | |||
@@ -4,6 +4,7 @@ | |||
4 | #include <dlfcn.h> | 4 | #include <dlfcn.h> |
5 | #include <stdlib.h> | 5 | #include <stdlib.h> |
6 | #include <sysexits.h> | 6 | #include <sysexits.h> |
7 | #include <unistd.h> | ||
7 | #include "include/liblockdep/mutex.h" | 8 | #include "include/liblockdep/mutex.h" |
8 | #include "../../include/linux/rbtree.h" | 9 | #include "../../include/linux/rbtree.h" |
9 | 10 | ||
@@ -149,7 +150,7 @@ static struct lock_lookup *alloc_lock(void) | |||
149 | 150 | ||
150 | int idx = __locks_nr++; | 151 | int idx = __locks_nr++; |
151 | if (idx >= ARRAY_SIZE(__locks)) { | 152 | if (idx >= ARRAY_SIZE(__locks)) { |
152 | fprintf(stderr, | 153 | dprintf(STDERR_FILENO, |
153 | "LOCKDEP error: insufficient LIBLOCKDEP_STATIC_ENTRIES\n"); | 154 | "LOCKDEP error: insufficient LIBLOCKDEP_STATIC_ENTRIES\n"); |
154 | exit(EX_UNAVAILABLE); | 155 | exit(EX_UNAVAILABLE); |
155 | } | 156 | } |
diff --git a/tools/lib/lockdep/uinclude/linux/kallsyms.h b/tools/lib/lockdep/uinclude/linux/kallsyms.h index b0f2dbdf1a15..582cc1e5f3a4 100644 --- a/tools/lib/lockdep/uinclude/linux/kallsyms.h +++ b/tools/lib/lockdep/uinclude/linux/kallsyms.h | |||
@@ -3,6 +3,7 @@ | |||
3 | 3 | ||
4 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
5 | #include <stdio.h> | 5 | #include <stdio.h> |
6 | #include <unistd.h> | ||
6 | 7 | ||
7 | #define KSYM_NAME_LEN 128 | 8 | #define KSYM_NAME_LEN 128 |
8 | 9 | ||
@@ -24,7 +25,7 @@ static inline void print_ip_sym(unsigned long ip) | |||
24 | 25 | ||
25 | name = backtrace_symbols((void **)&ip, 1); | 26 | name = backtrace_symbols((void **)&ip, 1); |
26 | 27 | ||
27 | printf("%s\n", *name); | 28 | dprintf(STDOUT_FILENO, "%s\n", *name); |
28 | 29 | ||
29 | free(name); | 30 | free(name); |
30 | } | 31 | } |
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h index c157242e0417..d988fba99454 100644 --- a/tools/lib/lockdep/uinclude/linux/lockdep.h +++ b/tools/lib/lockdep/uinclude/linux/lockdep.h | |||
@@ -7,6 +7,7 @@ | |||
7 | #include <limits.h> | 7 | #include <limits.h> |
8 | #include <linux/utsname.h> | 8 | #include <linux/utsname.h> |
9 | #include <linux/compiler.h> | 9 | #include <linux/compiler.h> |
10 | #include <unistd.h> | ||
10 | 11 | ||
11 | #define MAX_LOCK_DEPTH 63UL | 12 | #define MAX_LOCK_DEPTH 63UL |
12 | 13 | ||
@@ -37,7 +38,7 @@ static inline int debug_locks_off(void) | |||
37 | #define task_pid_nr(tsk) ((tsk)->pid) | 38 | #define task_pid_nr(tsk) ((tsk)->pid) |
38 | 39 | ||
39 | #define KSYM_NAME_LEN 128 | 40 | #define KSYM_NAME_LEN 128 |
40 | #define printk printf | 41 | #define printk(...) dprintf(STDOUT_FILENO, __VA_ARGS__) |
41 | 42 | ||
42 | #define list_del_rcu list_del | 43 | #define list_del_rcu list_del |
43 | 44 | ||