* [GIT PULL] liblockdep for 4.12
@ 2017-05-05 2:52 alexander.levin
2017-05-05 6:11 ` Ingo Molnar
0 siblings, 1 reply; 5+ messages in thread
From: alexander.levin @ 2017-05-05 2:52 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, ben
Hi Ingo,
Please pull fixes for liblockdep.
===
The following changes since commit a351e9b9fc24e982ec2f0e76379a49826036da12:
Linux 4.11 (2017-04-30 19:47:48 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux.git liblockdep-fixes
for you to fetch changes up to ec3cedc646ea697c849fe651f62ed448760ea569:
tools: liblockdep: Use LDFLAGS (2017-05-04 21:34:07 -0400)
----------------------------------------------------------------
Alexander Sverdlin (2):
tools: add install make target for liblockdep
tools: liblockdep: Don't mix fd-based and stream IO
Ben Hutchings (10):
liblockdep: Fix undefined symbol prandom_u32
liblockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain::depth
liblockdep: Define the ARRAY_SIZE() macro
liblockdep: Enable -Wall by default
liblockdep: Fix 'unused value' warnings
liblockdep: Fix 'set but not used' warnings
liblockdep: Fix 'defined but not used' warning for init_utsname()
tools: liblockdep: Fix object file paths used in an out-of-tree build
tools: liblockdep: Remove double-quotes from soname
tools: liblockdep: Use LDFLAGS
Sasha Levin (2):
MAINTAINERS: update email for Sasha Levin
tools: liblockdep: fix compilation for 4.11
Vishal Thanki (1):
liblockdep: Remove -lpthread compiler option
MAINTAINERS | 2 +-
tools/Makefile | 8 +-
tools/include/linux/bitops.h | 10 ++
tools/include/linux/jhash.h | 125 +++++++++++++++++++++++
tools/include/linux/sched/clock.h | 0
tools/include/linux/sched/task.h | 0
tools/include/linux/unaligned/packed_struct.h | 0
tools/lib/lockdep/Makefile | 9 +-
tools/lib/lockdep/lockdep.c | 17 +++
tools/lib/lockdep/preload.c | 3 +-
tools/lib/lockdep/run_tests.sh | 4 +-
tools/lib/lockdep/uinclude/linux/bitops.h | 3 -
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 | 16 ++-
tools/lib/lockdep/uinclude/linux/lockdep.h | 21 ++--
tools/lib/lockdep/uinclude/linux/rcu.h | 2 +
18 files changed, 198 insertions(+), 35 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
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] liblockdep for 4.12
2017-05-05 2:52 [GIT PULL] liblockdep for 4.12 alexander.levin
@ 2017-05-05 6:11 ` Ingo Molnar
2017-05-07 23:04 ` alexander.levin
0 siblings, 1 reply; 5+ messages in thread
From: Ingo Molnar @ 2017-05-05 6:11 UTC (permalink / raw)
To: alexander.levin; +Cc: mingo, linux-kernel, ben
* alexander.levin@verizon.com <alexander.levin@verizon.com> wrote:
> Hi Ingo,
>
> Please pull fixes for liblockdep.
>
> ===
>
> The following changes since commit a351e9b9fc24e982ec2f0e76379a49826036da12:
>
> Linux 4.11 (2017-04-30 19:47:48 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux.git liblockdep-fixes
>
> for you to fetch changes up to ec3cedc646ea697c849fe651f62ed448760ea569:
>
> tools: liblockdep: Use LDFLAGS (2017-05-04 21:34:07 -0400)
>
> ----------------------------------------------------------------
> Alexander Sverdlin (2):
> tools: add install make target for liblockdep
> tools: liblockdep: Don't mix fd-based and stream IO
>
> Ben Hutchings (10):
> liblockdep: Fix undefined symbol prandom_u32
> liblockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain::depth
> liblockdep: Define the ARRAY_SIZE() macro
> liblockdep: Enable -Wall by default
> liblockdep: Fix 'unused value' warnings
> liblockdep: Fix 'set but not used' warnings
> liblockdep: Fix 'defined but not used' warning for init_utsname()
> tools: liblockdep: Fix object file paths used in an out-of-tree build
> tools: liblockdep: Remove double-quotes from soname
> tools: liblockdep: Use LDFLAGS
>
> Sasha Levin (2):
> MAINTAINERS: update email for Sasha Levin
> tools: liblockdep: fix compilation for 4.11
>
> Vishal Thanki (1):
> liblockdep: Remove -lpthread compiler option
Could you please include all the patches as part of the pull request, so that
individual patches can be discussed?
In particular I'm wondering about:
> tools/include/linux/jhash.h | 125 +++++++++++++++++++++++
include/linux/jhash.h is 175 lines long - why not make an exact copy and keep it
synchronized the way perf does it?
Thanks,
Ingo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] liblockdep for 4.12
2017-05-05 6:11 ` Ingo Molnar
@ 2017-05-07 23:04 ` alexander.levin
2017-05-08 6:18 ` Ingo Molnar
0 siblings, 1 reply; 5+ messages in thread
From: alexander.levin @ 2017-05-07 23:04 UTC (permalink / raw)
To: Ingo Molnar; +Cc: mingo, linux-kernel, ben
On Fri, May 05, 2017 at 08:11:38AM +0200, Ingo Molnar wrote:
> * alexander.levin@verizon.com <alexander.levin@verizon.com> wrote:
> Could you please include all the patches as part of the pull request, so that
> individual patches can be discussed?
Sure, I'll resend.
> In particular I'm wondering about:
>
> > tools/include/linux/jhash.h | 125 +++++++++++++++++++++++
>
> include/linux/jhash.h is 175 lines long - why not make an exact copy and keep it
> synchronized the way perf does it?
Including jhash() vs only jhash2() required pulling additional headers in.
Since we don't need jhash() I preferred to drop it.
Let me know if you'd prefer to do it the other way and include everything.
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] liblockdep for 4.12
2017-05-07 23:04 ` alexander.levin
@ 2017-05-08 6:18 ` Ingo Molnar
2017-05-12 19:32 ` alexander.levin
0 siblings, 1 reply; 5+ messages in thread
From: Ingo Molnar @ 2017-05-08 6:18 UTC (permalink / raw)
To: alexander.levin; +Cc: mingo, linux-kernel, ben, Arnaldo Carvalho de Melo
* alexander.levin@verizon.com <alexander.levin@verizon.com> wrote:
> On Fri, May 05, 2017 at 08:11:38AM +0200, Ingo Molnar wrote:
> > * alexander.levin@verizon.com <alexander.levin@verizon.com> wrote:
> > Could you please include all the patches as part of the pull request, so that
> > individual patches can be discussed?
>
> Sure, I'll resend.
>
> > In particular I'm wondering about:
> >
> > > tools/include/linux/jhash.h | 125 +++++++++++++++++++++++
> >
> > include/linux/jhash.h is 175 lines long - why not make an exact copy and keep it
> > synchronized the way perf does it?
>
> Including jhash() vs only jhash2() required pulling additional headers in.
> Since we don't need jhash() I preferred to drop it.
>
> Let me know if you'd prefer to do it the other way and include everything.
How many headers would that be? We already have tools/include/../bitops.h, so we'd
only need include/linux/unaligned/packed_struct.h, which looks straightforward and
smallish.
( That header includes kernel.h, but we have that in tools as well, so in theory
it could work. )
The principle would be to 'COW-share' as much code as possible, at least for
obvious arithmetics helpers - which hashes do appear to be.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] liblockdep for 4.12
2017-05-08 6:18 ` Ingo Molnar
@ 2017-05-12 19:32 ` alexander.levin
0 siblings, 0 replies; 5+ messages in thread
From: alexander.levin @ 2017-05-12 19:32 UTC (permalink / raw)
To: Ingo Molnar; +Cc: mingo, linux-kernel, ben, Arnaldo Carvalho de Melo
Hey Ingo,
Here it is, with all the headers required.
The following changes since commit a351e9b9fc24e982ec2f0e76379a49826036da12:
Linux 4.11 (2017-04-30 19:47:48 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux.git liblockdep-fixes
for you to fetch changes up to 53c1b724b048e1723748b828f82d5a635a409218:
tools: liblockdep: Use LDFLAGS (2017-05-11 17:54:45 -0400)
----------------------------------------------------------------
Alexander Sverdlin (2):
tools: add install make target for liblockdep
tools: liblockdep: Don't mix fd-based and stream IO
Ben Hutchings (10):
liblockdep: Fix undefined symbol prandom_u32
liblockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain::depth
liblockdep: Define the ARRAY_SIZE() macro
liblockdep: Enable -Wall by default
liblockdep: Fix 'unused value' warnings
liblockdep: Fix 'set but not used' warnings
liblockdep: Fix 'defined but not used' warning for init_utsname()
tools: liblockdep: Fix object file paths used in an out-of-tree build
tools: liblockdep: Remove double-quotes from soname
tools: liblockdep: Use LDFLAGS
Sasha Levin (2):
MAINTAINERS: update email for Sasha Levin
tools: liblockdep: fix compilation for 4.11
Vishal Thanki (1):
liblockdep: Remove -lpthread compiler option
MAINTAINERS | 2 +-
tools/Makefile | 8 +-
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/Makefile | 9 +-
tools/lib/lockdep/lockdep.c | 17 +++
tools/lib/lockdep/preload.c | 3 +-
tools/lib/lockdep/run_tests.sh | 4 +-
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 | 16 ++-
tools/lib/lockdep/uinclude/linux/lockdep.h | 21 ++-
tools/lib/lockdep/uinclude/linux/rcu.h | 2 +
19 files changed, 296 insertions(+), 35 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/MAINTAINERS b/MAINTAINERS
index 38d3e4ed7208..c67ad6fe6f6c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7450,7 +7450,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/
diff --git a/tools/Makefile b/tools/Makefile
index 00caacd3ed92..d61c8252e811 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'
@@ -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
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/Makefile b/tools/lib/lockdep/Makefile
index 3bc0ef9f8923..ed9ace59d112 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)
@@ -100,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) $(LDFLAGS) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='$(@F)';$(shell ln -sf $(@F) $(@D)/liblockdep.so))
do_build_static_lib = \
($(print_static_lib_build) \
@@ -118,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
@@ -149,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
diff --git a/tools/lib/lockdep/lockdep.c b/tools/lib/lockdep/lockdep.c
index a0a2e3a266af..209f967dedaa 100644
--- a/tools/lib/lockdep/lockdep.c
+++ b/tools/lib/lockdep/lockdep.c
@@ -1,8 +1,25 @@
#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();
+}
+
+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/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/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!"
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/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/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)
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/kernel.h b/tools/lib/lockdep/uinclude/linux/kernel.h
index 276c7a8b2ed1..faa98cc7971a 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); \
@@ -20,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
@@ -44,4 +52,6 @@
#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/lockdep.h b/tools/lib/lockdep/uinclude/linux/lockdep.h
index c808c7d02d21..d988fba99454 100644
--- a/tools/lib/lockdep/uinclude/linux/lockdep.h
+++ b/tools/lib/lockdep/uinclude/linux/lockdep.h
@@ -7,8 +7,9 @@
#include <limits.h>
#include <linux/utsname.h>
#include <linux/compiler.h>
+#include <unistd.h>
-#define MAX_LOCK_DEPTH 2000UL
+#define MAX_LOCK_DEPTH 63UL
#define asmlinkage
#define __visible
@@ -29,27 +30,21 @@ 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
-#define printk printf
+#define printk(...) dprintf(STDOUT_FILENO, __VA_ARGS__)
#define list_del_rcu list_del
#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
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
--
Thanks,
Sasha
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-05-12 19:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-05 2:52 [GIT PULL] liblockdep for 4.12 alexander.levin
2017-05-05 6:11 ` Ingo Molnar
2017-05-07 23:04 ` alexander.levin
2017-05-08 6:18 ` Ingo Molnar
2017-05-12 19:32 ` alexander.levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).