* [PATCH 01/21] liblockdep: Fix undefined symbol prandom_u32
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:01 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 02/21] liblockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain::depth Levin, Alexander (Sasha Levin)
` (20 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
From: Ben Hutchings <ben@decadent.org.uk>
__lock_pin_lock() now calls prandom_u32() which is not defined in
liblockdep. __lock_pin_lock() and its caller lock_pin_lock() are dead
code in liblockdep, but we still need to provide a definition of
prandom_u32() in case lazy binding is disabled.
Fixes: e7904a28f533 ("locking/lockdep, sched/core: Implement a better ...")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
---
tools/lib/lockdep/lockdep.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tools/lib/lockdep/lockdep.c b/tools/lib/lockdep/lockdep.c
index a0a2e3a266af..443acb11f907 100644
--- a/tools/lib/lockdep/lockdep.c
+++ b/tools/lib/lockdep/lockdep.c
@@ -1,8 +1,15 @@
#include <linux/lockdep.h>
+#include <stdlib.h>
/* Trivial API wrappers, we don't (yet) have RCU in user-space: */
#define hlist_for_each_entry_rcu hlist_for_each_entry
#define hlist_add_head_rcu hlist_add_head
#define hlist_del_rcu hlist_del
+u32 prandom_u32(void)
+{
+ /* Used only by lock_pin_lock() which is dead code */
+ abort();
+}
+
#include "../../../kernel/locking/lockdep.c"
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/lib/lockdep: Fix undefined symbol prandom_u32
2017-05-25 12:58 ` [PATCH 01/21] liblockdep: Fix undefined symbol prandom_u32 Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:01 ` tip-bot for Ben Hutchings
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Ben Hutchings @ 2017-06-05 9:01 UTC (permalink / raw)
To: linux-tip-commits
Cc: ben, hpa, tglx, peterz, linux-kernel, sasha.levin, torvalds, mingo
Commit-ID: 3752466b6bf04868296ac6bc27ea1765008636d8
Gitweb: http://git.kernel.org/tip/3752466b6bf04868296ac6bc27ea1765008636d8
Author: Ben Hutchings <ben@decadent.org.uk>
AuthorDate: Thu, 25 May 2017 12:58:31 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:02 +0200
tools/lib/lockdep: Fix undefined symbol prandom_u32
__lock_pin_lock() now calls prandom_u32() which is not defined in
liblockdep. __lock_pin_lock() and its caller lock_pin_lock() are dead
code in liblockdep, but we still need to provide a definition of
prandom_u32() in case lazy binding is disabled.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: a.p.zijlstra@chello.nl
Fixes: e7904a28f533 ("locking/lockdep, sched/core: Implement a better ...")
Link: http://lkml.kernel.org/r/20170525130005.5947-2-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/lockdep.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tools/lib/lockdep/lockdep.c b/tools/lib/lockdep/lockdep.c
index a0a2e3a..443acb1 100644
--- a/tools/lib/lockdep/lockdep.c
+++ b/tools/lib/lockdep/lockdep.c
@@ -1,8 +1,15 @@
#include <linux/lockdep.h>
+#include <stdlib.h>
/* Trivial API wrappers, we don't (yet) have RCU in user-space: */
#define hlist_for_each_entry_rcu hlist_for_each_entry
#define hlist_add_head_rcu hlist_add_head
#define hlist_del_rcu hlist_del
+u32 prandom_u32(void)
+{
+ /* Used only by lock_pin_lock() which is dead code */
+ abort();
+}
+
#include "../../../kernel/locking/lockdep.c"
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 02/21] liblockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain::depth
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 01/21] liblockdep: Fix undefined symbol prandom_u32 Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:01 ` [tip:locking/core] tools/lib/lockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain/: Depth tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 03/21] liblockdep: Define the ARRAY_SIZE() macro Levin, Alexander (Sasha Levin)
` (19 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
From: Ben Hutchings <ben@decadent.org.uk>
liblockdep has been broken since commit 75dd602a5198 ("lockdep: Fix
lock_chain::base size"), as that adds a check that MAX_LOCK_DEPTH is
within the range of lock_chain::depth and in liblockdep it is much
too large.
That should have resulted in a compiler error, but didn't because:
- the check uses ARRAY_SIZE(), which isn't yet defined in liblockdep
so is assumed to be an (undeclared) function
- putting a function call inside a BUILD_BUG_ON() expression quietly
turns it into some nonsense involving a variable-length array
It did produce a compiler warning, but I didn't notice because
liblockdep already produces too many warnings if -Wall is enabled
(which I'll fix shortly).
Even before that commit, which reduced lock_chain::depth from 8 bits
to 6, MAX_LOCK_DEPTH was too large.
Cc: <stable@vger.kernel.org> # for versions before 4.6, use a value of 255
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
---
tools/lib/lockdep/uinclude/linux/lockdep.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h
index c808c7d02d21..d30214221920 100644
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
+++ b/tools/lib/lockdep/uinclude/linux/lockdep.h
@@ -8,7 +8,7 @@
#include <linux/utsname.h>
#include <linux/compiler.h>
-#define MAX_LOCK_DEPTH 2000UL
+#define MAX_LOCK_DEPTH 63UL
#define asmlinkage
#define __visible
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/lib/lockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain/: Depth
2017-05-25 12:58 ` [PATCH 02/21] liblockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain::depth Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:01 ` tip-bot for Ben Hutchings
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Ben Hutchings @ 2017-06-05 9:01 UTC (permalink / raw)
To: linux-tip-commits
Cc: ben, mingo, tglx, torvalds, sasha.levin, linux-kernel, hpa, peterz
Commit-ID: 98dcea0cfd04e083ac74137ceb9a632604740e2d
Gitweb: http://git.kernel.org/tip/98dcea0cfd04e083ac74137ceb9a632604740e2d
Author: Ben Hutchings <ben@decadent.org.uk>
AuthorDate: Thu, 25 May 2017 12:58:33 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:03 +0200
tools/lib/lockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain/: Depth
liblockdep has been broken since commit 75dd602a5198 ("lockdep: Fix
lock_chain::base size"), as that adds a check that MAX_LOCK_DEPTH is
within the range of lock_chain::depth and in liblockdep it is much
too large.
That should have resulted in a compiler error, but didn't because:
- the check uses ARRAY_SIZE(), which isn't yet defined in liblockdep
so is assumed to be an (undeclared) function
- putting a function call inside a BUILD_BUG_ON() expression quietly
turns it into some nonsense involving a variable-length array
It did produce a compiler warning, but I didn't notice because
liblockdep already produces too many warnings if -Wall is enabled
(which I'll fix shortly).
Even before that commit, which reduced lock_chain::depth from 8 bits
to 6, MAX_LOCK_DEPTH was too large.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: <stable@vger.kernel.org> # for versions before 4.6, use a value of 255
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: a.p.zijlstra@chello.nl
Link: http://lkml.kernel.org/r/20170525130005.5947-3-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/uinclude/linux/lockdep.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h
index c808c7d..d302142 100644
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
+++ b/tools/lib/lockdep/uinclude/linux/lockdep.h
@@ -8,7 +8,7 @@
#include <linux/utsname.h>
#include <linux/compiler.h>
-#define MAX_LOCK_DEPTH 2000UL
+#define MAX_LOCK_DEPTH 63UL
#define asmlinkage
#define __visible
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 03/21] liblockdep: Define the ARRAY_SIZE() macro
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 01/21] liblockdep: Fix undefined symbol prandom_u32 Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 02/21] liblockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain::depth Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:02 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 04/21] liblockdep: Enable -Wall by default Levin, Alexander (Sasha Levin)
` (18 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
From: Ben Hutchings <ben@decadent.org.uk>
lockdep.c now uses ARRAY_SIZE().
Fixes: 75dd602a5198 ("lockdep: Fix lock_chain::base size")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
---
tools/lib/lockdep/uinclude/linux/kernel.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
index 276c7a8b2ed1..da87bd9ad2c1 100644
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
@@ -7,6 +7,8 @@
#include <linux/hardirq.h>
#include <linux/kern_levels.h>
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+
#ifndef container_of
#define container_of(ptr, type, member) ({ \
const typeof(((type *)0)->member) * __mptr = (ptr); \
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/lib/lockdep: Define the ARRAY_SIZE() macro
2017-05-25 12:58 ` [PATCH 03/21] liblockdep: Define the ARRAY_SIZE() macro Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:02 ` tip-bot for Ben Hutchings
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Ben Hutchings @ 2017-06-05 9:02 UTC (permalink / raw)
To: linux-tip-commits
Cc: hpa, torvalds, linux-kernel, mingo, sasha.levin, ben, peterz, tglx
Commit-ID: 108744c45fd8a51e763e976d9e5b2cc265d4a847
Gitweb: http://git.kernel.org/tip/108744c45fd8a51e763e976d9e5b2cc265d4a847
Author: Ben Hutchings <ben@decadent.org.uk>
AuthorDate: Thu, 25 May 2017 12:58:34 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:04 +0200
tools/lib/lockdep: Define the ARRAY_SIZE() macro
lockdep.c now uses ARRAY_SIZE().
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: a.p.zijlstra@chello.nl
Fixes: 75dd602a5198 ("lockdep: Fix lock_chain::base size")
Link: http://lkml.kernel.org/r/20170525130005.5947-4-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/uinclude/linux/kernel.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
index 276c7a8..da87bd9 100644
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
@@ -7,6 +7,8 @@
#include <linux/hardirq.h>
#include <linux/kern_levels.h>
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+
#ifndef container_of
#define container_of(ptr, type, member) ({ \
const typeof(((type *)0)->member) * __mptr = (ptr); \
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 04/21] liblockdep: Enable -Wall by default
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (2 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 03/21] liblockdep: Define the ARRAY_SIZE() macro Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:02 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 05/21] liblockdep: Fix 'unused value' warnings Levin, Alexander (Sasha Levin)
` (17 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
From: Ben Hutchings <ben@decadent.org.uk>
Regressions in liblockdep may be missed because it doesn't enable
warnings.
Adding -Wall immediately introduces a lot of warnings, but those will
be fixed by the following commits.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
---
tools/lib/lockdep/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile
index 3bc0ef9f8923..98d8a5ae8334 100644
--- a/tools/lib/lockdep/Makefile
+++ b/tools/lib/lockdep/Makefile
@@ -79,6 +79,7 @@ INCLUDES = -I. -I./uinclude -I./include -I../../include $(CONFIG_INCLUDES)
# Set compile option CFLAGS if not set elsewhere
CFLAGS ?= -g -DCONFIG_LOCKDEP -DCONFIG_STACKTRACE -DCONFIG_PROVE_LOCKING -DBITS_PER_LONG=__WORDSIZE -DLIBLOCKDEP_VERSION='"$(LIBLOCKDEP_VERSION)"' -rdynamic -O0 -g
CFLAGS += -fPIC
+CFLAGS += -Wall
override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ)
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/lib/lockdep: Enable -Wall by default
2017-05-25 12:58 ` [PATCH 04/21] liblockdep: Enable -Wall by default Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:02 ` tip-bot for Ben Hutchings
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Ben Hutchings @ 2017-06-05 9:02 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, tglx, peterz, mingo, hpa, torvalds, sasha.levin, ben
Commit-ID: db8f7796c491a7b0a220a89a4abd9134f3906f43
Gitweb: http://git.kernel.org/tip/db8f7796c491a7b0a220a89a4abd9134f3906f43
Author: Ben Hutchings <ben@decadent.org.uk>
AuthorDate: Thu, 25 May 2017 12:58:36 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:04 +0200
tools/lib/lockdep: Enable -Wall by default
Regressions in liblockdep may be missed because it doesn't enable
warnings.
Adding -Wall immediately introduces a lot of warnings, but those will
be fixed by the following commits.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: a.p.zijlstra@chello.nl
Link: http://lkml.kernel.org/r/20170525130005.5947-5-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile
index 3bc0ef9..98d8a5ae 100644
--- a/tools/lib/lockdep/Makefile
+++ b/tools/lib/lockdep/Makefile
@@ -79,6 +79,7 @@ INCLUDES = -I. -I./uinclude -I./include -I../../include $(CONFIG_INCLUDES)
# Set compile option CFLAGS if not set elsewhere
CFLAGS ?= -g -DCONFIG_LOCKDEP -DCONFIG_STACKTRACE -DCONFIG_PROVE_LOCKING -DBITS_PER_LONG=__WORDSIZE -DLIBLOCKDEP_VERSION='"$(LIBLOCKDEP_VERSION)"' -rdynamic -O0 -g
CFLAGS += -fPIC
+CFLAGS += -Wall
override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ)
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 05/21] liblockdep: Fix 'unused value' warnings
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (3 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 04/21] liblockdep: Enable -Wall by default Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:03 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 06/21] liblockdep: Fix 'set but not used' warnings Levin, Alexander (Sasha Levin)
` (16 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
From: Ben Hutchings <ben@decadent.org.uk>
liblockdep defines various macros that may expand to an expression
with no effect, while the in-kernel definition does have an effect.
This results in warnings from gcc when -Wunused-value is enabled, and
is is enabled by -Wall. Fix this by introducing trivial functions,
as function return values are generally allowed to be ignored.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
---
tools/lib/lockdep/uinclude/linux/debug_locks.h | 2 +-
tools/lib/lockdep/uinclude/linux/kernel.h | 12 +++++++++---
tools/lib/lockdep/uinclude/linux/lockdep.h | 6 +++++-
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/tools/lib/lockdep/uinclude/linux/debug_locks.h b/tools/lib/lockdep/uinclude/linux/debug_locks.h
index f38eb64df794..1d4fbec5c649 100644
--- a/tools/lib/lockdep/uinclude/linux/debug_locks.h
+++ b/tools/lib/lockdep/uinclude/linux/debug_locks.h
@@ -4,7 +4,7 @@
#include <stddef.h>
#include <linux/compiler.h>
-#define DEBUG_LOCKS_WARN_ON(x) (x)
+#define DEBUG_LOCKS_WARN_ON(x) WARN_ON(x)
extern bool debug_locks;
extern bool debug_locks_silent;
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
index da87bd9ad2c1..021cff4f4e3d 100644
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
@@ -22,10 +22,16 @@
_max1 > _max2 ? _max1 : _max2; })
#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
-#define WARN_ON(x) (x)
-#define WARN_ON_ONCE(x) (x)
+
+static inline int lockdep_warn(int condition)
+{
+ return condition;
+}
+#define WARN_ON(x) lockdep_warn(x)
+#define WARN_ON_ONCE(x) WARN_ON(x)
+#define WARN(x, y...) WARN_ON(x)
+
#define likely(x) (x)
-#define WARN(x, y...) (x)
#define uninitialized_var(x) x
#define __init
#define noinline
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h
index d30214221920..d1079034a14d 100644
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
+++ b/tools/lib/lockdep/uinclude/linux/lockdep.h
@@ -29,7 +29,11 @@ extern struct task_struct *__curr(void);
#define current (__curr())
-#define debug_locks_off() 1
+static inline int debug_locks_off(void)
+{
+ return 1;
+}
+
#define task_pid_nr(tsk) ((tsk)->pid)
#define KSYM_NAME_LEN 128
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/lib/lockdep: Fix 'unused value' warnings
2017-05-25 12:58 ` [PATCH 05/21] liblockdep: Fix 'unused value' warnings Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:03 ` tip-bot for Ben Hutchings
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Ben Hutchings @ 2017-06-05 9:03 UTC (permalink / raw)
To: linux-tip-commits
Cc: torvalds, tglx, linux-kernel, peterz, ben, hpa, mingo, sasha.levin
Commit-ID: bb7ea2a9af4c98ed70adf7627a2ba5d1ff1725e0
Gitweb: http://git.kernel.org/tip/bb7ea2a9af4c98ed70adf7627a2ba5d1ff1725e0
Author: Ben Hutchings <ben@decadent.org.uk>
AuthorDate: Thu, 25 May 2017 12:58:37 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:05 +0200
tools/lib/lockdep: Fix 'unused value' warnings
liblockdep defines various macros that may expand to an expression
with no effect, while the in-kernel definition does have an effect.
This results in warnings from gcc when -Wunused-value is enabled, and
is is enabled by -Wall. Fix this by introducing trivial functions,
as function return values are generally allowed to be ignored.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: a.p.zijlstra@chello.nl
Link: http://lkml.kernel.org/r/20170525130005.5947-6-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/uinclude/linux/debug_locks.h | 2 +-
tools/lib/lockdep/uinclude/linux/kernel.h | 12 +++++++++---
tools/lib/lockdep/uinclude/linux/lockdep.h | 6 +++++-
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/tools/lib/lockdep/uinclude/linux/debug_locks.h b/tools/lib/lockdep/uinclude/linux/debug_locks.h
index f38eb64..1d4fbec 100644
--- a/tools/lib/lockdep/uinclude/linux/debug_locks.h
+++ b/tools/lib/lockdep/uinclude/linux/debug_locks.h
@@ -4,7 +4,7 @@
#include <stddef.h>
#include <linux/compiler.h>
-#define DEBUG_LOCKS_WARN_ON(x) (x)
+#define DEBUG_LOCKS_WARN_ON(x) WARN_ON(x)
extern bool debug_locks;
extern bool debug_locks_silent;
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
index da87bd9..021cff4 100644
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
@@ -22,10 +22,16 @@
_max1 > _max2 ? _max1 : _max2; })
#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
-#define WARN_ON(x) (x)
-#define WARN_ON_ONCE(x) (x)
+
+static inline int lockdep_warn(int condition)
+{
+ return condition;
+}
+#define WARN_ON(x) lockdep_warn(x)
+#define WARN_ON_ONCE(x) WARN_ON(x)
+#define WARN(x, y...) WARN_ON(x)
+
#define likely(x) (x)
-#define WARN(x, y...) (x)
#define uninitialized_var(x) x
#define __init
#define noinline
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h
index d302142..d107903 100644
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
+++ b/tools/lib/lockdep/uinclude/linux/lockdep.h
@@ -29,7 +29,11 @@ extern struct task_struct *__curr(void);
#define current (__curr())
-#define debug_locks_off() 1
+static inline int debug_locks_off(void)
+{
+ return 1;
+}
+
#define task_pid_nr(tsk) ((tsk)->pid)
#define KSYM_NAME_LEN 128
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 06/21] liblockdep: Fix 'set but not used' warnings
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (4 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 05/21] liblockdep: Fix 'unused value' warnings Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:04 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 07/21] liblockdep: Fix 'defined but not used' warning for init_utsname() Levin, Alexander (Sasha Levin)
` (15 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
From: Ben Hutchings <ben@decadent.org.uk>
liblockdep defines trivial macros for working with interrupt flags, as
interrupts are never disabled in userland. This results in warnings
from gcc when -Wunused-but-set-variable is enabled, and it is enabled
by -Wall. Fix this by evaluating the flags parameter and casting it to
void.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
---
tools/lib/lockdep/uinclude/linux/irqflags.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/lib/lockdep/uinclude/linux/irqflags.h b/tools/lib/lockdep/uinclude/linux/irqflags.h
index 6cc296f0fad0..df77669cfe1c 100644
--- a/tools/lib/lockdep/uinclude/linux/irqflags.h
+++ b/tools/lib/lockdep/uinclude/linux/irqflags.h
@@ -17,19 +17,19 @@
#define raw_local_irq_disable() do { } while (0)
#define raw_local_irq_enable() do { } while (0)
#define raw_local_irq_save(flags) ((flags) = 0)
-#define raw_local_irq_restore(flags) do { } while (0)
+#define raw_local_irq_restore(flags) ((void)(flags))
#define raw_local_save_flags(flags) ((flags) = 0)
-#define raw_irqs_disabled_flags(flags) do { } while (0)
+#define raw_irqs_disabled_flags(flags) ((void)(flags))
#define raw_irqs_disabled() 0
#define raw_safe_halt()
#define local_irq_enable() do { } while (0)
#define local_irq_disable() do { } while (0)
#define local_irq_save(flags) ((flags) = 0)
-#define local_irq_restore(flags) do { } while (0)
+#define local_irq_restore(flags) ((void)(flags))
#define local_save_flags(flags) ((flags) = 0)
#define irqs_disabled() (1)
-#define irqs_disabled_flags(flags) (0)
+#define irqs_disabled_flags(flags) ((void)(flags), 0)
#define safe_halt() do { } while (0)
#define trace_lock_release(x, y)
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/lib/lockdep: Fix 'set but not used' warnings
2017-05-25 12:58 ` [PATCH 06/21] liblockdep: Fix 'set but not used' warnings Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:04 ` tip-bot for Ben Hutchings
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Ben Hutchings @ 2017-06-05 9:04 UTC (permalink / raw)
To: linux-tip-commits
Cc: peterz, sasha.levin, ben, hpa, linux-kernel, mingo, torvalds, tglx
Commit-ID: b016d870cadae31d7c5eb2eef794d2e733f6595c
Gitweb: http://git.kernel.org/tip/b016d870cadae31d7c5eb2eef794d2e733f6595c
Author: Ben Hutchings <ben@decadent.org.uk>
AuthorDate: Thu, 25 May 2017 12:58:38 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:06 +0200
tools/lib/lockdep: Fix 'set but not used' warnings
liblockdep defines trivial macros for working with interrupt flags, as
interrupts are never disabled in userland. This results in warnings
from gcc when -Wunused-but-set-variable is enabled, and it is enabled
by -Wall. Fix this by evaluating the flags parameter and casting it to
void.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: a.p.zijlstra@chello.nl
Link: http://lkml.kernel.org/r/20170525130005.5947-7-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/uinclude/linux/irqflags.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/lib/lockdep/uinclude/linux/irqflags.h b/tools/lib/lockdep/uinclude/linux/irqflags.h
index 6cc296f..df77669 100644
--- a/tools/lib/lockdep/uinclude/linux/irqflags.h
+++ b/tools/lib/lockdep/uinclude/linux/irqflags.h
@@ -17,19 +17,19 @@
#define raw_local_irq_disable() do { } while (0)
#define raw_local_irq_enable() do { } while (0)
#define raw_local_irq_save(flags) ((flags) = 0)
-#define raw_local_irq_restore(flags) do { } while (0)
+#define raw_local_irq_restore(flags) ((void)(flags))
#define raw_local_save_flags(flags) ((flags) = 0)
-#define raw_irqs_disabled_flags(flags) do { } while (0)
+#define raw_irqs_disabled_flags(flags) ((void)(flags))
#define raw_irqs_disabled() 0
#define raw_safe_halt()
#define local_irq_enable() do { } while (0)
#define local_irq_disable() do { } while (0)
#define local_irq_save(flags) ((flags) = 0)
-#define local_irq_restore(flags) do { } while (0)
+#define local_irq_restore(flags) ((void)(flags))
#define local_save_flags(flags) ((flags) = 0)
#define irqs_disabled() (1)
-#define irqs_disabled_flags(flags) (0)
+#define irqs_disabled_flags(flags) ((void)(flags), 0)
#define safe_halt() do { } while (0)
#define trace_lock_release(x, y)
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 07/21] liblockdep: Fix 'defined but not used' warning for init_utsname()
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (5 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 06/21] liblockdep: Fix 'set but not used' warnings Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:04 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 08/21] liblockdep: Remove -lpthread compiler option Levin, Alexander (Sasha Levin)
` (14 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
From: Ben Hutchings <ben@decadent.org.uk>
We define init_utsname() as static but not inline, resulting
in a warning for every source file that includes lockdep.h but
doesn't call it.
Since it is only used by lockdep.c, define it in there.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
---
tools/lib/lockdep/lockdep.c | 10 ++++++++++
tools/lib/lockdep/uinclude/linux/lockdep.h | 10 ----------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tools/lib/lockdep/lockdep.c b/tools/lib/lockdep/lockdep.c
index 443acb11f907..209f967dedaa 100644
--- a/tools/lib/lockdep/lockdep.c
+++ b/tools/lib/lockdep/lockdep.c
@@ -12,4 +12,14 @@ u32 prandom_u32(void)
abort();
}
+static struct new_utsname *init_utsname(void)
+{
+ static struct new_utsname n = (struct new_utsname) {
+ .release = "liblockdep",
+ .version = LIBLOCKDEP_VERSION,
+ };
+
+ return &n;
+}
+
#include "../../../kernel/locking/lockdep.c"
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h
index d1079034a14d..c157242e0417 100644
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
+++ b/tools/lib/lockdep/uinclude/linux/lockdep.h
@@ -44,16 +44,6 @@ static inline int debug_locks_off(void)
#define atomic_t unsigned long
#define atomic_inc(x) ((*(x))++)
-static struct new_utsname *init_utsname(void)
-{
- static struct new_utsname n = (struct new_utsname) {
- .release = "liblockdep",
- .version = LIBLOCKDEP_VERSION,
- };
-
- return &n;
-}
-
#define print_tainted() ""
#define static_obj(x) 1
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/lib/lockdep: Fix 'defined but not used' warning for init_utsname()
2017-05-25 12:58 ` [PATCH 07/21] liblockdep: Fix 'defined but not used' warning for init_utsname() Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:04 ` tip-bot for Ben Hutchings
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Ben Hutchings @ 2017-06-05 9:04 UTC (permalink / raw)
To: linux-tip-commits
Cc: tglx, hpa, ben, peterz, linux-kernel, mingo, sasha.levin, torvalds
Commit-ID: 1baa75406ecc2d77c9e6ecf45a707838a5bf7f29
Gitweb: http://git.kernel.org/tip/1baa75406ecc2d77c9e6ecf45a707838a5bf7f29
Author: Ben Hutchings <ben@decadent.org.uk>
AuthorDate: Thu, 25 May 2017 12:58:39 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:06 +0200
tools/lib/lockdep: Fix 'defined but not used' warning for init_utsname()
We define init_utsname() as static but not inline, resulting
in a warning for every source file that includes lockdep.h but
doesn't call it.
Since it is only used by lockdep.c, define it in there.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: a.p.zijlstra@chello.nl
Link: http://lkml.kernel.org/r/20170525130005.5947-8-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/lockdep.c | 10 ++++++++++
tools/lib/lockdep/uinclude/linux/lockdep.h | 10 ----------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tools/lib/lockdep/lockdep.c b/tools/lib/lockdep/lockdep.c
index 443acb1..209f967 100644
--- a/tools/lib/lockdep/lockdep.c
+++ b/tools/lib/lockdep/lockdep.c
@@ -12,4 +12,14 @@ u32 prandom_u32(void)
abort();
}
+static struct new_utsname *init_utsname(void)
+{
+ static struct new_utsname n = (struct new_utsname) {
+ .release = "liblockdep",
+ .version = LIBLOCKDEP_VERSION,
+ };
+
+ return &n;
+}
+
#include "../../../kernel/locking/lockdep.c"
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h
index d107903..c157242 100644
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
+++ b/tools/lib/lockdep/uinclude/linux/lockdep.h
@@ -44,16 +44,6 @@ static inline int debug_locks_off(void)
#define atomic_t unsigned long
#define atomic_inc(x) ((*(x))++)
-static struct new_utsname *init_utsname(void)
-{
- static struct new_utsname n = (struct new_utsname) {
- .release = "liblockdep",
- .version = LIBLOCKDEP_VERSION,
- };
-
- return &n;
-}
-
#define print_tainted() ""
#define static_obj(x) 1
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 08/21] liblockdep: Remove -lpthread compiler option
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (6 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 07/21] liblockdep: Fix 'defined but not used' warning for init_utsname() Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:05 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Vishal Thanki
2017-05-25 12:58 ` [PATCH 09/21] MAINTAINERS: update email for Sasha Levin Levin, Alexander (Sasha Levin)
` (13 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
From: Vishal Thanki <vishalthanki@gmail.com>
With -lpthread option, the test for ABBA_2threads was
failing, and test passed if it was removed.
Since -pthread compiler option is sufficient for linking
to pthread libraries, this patch removes -lpthread.
Signed-off-by: Vishal Thanki <vishalthanki@gmail.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
---
tools/lib/lockdep/run_tests.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/lib/lockdep/run_tests.sh b/tools/lib/lockdep/run_tests.sh
index 1069d96248c1..3fd297bd5fcb 100755
--- a/tools/lib/lockdep/run_tests.sh
+++ b/tools/lib/lockdep/run_tests.sh
@@ -4,7 +4,7 @@ make &> /dev/null
for i in `ls tests/*.c`; do
testname=$(basename "$i" .c)
- gcc -o tests/$testname -pthread -lpthread $i liblockdep.a -Iinclude -D__USE_LIBLOCKDEP &> /dev/null
+ gcc -o tests/$testname -pthread $i liblockdep.a -Iinclude -D__USE_LIBLOCKDEP &> /dev/null
echo -ne "$testname... "
if [ $(timeout 1 ./tests/$testname | wc -l) -gt 0 ]; then
echo "PASSED!"
@@ -18,7 +18,7 @@ done
for i in `ls tests/*.c`; do
testname=$(basename "$i" .c)
- gcc -o tests/$testname -pthread -lpthread -Iinclude $i &> /dev/null
+ gcc -o tests/$testname -pthread -Iinclude $i &> /dev/null
echo -ne "(PRELOAD) $testname... "
if [ $(timeout 1 ./lockdep ./tests/$testname | wc -l) -gt 0 ]; then
echo "PASSED!"
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/lib/lockdep: Remove -lpthread compiler option
2017-05-25 12:58 ` [PATCH 08/21] liblockdep: Remove -lpthread compiler option Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:05 ` tip-bot for Vishal Thanki
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Vishal Thanki @ 2017-06-05 9:05 UTC (permalink / raw)
To: linux-tip-commits
Cc: hpa, torvalds, linux-kernel, vishalthanki, sasha.levin, tglx,
mingo, peterz
Commit-ID: a9b94d283caa55e9d292a29b431940482a433cb3
Gitweb: http://git.kernel.org/tip/a9b94d283caa55e9d292a29b431940482a433cb3
Author: Vishal Thanki <vishalthanki@gmail.com>
AuthorDate: Thu, 25 May 2017 12:58:41 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:07 +0200
tools/lib/lockdep: Remove -lpthread compiler option
With -lpthread option, the test for ABBA_2threads was
failing, and test passed if it was removed.
Since -pthread compiler option is sufficient for linking
to pthread libraries, this patch removes -lpthread.
Signed-off-by: Vishal Thanki <vishalthanki@gmail.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
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-9-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/run_tests.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/lib/lockdep/run_tests.sh b/tools/lib/lockdep/run_tests.sh
index 1069d96..3fd297b 100755
--- a/tools/lib/lockdep/run_tests.sh
+++ b/tools/lib/lockdep/run_tests.sh
@@ -4,7 +4,7 @@ make &> /dev/null
for i in `ls tests/*.c`; do
testname=$(basename "$i" .c)
- gcc -o tests/$testname -pthread -lpthread $i liblockdep.a -Iinclude -D__USE_LIBLOCKDEP &> /dev/null
+ gcc -o tests/$testname -pthread $i liblockdep.a -Iinclude -D__USE_LIBLOCKDEP &> /dev/null
echo -ne "$testname... "
if [ $(timeout 1 ./tests/$testname | wc -l) -gt 0 ]; then
echo "PASSED!"
@@ -18,7 +18,7 @@ done
for i in `ls tests/*.c`; do
testname=$(basename "$i" .c)
- gcc -o tests/$testname -pthread -lpthread -Iinclude $i &> /dev/null
+ gcc -o tests/$testname -pthread -Iinclude $i &> /dev/null
echo -ne "(PRELOAD) $testname... "
if [ $(timeout 1 ./lockdep ./tests/$testname | wc -l) -gt 0 ]; then
echo "PASSED!"
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 09/21] MAINTAINERS: update email for Sasha Levin
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (7 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 08/21] liblockdep: Remove -lpthread compiler option Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:05 ` [tip:locking/core] MAINTAINERS: Update " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 10/21] tools: add install make target for liblockdep Levin, Alexander (Sasha Levin)
` (12 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
New position, new email address.
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
MAINTAINERS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 9e984645c4b0..6c87247c59f1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7556,7 +7556,7 @@ S: Maintained
F: drivers/ata/sata_promise.*
LIBLOCKDEP
-M: Sasha Levin <sasha.levin@oracle.com>
+M: Sasha Levin <alexander.levin@verizon.com>
S: Maintained
F: tools/lib/lockdep/
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] MAINTAINERS: Update email for Sasha Levin
2017-05-25 12:58 ` [PATCH 09/21] MAINTAINERS: update email for Sasha Levin Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:05 ` tip-bot for Levin, Alexander (Sasha Levin)
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Levin, Alexander (Sasha Levin) @ 2017-06-05 9:05 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, tglx, alexander.levin, peterz, torvalds, mingo
Commit-ID: 8a0d404ec5ea5ee7cd3a8a4668f5d6f8e52cf1d8
Gitweb: http://git.kernel.org/tip/8a0d404ec5ea5ee7cd3a8a4668f5d6f8e52cf1d8
Author: Levin, Alexander (Sasha Levin) <alexander.levin@verizon.com>
AuthorDate: Thu, 25 May 2017 12:58:42 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:07 +0200
MAINTAINERS: Update email for Sasha Levin
New position, new email address.
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
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-10-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
MAINTAINERS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 7a28acd..0fa9401 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7556,7 +7556,7 @@ S: Maintained
F: drivers/ata/sata_promise.*
LIBLOCKDEP
-M: Sasha Levin <sasha.levin@oracle.com>
+M: Sasha Levin <alexander.levin@verizon.com>
S: Maintained
F: tools/lib/lockdep/
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 10/21] tools: add install make target for liblockdep
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (8 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 09/21] MAINTAINERS: update email for Sasha Levin Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:06 ` [tip:locking/core] tools: Add " tip-bot for Alexander Sverdlin
2017-05-25 12:58 ` [PATCH 11/21] tools: liblockdep: Don't mix fd-based and stream IO Levin, Alexander (Sasha Levin)
` (11 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
From: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Allow user to call "liblockdep_install" target. Also add liblockdep to "all"
and "install" targets (as "help" command suggests).
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
tools/Makefile | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tools/Makefile b/tools/Makefile
index c8a90d01dd8e..221e1ce78b06 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -19,6 +19,7 @@ help:
@echo ' kvm_stat - top-like utility for displaying kvm statistics'
@echo ' leds - LEDs tools'
@echo ' lguest - a minimal 32-bit x86 hypervisor'
+ @echo ' liblockdep - user-space wrapper for kernel locking-validator'
@echo ' net - misc networking tools'
@echo ' perf - Linux performance measurement and analysis tool'
@echo ' selftests - various kernel selftests'
@@ -89,7 +90,7 @@ freefall: FORCE
kvm_stat: FORCE
$(call descend,kvm/$@)
-all: acpi cgroup cpupower gpio hv firewire lguest \
+all: acpi cgroup cpupower gpio hv firewire lguest liblockdep \
perf selftests turbostat usb \
virtio vm net x86_energy_perf_policy \
tmon freefall objtool kvm_stat
@@ -103,6 +104,9 @@ cpupower_install:
cgroup_install firewire_install gpio_install hv_install lguest_install perf_install usb_install virtio_install vm_install net_install objtool_install:
$(call descend,$(@:_install=),install)
+liblockdep_install:
+ $(call descend,lib/lockdep,install)
+
selftests_install:
$(call descend,testing/$(@:_install=),install)
@@ -119,7 +123,7 @@ kvm_stat_install:
$(call descend,kvm/$(@:_install=),install)
install: acpi_install cgroup_install cpupower_install gpio_install \
- hv_install firewire_install lguest_install \
+ hv_install firewire_install lguest_install liblockdep_install \
perf_install selftests_install turbostat_install usb_install \
virtio_install vm_install net_install x86_energy_perf_policy_install \
tmon_install freefall_install objtool_install kvm_stat_install
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools: Add install make target for liblockdep
2017-05-25 12:58 ` [PATCH 10/21] tools: add install make target for liblockdep Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:06 ` tip-bot for Alexander Sverdlin
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Alexander Sverdlin @ 2017-06-05 9:06 UTC (permalink / raw)
To: linux-tip-commits
Cc: acme, hpa, linux-kernel, mingo, torvalds, peterz, tglx,
linus.walleij, alexander.sverdlin, alexander.levin
Commit-ID: 24b4d0a1f952355566c0428aba4065a5c3a6ed2c
Gitweb: http://git.kernel.org/tip/24b4d0a1f952355566c0428aba4065a5c3a6ed2c
Author: Alexander Sverdlin <alexander.sverdlin@gmail.com>
AuthorDate: Thu, 25 May 2017 12:58:44 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:08 +0200
tools: Add install make target for liblockdep
Allow user to call "liblockdep_install" target. Also add liblockdep to "all"
and "install" targets (as "help" command suggests).
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
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-11-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/Makefile | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tools/Makefile b/tools/Makefile
index c8a90d0..221e1ce 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -19,6 +19,7 @@ help:
@echo ' kvm_stat - top-like utility for displaying kvm statistics'
@echo ' leds - LEDs tools'
@echo ' lguest - a minimal 32-bit x86 hypervisor'
+ @echo ' liblockdep - user-space wrapper for kernel locking-validator'
@echo ' net - misc networking tools'
@echo ' perf - Linux performance measurement and analysis tool'
@echo ' selftests - various kernel selftests'
@@ -89,7 +90,7 @@ freefall: FORCE
kvm_stat: FORCE
$(call descend,kvm/$@)
-all: acpi cgroup cpupower gpio hv firewire lguest \
+all: acpi cgroup cpupower gpio hv firewire lguest liblockdep \
perf selftests turbostat usb \
virtio vm net x86_energy_perf_policy \
tmon freefall objtool kvm_stat
@@ -103,6 +104,9 @@ cpupower_install:
cgroup_install firewire_install gpio_install hv_install lguest_install perf_install usb_install virtio_install vm_install net_install objtool_install:
$(call descend,$(@:_install=),install)
+liblockdep_install:
+ $(call descend,lib/lockdep,install)
+
selftests_install:
$(call descend,testing/$(@:_install=),install)
@@ -119,7 +123,7 @@ kvm_stat_install:
$(call descend,kvm/$(@:_install=),install)
install: acpi_install cgroup_install cpupower_install gpio_install \
- hv_install firewire_install lguest_install \
+ hv_install firewire_install lguest_install liblockdep_install \
perf_install selftests_install turbostat_install usb_install \
virtio_install vm_install net_install x86_energy_perf_policy_install \
tmon_install freefall_install objtool_install kvm_stat_install
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 11/21] tools: liblockdep: Don't mix fd-based and stream IO
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (9 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 10/21] tools: add install make target for liblockdep Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:06 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Alexander Sverdlin
2017-05-25 12:58 ` [PATCH 12/21] tools: liblockdep: fix compilation for 4.11 Levin, Alexander (Sasha Levin)
` (10 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
From: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Mixing fd-based and stream-base IO results in interleaved output like
following:
=====================================
[ BUG: bad unlock balance detected! ]
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:
=====================================
[ BUG: bad unlock balance detected! ]
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().
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Cc: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
tools/lib/lockdep/preload.c | 3 ++-
tools/lib/lockdep/uinclude/linux/kallsyms.h | 3 ++-
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 @@
#include <dlfcn.h>
#include <stdlib.h>
#include <sysexits.h>
+#include <unistd.h>
#include "include/liblockdep/mutex.h"
#include "../../include/linux/rbtree.h"
@@ -149,7 +150,7 @@ static struct lock_lookup *alloc_lock(void)
int idx = __locks_nr++;
if (idx >= ARRAY_SIZE(__locks)) {
- fprintf(stderr,
+ dprintf(STDERR_FILENO,
"LOCKDEP error: insufficient LIBLOCKDEP_STATIC_ENTRIES\n");
exit(EX_UNAVAILABLE);
}
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 @@
#include <linux/kernel.h>
#include <stdio.h>
+#include <unistd.h>
#define KSYM_NAME_LEN 128
@@ -24,7 +25,7 @@ static inline void print_ip_sym(unsigned long ip)
name = backtrace_symbols((void **)&ip, 1);
- printf("%s\n", *name);
+ dprintf(STDOUT_FILENO, "%s\n", *name);
free(name);
}
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 @@
#include <limits.h>
#include <linux/utsname.h>
#include <linux/compiler.h>
+#include <unistd.h>
#define MAX_LOCK_DEPTH 63UL
@@ -37,7 +38,7 @@ static inline int debug_locks_off(void)
#define task_pid_nr(tsk) ((tsk)->pid)
#define KSYM_NAME_LEN 128
-#define printk printf
+#define printk(...) dprintf(STDOUT_FILENO, __VA_ARGS__)
#define list_del_rcu list_del
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/lib/lockdep: Don't mix fd-based and stream IO
2017-05-25 12:58 ` [PATCH 11/21] tools: liblockdep: Don't mix fd-based and stream IO Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:06 ` tip-bot for Alexander Sverdlin
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Alexander Sverdlin @ 2017-06-05 9:06 UTC (permalink / raw)
To: linux-tip-commits
Cc: alexander.sverdlin, alexander.levin, hpa, mingo, sasha.levin,
linux-kernel, peterz, tglx, torvalds
Commit-ID: 20fb654aef1c929f7befb40678e2cb65a77ead7f
Gitweb: http://git.kernel.org/tip/20fb654aef1c929f7befb40678e2cb65a77ead7f
Author: Alexander Sverdlin <alexander.sverdlin@gmail.com>
AuthorDate: Thu, 25 May 2017 12:58:46 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:08 +0200
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>
---
tools/lib/lockdep/preload.c | 3 ++-
tools/lib/lockdep/uinclude/linux/kallsyms.h | 3 ++-
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 5284484..226aa26 100644
--- a/tools/lib/lockdep/preload.c
+++ b/tools/lib/lockdep/preload.c
@@ -4,6 +4,7 @@
#include <dlfcn.h>
#include <stdlib.h>
#include <sysexits.h>
+#include <unistd.h>
#include "include/liblockdep/mutex.h"
#include "../../include/linux/rbtree.h"
@@ -149,7 +150,7 @@ static struct lock_lookup *alloc_lock(void)
int idx = __locks_nr++;
if (idx >= ARRAY_SIZE(__locks)) {
- fprintf(stderr,
+ dprintf(STDERR_FILENO,
"LOCKDEP error: insufficient LIBLOCKDEP_STATIC_ENTRIES\n");
exit(EX_UNAVAILABLE);
}
diff --git a/tools/lib/lockdep/uinclude/linux/kallsyms.h b/tools/lib/lockdep/uinclude/linux/kallsyms.h
index b0f2dbd..582cc1e 100644
--- a/tools/lib/lockdep/uinclude/linux/kallsyms.h
+++ b/tools/lib/lockdep/uinclude/linux/kallsyms.h
@@ -3,6 +3,7 @@
#include <linux/kernel.h>
#include <stdio.h>
+#include <unistd.h>
#define KSYM_NAME_LEN 128
@@ -24,7 +25,7 @@ static inline void print_ip_sym(unsigned long ip)
name = backtrace_symbols((void **)&ip, 1);
- printf("%s\n", *name);
+ dprintf(STDOUT_FILENO, "%s\n", *name);
free(name);
}
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h
index c157242..d988fba 100644
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
+++ b/tools/lib/lockdep/uinclude/linux/lockdep.h
@@ -7,6 +7,7 @@
#include <limits.h>
#include <linux/utsname.h>
#include <linux/compiler.h>
+#include <unistd.h>
#define MAX_LOCK_DEPTH 63UL
@@ -37,7 +38,7 @@ static inline int debug_locks_off(void)
#define task_pid_nr(tsk) ((tsk)->pid)
#define KSYM_NAME_LEN 128
-#define printk printf
+#define printk(...) dprintf(STDOUT_FILENO, __VA_ARGS__)
#define list_del_rcu list_del
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 12/21] tools: liblockdep: fix compilation for 4.11
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (10 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 11/21] tools: liblockdep: Don't mix fd-based and stream IO Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:07 ` [tip:locking/core] tools/lib/lockdep: Fix " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 13/21] tools: liblockdep: Fix object file paths used in an out-of-tree build Levin, Alexander (Sasha Levin)
` (9 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
- More rcu stubs
- New dummy headers due to sched header split
- jhash2 included in due to kernel lockdep inclusion and usage
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
tools/include/linux/bitops.h | 10 ++
tools/include/linux/jhash.h | 175 ++++++++++++++++++++++++++
tools/include/linux/sched/clock.h | 0
tools/include/linux/sched/task.h | 0
tools/include/linux/unaligned/packed_struct.h | 46 +++++++
tools/lib/lockdep/uinclude/linux/bitops.h | 3 -
tools/lib/lockdep/uinclude/linux/compiler.h | 2 +
tools/lib/lockdep/uinclude/linux/kernel.h | 2 +
tools/lib/lockdep/uinclude/linux/rcu.h | 2 +
9 files changed, 237 insertions(+), 3 deletions(-)
create mode 100644 tools/include/linux/jhash.h
create mode 100644 tools/include/linux/sched/clock.h
create mode 100644 tools/include/linux/sched/task.h
create mode 100644 tools/include/linux/unaligned/packed_struct.h
delete mode 100644 tools/lib/lockdep/uinclude/linux/bitops.h
diff --git a/tools/include/linux/bitops.h b/tools/include/linux/bitops.h
index 1aecad369af5..969db1981868 100644
--- a/tools/include/linux/bitops.h
+++ b/tools/include/linux/bitops.h
@@ -61,4 +61,14 @@ static inline unsigned fls_long(unsigned long l)
return fls64(l);
}
+/**
+ * rol32 - rotate a 32-bit value left
+ * @word: value to rotate
+ * @shift: bits to roll
+ */
+static inline __u32 rol32(__u32 word, unsigned int shift)
+{
+ return (word << shift) | (word >> ((-shift) & 31));
+}
+
#endif
diff --git a/tools/include/linux/jhash.h b/tools/include/linux/jhash.h
new file mode 100644
index 000000000000..348c6f47e4cc
--- /dev/null
+++ b/tools/include/linux/jhash.h
@@ -0,0 +1,175 @@
+#ifndef _LINUX_JHASH_H
+#define _LINUX_JHASH_H
+
+/* jhash.h: Jenkins hash support.
+ *
+ * Copyright (C) 2006. Bob Jenkins (bob_jenkins@burtleburtle.net)
+ *
+ * http://burtleburtle.net/bob/hash/
+ *
+ * These are the credits from Bob's sources:
+ *
+ * lookup3.c, by Bob Jenkins, May 2006, Public Domain.
+ *
+ * These are functions for producing 32-bit hashes for hash table lookup.
+ * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final()
+ * are externally useful functions. Routines to test the hash are included
+ * if SELF_TEST is defined. You can use this free for any purpose. It's in
+ * the public domain. It has no warranty.
+ *
+ * Copyright (C) 2009-2010 Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
+ *
+ * I've modified Bob's hash to be useful in the Linux kernel, and
+ * any bugs present are my fault.
+ * Jozsef
+ */
+#include <linux/bitops.h>
+#include <linux/unaligned/packed_struct.h>
+
+/* Best hash sizes are of power of two */
+#define jhash_size(n) ((u32)1<<(n))
+/* Mask the hash value, i.e (value & jhash_mask(n)) instead of (value % n) */
+#define jhash_mask(n) (jhash_size(n)-1)
+
+/* __jhash_mix -- mix 3 32-bit values reversibly. */
+#define __jhash_mix(a, b, c) \
+{ \
+ a -= c; a ^= rol32(c, 4); c += b; \
+ b -= a; b ^= rol32(a, 6); a += c; \
+ c -= b; c ^= rol32(b, 8); b += a; \
+ a -= c; a ^= rol32(c, 16); c += b; \
+ b -= a; b ^= rol32(a, 19); a += c; \
+ c -= b; c ^= rol32(b, 4); b += a; \
+}
+
+/* __jhash_final - final mixing of 3 32-bit values (a,b,c) into c */
+#define __jhash_final(a, b, c) \
+{ \
+ c ^= b; c -= rol32(b, 14); \
+ a ^= c; a -= rol32(c, 11); \
+ b ^= a; b -= rol32(a, 25); \
+ c ^= b; c -= rol32(b, 16); \
+ a ^= c; a -= rol32(c, 4); \
+ b ^= a; b -= rol32(a, 14); \
+ c ^= b; c -= rol32(b, 24); \
+}
+
+/* An arbitrary initial parameter */
+#define JHASH_INITVAL 0xdeadbeef
+
+/* jhash - hash an arbitrary key
+ * @k: sequence of bytes as key
+ * @length: the length of the key
+ * @initval: the previous hash, or an arbitray value
+ *
+ * The generic version, hashes an arbitrary sequence of bytes.
+ * No alignment or length assumptions are made about the input key.
+ *
+ * Returns the hash value of the key. The result depends on endianness.
+ */
+static inline u32 jhash(const void *key, u32 length, u32 initval)
+{
+ u32 a, b, c;
+ const u8 *k = key;
+
+ /* Set up the internal state */
+ a = b = c = JHASH_INITVAL + length + initval;
+
+ /* All but the last block: affect some 32 bits of (a,b,c) */
+ while (length > 12) {
+ a += __get_unaligned_cpu32(k);
+ b += __get_unaligned_cpu32(k + 4);
+ c += __get_unaligned_cpu32(k + 8);
+ __jhash_mix(a, b, c);
+ length -= 12;
+ k += 12;
+ }
+ /* Last block: affect all 32 bits of (c) */
+ /* All the case statements fall through */
+ switch (length) {
+ case 12: c += (u32)k[11]<<24;
+ case 11: c += (u32)k[10]<<16;
+ case 10: c += (u32)k[9]<<8;
+ case 9: c += k[8];
+ case 8: b += (u32)k[7]<<24;
+ case 7: b += (u32)k[6]<<16;
+ case 6: b += (u32)k[5]<<8;
+ case 5: b += k[4];
+ case 4: a += (u32)k[3]<<24;
+ case 3: a += (u32)k[2]<<16;
+ case 2: a += (u32)k[1]<<8;
+ case 1: a += k[0];
+ __jhash_final(a, b, c);
+ case 0: /* Nothing left to add */
+ break;
+ }
+
+ return c;
+}
+
+/* jhash2 - hash an array of u32's
+ * @k: the key which must be an array of u32's
+ * @length: the number of u32's in the key
+ * @initval: the previous hash, or an arbitray value
+ *
+ * Returns the hash value of the key.
+ */
+static inline u32 jhash2(const u32 *k, u32 length, u32 initval)
+{
+ u32 a, b, c;
+
+ /* Set up the internal state */
+ a = b = c = JHASH_INITVAL + (length<<2) + initval;
+
+ /* Handle most of the key */
+ while (length > 3) {
+ a += k[0];
+ b += k[1];
+ c += k[2];
+ __jhash_mix(a, b, c);
+ length -= 3;
+ k += 3;
+ }
+
+ /* Handle the last 3 u32's: all the case statements fall through */
+ switch (length) {
+ case 3: c += k[2];
+ case 2: b += k[1];
+ case 1: a += k[0];
+ __jhash_final(a, b, c);
+ case 0: /* Nothing left to add */
+ break;
+ }
+
+ return c;
+}
+
+
+/* __jhash_nwords - hash exactly 3, 2 or 1 word(s) */
+static inline u32 __jhash_nwords(u32 a, u32 b, u32 c, u32 initval)
+{
+ a += initval;
+ b += initval;
+ c += initval;
+
+ __jhash_final(a, b, c);
+
+ return c;
+}
+
+static inline u32 jhash_3words(u32 a, u32 b, u32 c, u32 initval)
+{
+ return __jhash_nwords(a, b, c, initval + JHASH_INITVAL + (3 << 2));
+}
+
+static inline u32 jhash_2words(u32 a, u32 b, u32 initval)
+{
+ return __jhash_nwords(a, b, 0, initval + JHASH_INITVAL + (2 << 2));
+}
+
+static inline u32 jhash_1word(u32 a, u32 initval)
+{
+ return __jhash_nwords(a, 0, 0, initval + JHASH_INITVAL + (1 << 2));
+}
+
+#endif /* _LINUX_JHASH_H */
diff --git a/tools/include/linux/sched/clock.h b/tools/include/linux/sched/clock.h
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tools/include/linux/sched/task.h b/tools/include/linux/sched/task.h
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tools/include/linux/unaligned/packed_struct.h b/tools/include/linux/unaligned/packed_struct.h
new file mode 100644
index 000000000000..c0d817de4df2
--- /dev/null
+++ b/tools/include/linux/unaligned/packed_struct.h
@@ -0,0 +1,46 @@
+#ifndef _LINUX_UNALIGNED_PACKED_STRUCT_H
+#define _LINUX_UNALIGNED_PACKED_STRUCT_H
+
+#include <linux/kernel.h>
+
+struct __una_u16 { u16 x; } __packed;
+struct __una_u32 { u32 x; } __packed;
+struct __una_u64 { u64 x; } __packed;
+
+static inline u16 __get_unaligned_cpu16(const void *p)
+{
+ const struct __una_u16 *ptr = (const struct __una_u16 *)p;
+ return ptr->x;
+}
+
+static inline u32 __get_unaligned_cpu32(const void *p)
+{
+ const struct __una_u32 *ptr = (const struct __una_u32 *)p;
+ return ptr->x;
+}
+
+static inline u64 __get_unaligned_cpu64(const void *p)
+{
+ const struct __una_u64 *ptr = (const struct __una_u64 *)p;
+ return ptr->x;
+}
+
+static inline void __put_unaligned_cpu16(u16 val, void *p)
+{
+ struct __una_u16 *ptr = (struct __una_u16 *)p;
+ ptr->x = val;
+}
+
+static inline void __put_unaligned_cpu32(u32 val, void *p)
+{
+ struct __una_u32 *ptr = (struct __una_u32 *)p;
+ ptr->x = val;
+}
+
+static inline void __put_unaligned_cpu64(u64 val, void *p)
+{
+ struct __una_u64 *ptr = (struct __una_u64 *)p;
+ ptr->x = val;
+}
+
+#endif /* _LINUX_UNALIGNED_PACKED_STRUCT_H */
diff --git a/tools/lib/lockdep/uinclude/linux/bitops.h b/tools/lib/lockdep/uinclude/linux/bitops.h
deleted file mode 100644
index fab00ff936d1..000000000000
--- a/tools/lib/lockdep/uinclude/linux/bitops.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/compiler.h b/tools/lib/lockdep/uinclude/linux/compiler.h
index fd3e56a83fc2..fba5e022cee7 100644
--- a/tools/lib/lockdep/uinclude/linux/compiler.h
+++ b/tools/lib/lockdep/uinclude/linux/compiler.h
@@ -7,4 +7,6 @@
#define WRITE_ONCE(x, val) x=(val)
#define RCU_INIT_POINTER(p, v) p=(v)
+#define __packed __attribute__((packed))
+
#endif
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
index 021cff4f4e3d..faa98cc7971a 100644
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
@@ -52,4 +52,6 @@ static inline int lockdep_warn(int condition)
#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; })
#endif
+#define pr_err(format, ...) fprintf (stderr, format, ## __VA_ARGS__)
+
#endif
diff --git a/tools/lib/lockdep/uinclude/linux/rcu.h b/tools/lib/lockdep/uinclude/linux/rcu.h
index 042ee8e463c9..6f0332324a6d 100644
--- a/tools/lib/lockdep/uinclude/linux/rcu.h
+++ b/tools/lib/lockdep/uinclude/linux/rcu.h
@@ -18,4 +18,6 @@ static inline bool rcu_is_watching(void)
return false;
}
+#define rcu_assign_pointer(p, v) ((p) = (v))
+
#endif
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/lib/lockdep: Fix compilation for 4.11
2017-05-25 12:58 ` [PATCH 12/21] tools: liblockdep: fix compilation for 4.11 Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:07 ` tip-bot for Levin, Alexander (Sasha Levin)
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Levin, Alexander (Sasha Levin) @ 2017-06-05 9:07 UTC (permalink / raw)
To: linux-tip-commits
Cc: torvalds, peterz, alexander.levin, hpa, tglx, mingo, linux-kernel
Commit-ID: 6c8e6483850e7a7e44fd584790969c308887c468
Gitweb: http://git.kernel.org/tip/6c8e6483850e7a7e44fd584790969c308887c468
Author: Levin, Alexander (Sasha Levin) <alexander.levin@verizon.com>
AuthorDate: Thu, 25 May 2017 12:58:47 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:09 +0200
tools/lib/lockdep: Fix compilation for 4.11
- More rcu stubs
- New dummy headers due to sched header split
- jhash2 included in due to kernel lockdep inclusion and usage
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
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-13-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/include/linux/bitops.h | 10 ++++++++++
{include => tools/include}/linux/jhash.h | 0
{include => tools/include}/linux/unaligned/packed_struct.h | 0
tools/lib/lockdep/uinclude/linux/bitops.h | 3 ---
tools/lib/lockdep/uinclude/linux/compiler.h | 2 ++
tools/lib/lockdep/uinclude/linux/kernel.h | 2 ++
tools/lib/lockdep/uinclude/linux/rcu.h | 2 ++
7 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/tools/include/linux/bitops.h b/tools/include/linux/bitops.h
index 1aecad3..969db19 100644
--- a/tools/include/linux/bitops.h
+++ b/tools/include/linux/bitops.h
@@ -61,4 +61,14 @@ static inline unsigned fls_long(unsigned long l)
return fls64(l);
}
+/**
+ * rol32 - rotate a 32-bit value left
+ * @word: value to rotate
+ * @shift: bits to roll
+ */
+static inline __u32 rol32(__u32 word, unsigned int shift)
+{
+ return (word << shift) | (word >> ((-shift) & 31));
+}
+
#endif
diff --git a/include/linux/jhash.h b/tools/include/linux/jhash.h
similarity index 100%
copy from include/linux/jhash.h
copy to tools/include/linux/jhash.h
diff --git a/include/linux/unaligned/packed_struct.h b/tools/include/linux/unaligned/packed_struct.h
similarity index 100%
copy from include/linux/unaligned/packed_struct.h
copy to tools/include/linux/unaligned/packed_struct.h
diff --git a/tools/lib/lockdep/uinclude/linux/bitops.h b/tools/lib/lockdep/uinclude/linux/bitops.h
deleted file mode 100644
index fab00ff..0000000
--- a/tools/lib/lockdep/uinclude/linux/bitops.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* empty file */
-
diff --git a/tools/lib/lockdep/uinclude/linux/compiler.h b/tools/lib/lockdep/uinclude/linux/compiler.h
index fd3e56a..fba5e02 100644
--- a/tools/lib/lockdep/uinclude/linux/compiler.h
+++ b/tools/lib/lockdep/uinclude/linux/compiler.h
@@ -7,4 +7,6 @@
#define WRITE_ONCE(x, val) x=(val)
#define RCU_INIT_POINTER(p, v) p=(v)
+#define __packed __attribute__((packed))
+
#endif
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
index 021cff4..faa98cc 100644
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
@@ -52,4 +52,6 @@ static inline int lockdep_warn(int condition)
#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; })
#endif
+#define pr_err(format, ...) fprintf (stderr, format, ## __VA_ARGS__)
+
#endif
diff --git a/tools/lib/lockdep/uinclude/linux/rcu.h b/tools/lib/lockdep/uinclude/linux/rcu.h
index 042ee8e..6f03323 100644
--- a/tools/lib/lockdep/uinclude/linux/rcu.h
+++ b/tools/lib/lockdep/uinclude/linux/rcu.h
@@ -18,4 +18,6 @@ static inline bool rcu_is_watching(void)
return false;
}
+#define rcu_assign_pointer(p, v) ((p) = (v))
+
#endif
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 13/21] tools: liblockdep: Fix object file paths used in an out-of-tree build
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (11 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 12/21] tools: liblockdep: fix compilation for 4.11 Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:07 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 14/21] tools: liblockdep: Remove double-quotes from soname Levin, Alexander (Sasha Levin)
` (8 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
From: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
tools/lib/lockdep/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile
index 98d8a5ae8334..e5e64d6ad0a7 100644
--- a/tools/lib/lockdep/Makefile
+++ b/tools/lib/lockdep/Makefile
@@ -101,7 +101,7 @@ include $(srctree)/tools/build/Makefile.include
do_compile_shared_library = \
($(print_shared_lib_compile) \
- $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='"$@"';$(shell ln -sf $@ liblockdep.so))
+ $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='"$(@F)"';$(shell ln -sf $(@F) $(@D)/liblockdep.so))
do_build_static_lib = \
($(print_static_lib_build) \
@@ -119,10 +119,10 @@ all_cmd: $(CMD_TARGETS)
$(LIB_IN): force
$(Q)$(MAKE) $(build)=liblockdep
-liblockdep.so.$(LIBLOCKDEP_VERSION): $(LIB_IN)
+$(OUTPUT)liblockdep.so.$(LIBLOCKDEP_VERSION): $(LIB_IN)
$(Q)$(do_compile_shared_library)
-liblockdep.a: $(LIB_IN)
+$(OUTPUT)liblockdep.a: $(LIB_IN)
$(Q)$(do_build_static_lib)
tags: force
@@ -150,7 +150,7 @@ install_lib: all_cmd
install: install_lib
clean:
- $(RM) *.o *~ $(TARGETS) *.a *liblockdep*.so* $(VERSION_FILES) .*.d .*.cmd
+ $(RM) $(OUTPUT)*.o *~ $(TARGETS) $(OUTPUT)*.a $(OUTPUT)*liblockdep*.so* $(VERSION_FILES) $(OUTPUT).*.d $(OUTPUT).*.cmd
$(RM) tags TAGS
PHONY += force
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/lib/lockdep: Fix object file paths used in an out-of-tree build
2017-05-25 12:58 ` [PATCH 13/21] tools: liblockdep: Fix object file paths used in an out-of-tree build Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:07 ` tip-bot for Ben Hutchings
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Ben Hutchings @ 2017-06-05 9:07 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, alexander.levin, peterz, tglx, torvalds, ben
Commit-ID: ea59f30d6a30c4c0ef54d1e19ac70c35b6ef91b6
Gitweb: http://git.kernel.org/tip/ea59f30d6a30c4c0ef54d1e19ac70c35b6ef91b6
Author: Ben Hutchings <ben@decadent.org.uk>
AuthorDate: Thu, 25 May 2017 12:58:48 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:09 +0200
tools/lib/lockdep: Fix object file paths used in an out-of-tree build
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: a.p.zijlstra@chello.nl
Link: http://lkml.kernel.org/r/20170525130005.5947-14-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile
index 98d8a5ae..e5e64d6 100644
--- a/tools/lib/lockdep/Makefile
+++ b/tools/lib/lockdep/Makefile
@@ -101,7 +101,7 @@ include $(srctree)/tools/build/Makefile.include
do_compile_shared_library = \
($(print_shared_lib_compile) \
- $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='"$@"';$(shell ln -sf $@ liblockdep.so))
+ $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='"$(@F)"';$(shell ln -sf $(@F) $(@D)/liblockdep.so))
do_build_static_lib = \
($(print_static_lib_build) \
@@ -119,10 +119,10 @@ all_cmd: $(CMD_TARGETS)
$(LIB_IN): force
$(Q)$(MAKE) $(build)=liblockdep
-liblockdep.so.$(LIBLOCKDEP_VERSION): $(LIB_IN)
+$(OUTPUT)liblockdep.so.$(LIBLOCKDEP_VERSION): $(LIB_IN)
$(Q)$(do_compile_shared_library)
-liblockdep.a: $(LIB_IN)
+$(OUTPUT)liblockdep.a: $(LIB_IN)
$(Q)$(do_build_static_lib)
tags: force
@@ -150,7 +150,7 @@ install_lib: all_cmd
install: install_lib
clean:
- $(RM) *.o *~ $(TARGETS) *.a *liblockdep*.so* $(VERSION_FILES) .*.d .*.cmd
+ $(RM) $(OUTPUT)*.o *~ $(TARGETS) $(OUTPUT)*.a $(OUTPUT)*liblockdep*.so* $(VERSION_FILES) $(OUTPUT).*.d $(OUTPUT).*.cmd
$(RM) tags TAGS
PHONY += force
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 14/21] tools: liblockdep: Remove double-quotes from soname
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (12 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 13/21] tools: liblockdep: Fix object file paths used in an out-of-tree build Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:08 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 15/21] tools: liblockdep: Use LDFLAGS Levin, Alexander (Sasha Levin)
` (7 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
From: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
tools/lib/lockdep/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile
index e5e64d6ad0a7..ce21b9429314 100644
--- a/tools/lib/lockdep/Makefile
+++ b/tools/lib/lockdep/Makefile
@@ -101,7 +101,7 @@ include $(srctree)/tools/build/Makefile.include
do_compile_shared_library = \
($(print_shared_lib_compile) \
- $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='"$(@F)"';$(shell ln -sf $(@F) $(@D)/liblockdep.so))
+ $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='$(@F)';$(shell ln -sf $(@F) $(@D)/liblockdep.so))
do_build_static_lib = \
($(print_static_lib_build) \
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/lib/lockdep: Remove double-quotes from soname
2017-05-25 12:58 ` [PATCH 14/21] tools: liblockdep: Remove double-quotes from soname Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:08 ` tip-bot for Ben Hutchings
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Ben Hutchings @ 2017-06-05 9:08 UTC (permalink / raw)
To: linux-tip-commits
Cc: ben, mingo, alexander.levin, tglx, linux-kernel, hpa, torvalds, peterz
Commit-ID: e3addcc087d1ca398afbdefa3e671d580b026a71
Gitweb: http://git.kernel.org/tip/e3addcc087d1ca398afbdefa3e671d580b026a71
Author: Ben Hutchings <ben@decadent.org.uk>
AuthorDate: Thu, 25 May 2017 12:58:49 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:10 +0200
tools/lib/lockdep: Remove double-quotes from soname
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: a.p.zijlstra@chello.nl
Link: http://lkml.kernel.org/r/20170525130005.5947-15-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile
index e5e64d6..ce21b94 100644
--- a/tools/lib/lockdep/Makefile
+++ b/tools/lib/lockdep/Makefile
@@ -101,7 +101,7 @@ include $(srctree)/tools/build/Makefile.include
do_compile_shared_library = \
($(print_shared_lib_compile) \
- $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='"$(@F)"';$(shell ln -sf $(@F) $(@D)/liblockdep.so))
+ $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='$(@F)';$(shell ln -sf $(@F) $(@D)/liblockdep.so))
do_build_static_lib = \
($(print_static_lib_build) \
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 15/21] tools: liblockdep: Use LDFLAGS
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (13 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 14/21] tools: liblockdep: Remove double-quotes from soname Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:09 ` [tip:locking/core] tools/lib/lockdep: " tip-bot for Ben Hutchings
2017-05-25 12:58 ` [PATCH 16/21] tools include: add empty include/linux/sched/mm.h Levin, Alexander (Sasha Levin)
` (6 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
From: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
tools/lib/lockdep/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile
index ce21b9429314..ed9ace59d112 100644
--- a/tools/lib/lockdep/Makefile
+++ b/tools/lib/lockdep/Makefile
@@ -101,7 +101,7 @@ include $(srctree)/tools/build/Makefile.include
do_compile_shared_library = \
($(print_shared_lib_compile) \
- $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='$(@F)';$(shell ln -sf $(@F) $(@D)/liblockdep.so))
+ $(CC) $(LDFLAGS) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='$(@F)';$(shell ln -sf $(@F) $(@D)/liblockdep.so))
do_build_static_lib = \
($(print_static_lib_build) \
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/lib/lockdep: Use LDFLAGS
2017-05-25 12:58 ` [PATCH 15/21] tools: liblockdep: Use LDFLAGS Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:09 ` tip-bot for Ben Hutchings
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Ben Hutchings @ 2017-06-05 9:09 UTC (permalink / raw)
To: linux-tip-commits
Cc: torvalds, tglx, mingo, hpa, peterz, alexander.levin, ben, linux-kernel
Commit-ID: d8633a32f2a466e8f03f6f06dab237ff4a1e95f2
Gitweb: http://git.kernel.org/tip/d8633a32f2a466e8f03f6f06dab237ff4a1e95f2
Author: Ben Hutchings <ben@decadent.org.uk>
AuthorDate: Thu, 25 May 2017 12:58:51 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:10 +0200
tools/lib/lockdep: Use LDFLAGS
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: a.p.zijlstra@chello.nl
Link: http://lkml.kernel.org/r/20170525130005.5947-16-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile
index ce21b94..ed9ace5 100644
--- a/tools/lib/lockdep/Makefile
+++ b/tools/lib/lockdep/Makefile
@@ -101,7 +101,7 @@ include $(srctree)/tools/build/Makefile.include
do_compile_shared_library = \
($(print_shared_lib_compile) \
- $(CC) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='$(@F)';$(shell ln -sf $(@F) $(@D)/liblockdep.so))
+ $(CC) $(LDFLAGS) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='$(@F)';$(shell ln -sf $(@F) $(@D)/liblockdep.so))
do_build_static_lib = \
($(print_static_lib_build) \
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 16/21] tools include: add empty include/linux/sched/mm.h
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (14 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 15/21] tools: liblockdep: Use LDFLAGS Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:09 ` [tip:locking/core] tools/include: Add (mostly) " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 17/21] tools: liblockdep: include err.h Levin, Alexander (Sasha Levin)
` (5 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
Now required by liblockdep.
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
tools/include/linux/sched/mm.h | 0
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 tools/include/linux/sched/mm.h
diff --git a/tools/include/linux/sched/mm.h b/tools/include/linux/sched/mm.h
new file mode 100644
index 000000000000..e69de29bb2d1
--
2.11.0
^ permalink raw reply [flat|nested] 48+ messages in thread* [tip:locking/core] tools/include: Add (mostly) empty include/linux/sched/mm.h
2017-05-25 12:58 ` [PATCH 16/21] tools include: add empty include/linux/sched/mm.h Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:09 ` tip-bot for Levin, Alexander (Sasha Levin)
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Levin, Alexander (Sasha Levin) @ 2017-06-05 9:09 UTC (permalink / raw)
To: linux-tip-commits
Cc: peterz, tglx, torvalds, linux-kernel, hpa, mingo, alexander.levin
Commit-ID: 12d83f7361724e5aa4299bb28e4caadc62ae482b
Gitweb: http://git.kernel.org/tip/12d83f7361724e5aa4299bb28e4caadc62ae482b
Author: Levin, Alexander (Sasha Levin) <alexander.levin@verizon.com>
AuthorDate: Thu, 25 May 2017 12:58:52 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:11 +0200
tools/include: Add (mostly) empty include/linux/sched/mm.h
Now required by liblockdep.
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
[ Added header guard. ]
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
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-17-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/include/linux/sched/mm.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/include/linux/sched/mm.h b/tools/include/linux/sched/mm.h
new file mode 100644
index 0000000..c8d9f19
--- /dev/null
+++ b/tools/include/linux/sched/mm.h
@@ -0,0 +1,4 @@
+#ifndef _TOOLS_PERF_LINUX_SCHED_MM_H
+#define _TOOLS_PERF_LINUX_SCHED_MM_H
+
+#endif /* _TOOLS_PERF_LINUX_SCHED_MM_H */
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 17/21] tools: liblockdep: include err.h
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (15 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 16/21] tools include: add empty include/linux/sched/mm.h Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:10 ` [tip:locking/core] tools/lib/lockdep: Include err.h tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 18/21] tools: liblockdep: add empty __is_[module,kernel]_percpu_address Levin, Alexander (Sasha Levin)
` (4 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
This provides PTR_ERR() now used by lockdep.
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
tools/lib/lockdep/uinclude/linux/kernel.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
index faa98cc7971a..75ff4b1bbcac 100644
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
@@ -6,6 +6,7 @@
#include <linux/rcu.h>
#include <linux/hardirq.h>
#include <linux/kern_levels.h>
+#include <linux/err.h>
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/lib/lockdep: Include err.h
2017-05-25 12:58 ` [PATCH 17/21] tools: liblockdep: include err.h Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:10 ` tip-bot for Levin, Alexander (Sasha Levin)
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Levin, Alexander (Sasha Levin) @ 2017-06-05 9:10 UTC (permalink / raw)
To: linux-tip-commits
Cc: peterz, tglx, mingo, torvalds, hpa, linux-kernel, alexander.levin
Commit-ID: f9155dd8d9281adac4d8c95ca66f7db22cd292e1
Gitweb: http://git.kernel.org/tip/f9155dd8d9281adac4d8c95ca66f7db22cd292e1
Author: Levin, Alexander (Sasha Levin) <alexander.levin@verizon.com>
AuthorDate: Thu, 25 May 2017 12:58:53 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:11 +0200
tools/lib/lockdep: Include err.h
This provides PTR_ERR() now used by lockdep.
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
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-18-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/uinclude/linux/kernel.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
index faa98cc..75ff4b1 100644
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
@@ -6,6 +6,7 @@
#include <linux/rcu.h>
#include <linux/hardirq.h>
#include <linux/kern_levels.h>
+#include <linux/err.h>
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 18/21] tools: liblockdep: add empty __is_[module,kernel]_percpu_address
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (16 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 17/21] tools: liblockdep: include err.h Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:10 ` [tip:locking/core] tools/lib/lockdep: Add " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 19/21] tools include: add IS_ERR_OR_NULL to err.h Levin, Alexander (Sasha Levin)
` (3 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
This would fix the build error caused by:
383776fa7 ("locking/lockdep: Handle statically initialized
PER_CPU locks properly")
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
tools/lib/lockdep/uinclude/linux/lockdep.h | 5 +++++
tools/lib/lockdep/uinclude/linux/module.h | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h
index d988fba99454..f026d4545e97 100644
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
+++ b/tools/lib/lockdep/uinclude/linux/lockdep.h
@@ -51,4 +51,9 @@ static inline int debug_locks_off(void)
#define debug_show_all_locks()
extern void debug_check_no_locks_held(void);
+static __used bool __is_kernel_percpu_address(unsigned long addr, void *can_addr)
+{
+ return false;
+}
+
#endif
diff --git a/tools/lib/lockdep/uinclude/linux/module.h b/tools/lib/lockdep/uinclude/linux/module.h
index 09c7a7be8ccc..07055db296f3 100644
--- a/tools/lib/lockdep/uinclude/linux/module.h
+++ b/tools/lib/lockdep/uinclude/linux/module.h
@@ -3,4 +3,9 @@
#define module_param(name, type, perm)
+static inline bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr)
+{
+ return false;
+}
+
#endif
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/lib/lockdep: Add empty __is_[module,kernel]_percpu_address
2017-05-25 12:58 ` [PATCH 18/21] tools: liblockdep: add empty __is_[module,kernel]_percpu_address Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:10 ` tip-bot for Levin, Alexander (Sasha Levin)
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Levin, Alexander (Sasha Levin) @ 2017-06-05 9:10 UTC (permalink / raw)
To: linux-tip-commits
Cc: hpa, linux-kernel, alexander.levin, mingo, torvalds, tglx, peterz
Commit-ID: 3156cbaeda991f6b330dd8260d863bfad71b358e
Gitweb: http://git.kernel.org/tip/3156cbaeda991f6b330dd8260d863bfad71b358e
Author: Levin, Alexander (Sasha Levin) <alexander.levin@verizon.com>
AuthorDate: Thu, 25 May 2017 12:58:55 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:12 +0200
tools/lib/lockdep: Add empty __is_[module,kernel]_percpu_address
This would fix the build error caused by:
383776fa7 ("locking/lockdep: Handle statically initialized
PER_CPU locks properly")
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
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-19-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/uinclude/linux/lockdep.h | 5 +++++
tools/lib/lockdep/uinclude/linux/module.h | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/tools/lib/lockdep/uinclude/linux/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h
index d988fba..f026d45 100644
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
+++ b/tools/lib/lockdep/uinclude/linux/lockdep.h
@@ -51,4 +51,9 @@ static inline int debug_locks_off(void)
#define debug_show_all_locks()
extern void debug_check_no_locks_held(void);
+static __used bool __is_kernel_percpu_address(unsigned long addr, void *can_addr)
+{
+ return false;
+}
+
#endif
diff --git a/tools/lib/lockdep/uinclude/linux/module.h b/tools/lib/lockdep/uinclude/linux/module.h
index 09c7a7b..07055db 100644
--- a/tools/lib/lockdep/uinclude/linux/module.h
+++ b/tools/lib/lockdep/uinclude/linux/module.h
@@ -3,4 +3,9 @@
#define module_param(name, type, perm)
+static inline bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr)
+{
+ return false;
+}
+
#endif
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 19/21] tools include: add IS_ERR_OR_NULL to err.h
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (17 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 18/21] tools: liblockdep: add empty __is_[module,kernel]_percpu_address Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:11 ` [tip:locking/core] tools/include: Add " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 20/21] tools: liblockdep: add dummy current_gfp_context() Levin, Alexander (Sasha Levin)
` (2 subsequent siblings)
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
tools/include/linux/err.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/include/linux/err.h b/tools/include/linux/err.h
index bdc3dd8131d4..abf0478a8fb2 100644
--- a/tools/include/linux/err.h
+++ b/tools/include/linux/err.h
@@ -46,4 +46,9 @@ static inline bool __must_check IS_ERR(__force const void *ptr)
return IS_ERR_VALUE((unsigned long)ptr);
}
+static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr)
+{
+ return unlikely(!ptr) || IS_ERR_VALUE((unsigned long)ptr);
+}
+
#endif /* _LINUX_ERR_H */
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/include: Add IS_ERR_OR_NULL to err.h
2017-05-25 12:58 ` [PATCH 19/21] tools include: add IS_ERR_OR_NULL to err.h Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:11 ` tip-bot for Levin, Alexander (Sasha Levin)
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Levin, Alexander (Sasha Levin) @ 2017-06-05 9:11 UTC (permalink / raw)
To: linux-tip-commits
Cc: alexander.levin, tglx, torvalds, hpa, linux-kernel, peterz, mingo
Commit-ID: 61d4595eed163ea416c13c4b994f22190711151b
Gitweb: http://git.kernel.org/tip/61d4595eed163ea416c13c4b994f22190711151b
Author: Levin, Alexander (Sasha Levin) <alexander.levin@verizon.com>
AuthorDate: Thu, 25 May 2017 12:58:56 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:12 +0200
tools/include: Add IS_ERR_OR_NULL to err.h
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
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-20-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/include/linux/err.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/include/linux/err.h b/tools/include/linux/err.h
index bdc3dd8..abf0478 100644
--- a/tools/include/linux/err.h
+++ b/tools/include/linux/err.h
@@ -46,4 +46,9 @@ static inline bool __must_check IS_ERR(__force const void *ptr)
return IS_ERR_VALUE((unsigned long)ptr);
}
+static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr)
+{
+ return unlikely(!ptr) || IS_ERR_VALUE((unsigned long)ptr);
+}
+
#endif /* _LINUX_ERR_H */
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 20/21] tools: liblockdep: add dummy current_gfp_context()
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (18 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 19/21] tools include: add IS_ERR_OR_NULL to err.h Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:11 ` [tip:locking/core] tools/lib/lockdep: Add " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-25 12:58 ` [PATCH 21/21] tools: liblockdep: hide liblockdep output from test results Levin, Alexander (Sasha Levin)
2017-05-26 6:52 ` [PATCH 00/21] liblockdep fixes for v4.12 Ingo Molnar
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
tools/lib/lockdep/uinclude/linux/kernel.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
index 75ff4b1bbcac..4a31ebe1a377 100644
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
@@ -54,5 +54,8 @@ static inline int lockdep_warn(int condition)
#endif
#define pr_err(format, ...) fprintf (stderr, format, ## __VA_ARGS__)
+#define pr_warn pr_err
+
+#define current_gfp_context(k) 0
#endif
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/lib/lockdep: Add dummy current_gfp_context()
2017-05-25 12:58 ` [PATCH 20/21] tools: liblockdep: add dummy current_gfp_context() Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:11 ` tip-bot for Levin, Alexander (Sasha Levin)
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Levin, Alexander (Sasha Levin) @ 2017-06-05 9:11 UTC (permalink / raw)
To: linux-tip-commits
Cc: alexander.levin, peterz, linux-kernel, hpa, tglx, torvalds, mingo
Commit-ID: 3f5a3934f4165f7f59bf8383011ed559b8acce7e
Gitweb: http://git.kernel.org/tip/3f5a3934f4165f7f59bf8383011ed559b8acce7e
Author: Levin, Alexander (Sasha Levin) <alexander.levin@verizon.com>
AuthorDate: Thu, 25 May 2017 12:58:57 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:13 +0200
tools/lib/lockdep: Add dummy current_gfp_context()
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
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-21-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/uinclude/linux/kernel.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/lib/lockdep/uinclude/linux/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
index 75ff4b1..4a31ebe 100644
--- a/tools/lib/lockdep/uinclude/linux/kernel.h
+++ b/tools/lib/lockdep/uinclude/linux/kernel.h
@@ -54,5 +54,8 @@ static inline int lockdep_warn(int condition)
#endif
#define pr_err(format, ...) fprintf (stderr, format, ## __VA_ARGS__)
+#define pr_warn pr_err
+
+#define current_gfp_context(k) 0
#endif
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH 21/21] tools: liblockdep: hide liblockdep output from test results
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (19 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 20/21] tools: liblockdep: add dummy current_gfp_context() Levin, Alexander (Sasha Levin)
@ 2017-05-25 12:58 ` Levin, Alexander (Sasha Levin)
2017-06-05 9:12 ` [tip:locking/core] tools/lib/lockdep: Hide " tip-bot for Levin, Alexander (Sasha Levin)
2017-05-26 6:52 ` [PATCH 00/21] liblockdep fixes for v4.12 Ingo Molnar
21 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-25 12:58 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
This would prevent the liblockdep error messages from getting
mixed in with the test result output.
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
tools/lib/lockdep/run_tests.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/lib/lockdep/run_tests.sh b/tools/lib/lockdep/run_tests.sh
index 3fd297bd5fcb..f9b94098fc98 100755
--- a/tools/lib/lockdep/run_tests.sh
+++ b/tools/lib/lockdep/run_tests.sh
@@ -6,7 +6,7 @@ for i in `ls tests/*.c`; do
testname=$(basename "$i" .c)
gcc -o tests/$testname -pthread $i liblockdep.a -Iinclude -D__USE_LIBLOCKDEP &> /dev/null
echo -ne "$testname... "
- if [ $(timeout 1 ./tests/$testname | wc -l) -gt 0 ]; then
+ if [ $(timeout 1 ./tests/$testname 2>&1 | wc -l) -gt 0 ]; then
echo "PASSED!"
else
echo "FAILED!"
@@ -20,7 +20,7 @@ for i in `ls tests/*.c`; do
testname=$(basename "$i" .c)
gcc -o tests/$testname -pthread -Iinclude $i &> /dev/null
echo -ne "(PRELOAD) $testname... "
- if [ $(timeout 1 ./lockdep ./tests/$testname | wc -l) -gt 0 ]; then
+ if [ $(timeout 1 ./lockdep ./tests/$testname 2>&1 | wc -l) -gt 0 ]; then
echo "PASSED!"
else
echo "FAILED!"
--
2.11.0
^ permalink raw reply related [flat|nested] 48+ messages in thread* [tip:locking/core] tools/lib/lockdep: Hide liblockdep output from test results
2017-05-25 12:58 ` [PATCH 21/21] tools: liblockdep: hide liblockdep output from test results Levin, Alexander (Sasha Levin)
@ 2017-06-05 9:12 ` tip-bot for Levin, Alexander (Sasha Levin)
0 siblings, 0 replies; 48+ messages in thread
From: tip-bot for Levin, Alexander (Sasha Levin) @ 2017-06-05 9:12 UTC (permalink / raw)
To: linux-tip-commits
Cc: tglx, alexander.levin, mingo, peterz, linux-kernel, hpa, torvalds
Commit-ID: 4ea4b3c25752499a67c4a35cafd2d5535017faad
Gitweb: http://git.kernel.org/tip/4ea4b3c25752499a67c4a35cafd2d5535017faad
Author: Levin, Alexander (Sasha Levin) <alexander.levin@verizon.com>
AuthorDate: Thu, 25 May 2017 12:58:58 +0000
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 5 Jun 2017 09:28:13 +0200
tools/lib/lockdep: Hide liblockdep output from test results
This would prevent the liblockdep error messages from getting
mixed in with the test result output.
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
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-22-alexander.levin@verizon.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
tools/lib/lockdep/run_tests.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/lib/lockdep/run_tests.sh b/tools/lib/lockdep/run_tests.sh
index 3fd297b..f9b9409 100755
--- a/tools/lib/lockdep/run_tests.sh
+++ b/tools/lib/lockdep/run_tests.sh
@@ -6,7 +6,7 @@ for i in `ls tests/*.c`; do
testname=$(basename "$i" .c)
gcc -o tests/$testname -pthread $i liblockdep.a -Iinclude -D__USE_LIBLOCKDEP &> /dev/null
echo -ne "$testname... "
- if [ $(timeout 1 ./tests/$testname | wc -l) -gt 0 ]; then
+ if [ $(timeout 1 ./tests/$testname 2>&1 | wc -l) -gt 0 ]; then
echo "PASSED!"
else
echo "FAILED!"
@@ -20,7 +20,7 @@ for i in `ls tests/*.c`; do
testname=$(basename "$i" .c)
gcc -o tests/$testname -pthread -Iinclude $i &> /dev/null
echo -ne "(PRELOAD) $testname... "
- if [ $(timeout 1 ./lockdep ./tests/$testname | wc -l) -gt 0 ]; then
+ if [ $(timeout 1 ./lockdep ./tests/$testname 2>&1 | wc -l) -gt 0 ]; then
echo "PASSED!"
else
echo "FAILED!"
^ permalink raw reply related [flat|nested] 48+ messages in thread
* Re: [PATCH 00/21] liblockdep fixes for v4.12
2017-05-25 12:58 [PATCH 00/21] liblockdep fixes for v4.12 Levin, Alexander (Sasha Levin)
` (20 preceding siblings ...)
2017-05-25 12:58 ` [PATCH 21/21] tools: liblockdep: hide liblockdep output from test results Levin, Alexander (Sasha Levin)
@ 2017-05-26 6:52 ` Ingo Molnar
2017-05-26 10:57 ` Levin, Alexander (Sasha Levin)
21 siblings, 1 reply; 48+ messages in thread
From: Ingo Molnar @ 2017-05-26 6:52 UTC (permalink / raw)
To: Levin, Alexander (Sasha Levin); +Cc: linux-kernel, ben, a.p.zijlstra, tglx
* Levin, Alexander (Sasha Levin) <alexander.levin@verizon.com> wrote:
> MAINTAINERS | 2 +-
> tools/Makefile | 8 +++--
> tools/include/linux/bitops.h | 10 ++++++
> tools/include/linux/err.h | 5 +++
> tools/include/linux/jhash.h | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> tools/include/linux/sched/clock.h | 0
> tools/include/linux/sched/mm.h | 0
> tools/include/linux/sched/task.h | 0
> tools/include/linux/unaligned/packed_struct.h | 46 +++++++++++++++++++++++++++
> tools/lib/lockdep/Makefile | 9 +++---
> tools/lib/lockdep/lockdep.c | 17 ++++++++++
> tools/lib/lockdep/preload.c | 3 +-
> tools/lib/lockdep/run_tests.sh | 8 ++---
> tools/lib/lockdep/uinclude/linux/bitops.h | 3 --
> tools/lib/lockdep/uinclude/linux/compiler.h | 2 ++
> tools/lib/lockdep/uinclude/linux/debug_locks.h | 2 +-
> tools/lib/lockdep/uinclude/linux/irqflags.h | 8 ++---
> tools/lib/lockdep/uinclude/linux/kallsyms.h | 3 +-
> tools/lib/lockdep/uinclude/linux/kernel.h | 20 ++++++++++--
> tools/lib/lockdep/uinclude/linux/lockdep.h | 26 ++++++++--------
> tools/lib/lockdep/uinclude/linux/module.h | 5 +++
> tools/lib/lockdep/uinclude/linux/rcu.h | 2 ++
> 22 files changed, 317 insertions(+), 37 deletions(-)
> create mode 100644 tools/include/linux/jhash.h
> create mode 100644 tools/include/linux/sched/clock.h
> create mode 100644 tools/include/linux/sched/mm.h
> create mode 100644 tools/include/linux/sched/task.h
> create mode 100644 tools/include/linux/unaligned/packed_struct.h
> delete mode 100644 tools/lib/lockdep/uinclude/linux/bitops.h
Yeah, so what needs to be fixed as well is for liblockdep to exclusively use
tools/include/ (and extend those headers where required).
perf already uses that method and it works well.
liblockdep already uses tools/include/ in part, but even after I apply all your
patches, there's still lib/lockdep/uinclude/ which appears to duplicate a number
of headers.
I did a quick check - for example WARN_ON() et al is duplicated in
tools/lib/lockdep/uinclude/linux/kernel.h.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PATCH 00/21] liblockdep fixes for v4.12
2017-05-26 6:52 ` [PATCH 00/21] liblockdep fixes for v4.12 Ingo Molnar
@ 2017-05-26 10:57 ` Levin, Alexander (Sasha Levin)
2017-05-26 11:21 ` Ingo Molnar
0 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-26 10:57 UTC (permalink / raw)
To: Ingo Molnar; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
On Fri, May 26, 2017 at 08:52:52AM +0200, Ingo Molnar wrote:
>
> * Levin, Alexander (Sasha Levin) <alexander.levin@verizon.com> wrote:
>
> > MAINTAINERS | 2 +-
> > tools/Makefile | 8 +++--
> > tools/include/linux/bitops.h | 10 ++++++
> > tools/include/linux/err.h | 5 +++
> > tools/include/linux/jhash.h | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> > tools/include/linux/sched/clock.h | 0
> > tools/include/linux/sched/mm.h | 0
> > tools/include/linux/sched/task.h | 0
> > tools/include/linux/unaligned/packed_struct.h | 46 +++++++++++++++++++++++++++
> > tools/lib/lockdep/Makefile | 9 +++---
> > tools/lib/lockdep/lockdep.c | 17 ++++++++++
> > tools/lib/lockdep/preload.c | 3 +-
> > tools/lib/lockdep/run_tests.sh | 8 ++---
> > tools/lib/lockdep/uinclude/linux/bitops.h | 3 --
> > tools/lib/lockdep/uinclude/linux/compiler.h | 2 ++
> > tools/lib/lockdep/uinclude/linux/debug_locks.h | 2 +-
> > tools/lib/lockdep/uinclude/linux/irqflags.h | 8 ++---
> > tools/lib/lockdep/uinclude/linux/kallsyms.h | 3 +-
> > tools/lib/lockdep/uinclude/linux/kernel.h | 20 ++++++++++--
> > tools/lib/lockdep/uinclude/linux/lockdep.h | 26 ++++++++--------
> > tools/lib/lockdep/uinclude/linux/module.h | 5 +++
> > tools/lib/lockdep/uinclude/linux/rcu.h | 2 ++
> > 22 files changed, 317 insertions(+), 37 deletions(-)
> > create mode 100644 tools/include/linux/jhash.h
> > create mode 100644 tools/include/linux/sched/clock.h
> > create mode 100644 tools/include/linux/sched/mm.h
> > create mode 100644 tools/include/linux/sched/task.h
> > create mode 100644 tools/include/linux/unaligned/packed_struct.h
> > delete mode 100644 tools/lib/lockdep/uinclude/linux/bitops.h
>
> Yeah, so what needs to be fixed as well is for liblockdep to exclusively use
> tools/include/ (and extend those headers where required).
>
> perf already uses that method and it works well.
>
> liblockdep already uses tools/include/ in part, but even after I apply all your
> patches, there's still lib/lockdep/uinclude/ which appears to duplicate a number
> of headers.
>
> I did a quick check - for example WARN_ON() et al is duplicated in
> tools/lib/lockdep/uinclude/linux/kernel.h.
Right, and as you can see from this patchset where we added to
tools/include/ when needed and removed from lib/lockdep/uinclude,
liblockdep is slowly creeping the "right" way.
perf, like liblockdep, didn't finish the switch to exclusively use
tools/include/ yet.
I can put more work into getting it done over the next few releases,
but it's not something I see as a critical fix for the upcoming
release.
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH 00/21] liblockdep fixes for v4.12
2017-05-26 10:57 ` Levin, Alexander (Sasha Levin)
@ 2017-05-26 11:21 ` Ingo Molnar
2017-05-26 11:41 ` Levin, Alexander (Sasha Levin)
0 siblings, 1 reply; 48+ messages in thread
From: Ingo Molnar @ 2017-05-26 11:21 UTC (permalink / raw)
To: Levin, Alexander (Sasha Levin); +Cc: linux-kernel, ben, a.p.zijlstra, tglx
* Levin, Alexander (Sasha Levin) <alexander.levin@verizon.com> wrote:
> Right, and as you can see from this patchset where we added to
> tools/include/ when needed and removed from lib/lockdep/uinclude,
> liblockdep is slowly creeping the "right" way.
>
> perf, like liblockdep, didn't finish the switch to exclusively use
> tools/include/ yet.
>
> I can put more work into getting it done over the next few releases,
> but it's not something I see as a critical fix for the upcoming
> release.
Since liblockdep was broken for an extended period of time I'd really
like to see this fixed before I apply any more patches.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH 00/21] liblockdep fixes for v4.12
2017-05-26 11:21 ` Ingo Molnar
@ 2017-05-26 11:41 ` Levin, Alexander (Sasha Levin)
2017-05-28 9:11 ` Ingo Molnar
0 siblings, 1 reply; 48+ messages in thread
From: Levin, Alexander (Sasha Levin) @ 2017-05-26 11:41 UTC (permalink / raw)
To: Ingo Molnar; +Cc: linux-kernel, ben, a.p.zijlstra, tglx
On Fri, May 26, 2017 at 01:21:51PM +0200, Ingo Molnar wrote:
>
> * Levin, Alexander (Sasha Levin) <alexander.levin@verizon.com> wrote:
>
> > Right, and as you can see from this patchset where we added to
> > tools/include/ when needed and removed from lib/lockdep/uinclude,
> > liblockdep is slowly creeping the "right" way.
> >
> > perf, like liblockdep, didn't finish the switch to exclusively use
> > tools/include/ yet.
> >
> > I can put more work into getting it done over the next few releases,
> > but it's not something I see as a critical fix for the upcoming
> > release.
>
> Since liblockdep was broken for an extended period of time I'd really
> like to see this fixed before I apply any more patches.
What does the build breakage has to do with converting the way we
use headers? There's no broken functionality as far as I can tell,
so why is the header thing defined as a "fix" to begin with?
I also don't see a single tools/ project to exclusively use tools/include
at this point.
Would you rather keep liblockdep broken for the next couple of months
until this is sorted? I really doubt I could get something (+ enough
time to soak in -next) for v4.13, so we're looking at v4.14 at the
earliest.
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH 00/21] liblockdep fixes for v4.12
2017-05-26 11:41 ` Levin, Alexander (Sasha Levin)
@ 2017-05-28 9:11 ` Ingo Molnar
0 siblings, 0 replies; 48+ messages in thread
From: Ingo Molnar @ 2017-05-28 9:11 UTC (permalink / raw)
To: Levin, Alexander (Sasha Levin); +Cc: linux-kernel, ben, a.p.zijlstra, tglx
* Levin, Alexander (Sasha Levin) <alexander.levin@verizon.com> wrote:
> On Fri, May 26, 2017 at 01:21:51PM +0200, Ingo Molnar wrote:
> >
> > * Levin, Alexander (Sasha Levin) <alexander.levin@verizon.com> wrote:
> >
> > > Right, and as you can see from this patchset where we added to
> > > tools/include/ when needed and removed from lib/lockdep/uinclude,
> > > liblockdep is slowly creeping the "right" way.
> > >
> > > perf, like liblockdep, didn't finish the switch to exclusively use
> > > tools/include/ yet.
> > >
> > > I can put more work into getting it done over the next few releases,
> > > but it's not something I see as a critical fix for the upcoming
> > > release.
> >
> > Since liblockdep was broken for an extended period of time I'd really
> > like to see this fixed before I apply any more patches.
>
> What does the build breakage has to do with converting the way we use headers?
> There's no broken functionality as far as I can tell, so why is the header thing
> defined as a "fix" to begin with?
liblockdep was essentially build-broken for almost a year.
I worry about and question liblockdep's general maintainability and as a
maintainer of lockdep I can see only two options going forward: either it's
cleaned up for good (going beyond what is needed to fix the build failures and
warnings), or we remove it (with the option of reintroducing it if/when it's clean
enough).
I.e. the quality bar has increased.
> I also don't see a single tools/ project to exclusively use tools/include at
> this point.
>
> Would you rather keep liblockdep broken for the next couple of months until this
> is sorted? I really doubt I could get something (+ enough time to soak in -next)
> for v4.13, so we're looking at v4.14 at the earliest.
No, if it does not improve then I'd rather remove it, and re-add it at a later
date if/when it's clean enough.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 48+ messages in thread