Skip to contentSkip to conversation

liblockdep: Fix undefined symbol prandom_u32

PATCH In review [email protected] 2 participants 18 messages May 18, 2017 – May 26, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/15 liblockdep: Fix undefined symbol prandom_u32

From: Ben Hutchings <[email protected]>

__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 ...")
---
 tools/lib/lockdep/lockdep.c | 7 +++++++
 1 file changed, 7 insertions(+)
tools/lib/lockdep/lockdep.c +7 -0
index a0a2e3a266af..443acb11f907 100644
@@ -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"
Signature · 1 line
2.11.0
#1 lore raw

PATCH 2/15 liblockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain::depth

From: Ben Hutchings <[email protected]>

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 <[email protected]> # for versions before 4.6, use a value of 255
---
 tools/lib/lockdep/uinclude/linux/lockdep.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/lockdep/uinclude/linux/lockdep.h +1 -1
index c808c7d02d21..d30214221920 100644
@@ -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
Signature · 1 line
2.11.0
#2 lore raw

PATCH 3/15 liblockdep: Define the ARRAY_SIZE() macro

In reply to [email protected]

From: Ben Hutchings <[email protected]>

lockdep.c now uses ARRAY_SIZE().

Fixes 75dd602a5198 ("lockdep: Fix lock_chain::base size")
---
 tools/lib/lockdep/uinclude/linux/kernel.h | 2 ++
 1 file changed, 2 insertions(+)
tools/lib/lockdep/uinclude/linux/kernel.h +2 -0
index 276c7a8b2ed1..da87bd9ad2c1 100644
@@ -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);	\
Signature · 1 line
2.11.0
#3 lore raw

PATCH 4/15 liblockdep: Enable -Wall by default

In reply to [email protected]

From: Ben Hutchings <[email protected]>

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.

---
 tools/lib/lockdep/Makefile | 1 +
 1 file changed, 1 insertion(+)
tools/lib/lockdep/Makefile +1 -0
index 3bc0ef9f8923..98d8a5ae8334 100644
@@ -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)
 
Signature · 1 line
2.11.0
#4 lore raw

PATCH 5/15 liblockdep: Fix 'unused value' warnings

In reply to [email protected]

From: Ben Hutchings <[email protected]>

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.

---
 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(-)
tools/lib/lockdep/uinclude/linux/debug_locks.h +1 -1
index f38eb64df794..1d4fbec5c649 100644
@@ -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;
tools/lib/lockdep/uinclude/linux/kernel.h +9 -3
index da87bd9ad2c1..021cff4f4e3d 100644
@@ -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
tools/lib/lockdep/uinclude/linux/lockdep.h +5 -1
index d30214221920..d1079034a14d 100644
@@ -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
Signature · 1 line
2.11.0
#5 lore raw

PATCH 6/15 liblockdep: Fix 'set but not used' warnings

In reply to [email protected]

From: Ben Hutchings <[email protected]>

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.

---
 tools/lib/lockdep/uinclude/linux/irqflags.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
tools/lib/lockdep/uinclude/linux/irqflags.h +4 -4
index 6cc296f0fad0..df77669cfe1c 100644
@@ -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)
Signature · 1 line
2.11.0
#6 lore raw

PATCH 7/15 liblockdep: Fix 'defined but not used' warning for init_utsname()

In reply to [email protected]

From: Ben Hutchings <[email protected]>

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.

---
 tools/lib/lockdep/lockdep.c                | 10 ++++++++++
 tools/lib/lockdep/uinclude/linux/lockdep.h | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)
tools/lib/lockdep/lockdep.c +10 -0
index 443acb11f907..209f967dedaa 100644
@@ -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"
tools/lib/lockdep/uinclude/linux/lockdep.h +0 -10
index d1079034a14d..c157242e0417 100644
@@ -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
 
Signature · 1 line
2.11.0
#7 lore raw

PATCH 8/15 liblockdep: Remove -lpthread compiler option

In reply to [email protected]

From: Vishal Thanki <[email protected]>

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.

---
 tools/lib/lockdep/run_tests.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/lib/lockdep/run_tests.sh +2 -2
index 1069d96248c1..3fd297bd5fcb 100755
@@ -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!"
Signature · 1 line
2.11.0
#8 lore raw

PATCH 9/15 MAINTAINERS: update email for Sasha Levin

In reply to [email protected]

New position, new email address.

---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
index 38d3e4ed7208..c67ad6fe6f6c 100644
@@ -7450,7 +7450,7 @@ S:	Maintained
 F:	drivers/ata/sata_promise.*
 
 LIBLOCKDEP
-M:	Sasha Levin <[email protected]>
+M:	Sasha Levin <[email protected]>
 S:	Maintained
 F:	tools/lib/lockdep/
 
Signature · 1 line
2.11.0
#9 lore raw

PATCH 10/15 tools: add install make target for liblockdep

In reply to [email protected]

From: Alexander Sverdlin <[email protected]>

Allow user to call "liblockdep_install" target. Also add liblockdep to "all" and "install" targets (as "help" command suggests).

Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Linus Walleij <[email protected]>
---
 tools/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
tools/Makefile +6 -2
index 00caacd3ed92..d61c8252e811 100644
@@ -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'
@@ -86,7 +87,7 @@ tmon: FORCE
 freefall: FORCE
 	$(call descend,laptop/$@)
 
-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
@@ -100,6 +101,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)
 
@@ -116,7 +120,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
Signature · 1 line
2.11.0
#10 lore raw

PATCH 11/15 tools: liblockdep: Don't mix fd-based and stream IO

In reply to [email protected]

From: Alexander Sverdlin <[email protected]>

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().

---
 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(-)
tools/lib/lockdep/preload.c +2 -1
index 52844847569c..226aa26198a9 100644
@@ -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);
 		}
tools/lib/lockdep/uinclude/linux/kallsyms.h +2 -1
index b0f2dbdf1a15..582cc1e5f3a4 100644
@@ -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);
 }
tools/lib/lockdep/uinclude/linux/lockdep.h +2 -1
index c157242e0417..d988fba99454 100644
@@ -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
 
Signature · 1 line
2.11.0
#11 lore raw

PATCH 12/15 tools: liblockdep: fix compilation for 4.11

In reply to [email protected]

- More rcu stubs
- New dummy headers due to sched header split
- jhash2 included in due to kernel lockdep inclusion and usage

---
 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
tools/include/linux/bitops.h +10 -0
index 1aecad369af5..969db1981868 100644
@@ -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
tools/include/linux/jhash.h new file +175 -0

175 lines not on this page · raw message

tools/include/linux/sched/clock.h new file +0 -0
new file mode 100644
index 000000000000..e69de29bb2d1
tools/include/linux/sched/task.h new file +0 -0
new file mode 100644
index 000000000000..e69de29bb2d1
tools/include/linux/unaligned/packed_struct.h new file +46 -0

46 lines not on this page · raw message

tools/lib/lockdep/uinclude/linux/bitops.h deleted +0 -3
deleted file mode 100644
index fab00ff936d1..000000000000
@@ -1,3 +0,0 @@
-
-/* empty file */
-
tools/lib/lockdep/uinclude/linux/compiler.h +2 -0
index fd3e56a83fc2..fba5e022cee7 100644
@@ -7,4 +7,6 @@
 #define WRITE_ONCE(x, val) x=(val)
 #define RCU_INIT_POINTER(p, v) p=(v)
 
+#define __packed	__attribute__((packed))
+
 #endif
tools/lib/lockdep/uinclude/linux/kernel.h +2 -0
index 021cff4f4e3d..faa98cc7971a 100644
@@ -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
tools/lib/lockdep/uinclude/linux/rcu.h +2 -0
index 042ee8e463c9..6f0332324a6d 100644
@@ -18,4 +18,6 @@ static inline bool rcu_is_watching(void)
 	return false;
 }
 
+#define rcu_assign_pointer(p, v) ((p) = (v))
+
 #endif
Signature · 1 line
2.11.0
#12 lore raw

PATCH 13/15 tools: liblockdep: Fix object file paths used in an out-of-tree build

In reply to [email protected]

From: Ben Hutchings <[email protected]>

---
 tools/lib/lockdep/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
tools/lib/lockdep/Makefile +4 -4
index 98d8a5ae8334..e5e64d6ad0a7 100644
@@ -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
Signature · 1 line
2.11.0
#13 lore raw

PATCH 14/15 tools: liblockdep: Remove double-quotes from soname

In reply to [email protected]

From: Ben Hutchings <[email protected]>

---
 tools/lib/lockdep/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/lockdep/Makefile +1 -1
index e5e64d6ad0a7..ce21b9429314 100644
@@ -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)		\
Signature · 1 line
2.11.0
#14 lore raw

PATCH 15/15 tools: liblockdep: Use LDFLAGS

In reply to [email protected]

From: Ben Hutchings <[email protected]>

---
 tools/lib/lockdep/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/lockdep/Makefile +1 -1
index ce21b9429314..ed9ace59d112 100644
@@ -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)		\
Signature · 1 line
2.11.0
#15 lore raw
In reply to [email protected]

So I'm not sure how you sent these patches, but probably due to the lack of a boilerplate message, the order was all mixed up. I got the patch order right on the third attempt.

But then I encountered this build failure (when applied to Linus's latest tree):

triton:~/tip/tools/lib/lockdep> make
CC common.o
CC lockdep.o
In file included from lockdep.c:25:0:
../../../kernel/locking/lockdep.c:33:28: fatal error: linux/sched/mm.h: No such file or directory

 #include <linux/sched/mm.h>
                            ^

Thanks,

Ingo

#16 lore raw
Quoted 7 lines · Ingo Molnar

So I'm not sure how you sent these patches, but probably due to the lack of a boilerplate message, the order was all mixed up. I got the patch order right on the third attempt.

But then I encountered this build failure (when applied to Linus's latest tree):

Quoted 8 lines

triton:~/tip/tools/lib/lockdep> make
CC common.o
CC lockdep.o
In file included from lockdep.c:25:0:
../../../kernel/locking/lockdep.c:33:28: fatal error: linux/sched/mm.h: No such file or directory

 #include <linux/sched/mm.h>
                            ^

Heh, apparently a bunch of stuff changed between the point when I sent my original pull request and now... I'll resend with additional fixes.

Signature · 2 lines
Thanks,
Sasha
#17 lore raw
Quoted 17 lines · Levin, Alexander (Sasha Levin)
Quoted 7 lines · Ingo Molnar

So I'm not sure how you sent these patches, but probably due to the lack of a boilerplate message, the order was all mixed up. I got the patch order right on the third attempt.

But then I encountered this build failure (when applied to Linus's latest tree):

Quoted 8 lines

triton:~/tip/tools/lib/lockdep> make
CC common.o
CC lockdep.o
In file included from lockdep.c:25:0:
../../../kernel/locking/lockdep.c:33:28: fatal error: linux/sched/mm.h: No such file or directory

 #include <linux/sched/mm.h>
                            ^
Quoted 2 lines

Heh, apparently a bunch of stuff changed between the point when I sent my original pull request and now... I'll resend with additional fixes.

Yeah, and also note that this is v4.13 material at best - liblockdep broke a long time ago so it falls under 'development', not 'regression fixes'.

Thanks,

Ingo