Fix up liblockdep for 5.7-rc
v2 cover Fix up liblockdep for 5.7-rc
Hi Ingo,
This series fixes up most of liblockdep to work with the current kernel tree.
Change in v2:
- Rebase on top of the 5.7 merge window work.
Sasha Levin (12):
tools headers: Add kprobes.h header
tools headers: Add rcupdate.h header
tools/kernel.h: extend with dummy RCU functions
tools bitmap: add bitmap_andnot definition tools/lib/lockdep: add definition required for IRQ flag tracing tools/kernel.h: add BUILD_BUG_ON_NOT_POWER_OF_2 macro tools bitmap: add bitmap_clear definition tools/lib/lockdep: Hook up vsprintf, find_bit, hweight libraries tools/lib/lockdep: Enable building with CONFIG_TRACE_IRQFLAGS tools/lib/lockdep: New stacktrace API tools/lib/lockdep: call lockdep_init_task on init tools/lib/lockdep: switch to using lockdep_init_map_waits
tools/include/linux/bitmap.h | 10 ++++++ tools/include/linux/kernel.h | 15 ++++++++ tools/include/linux/kprobes.h | 7 ++++ tools/include/linux/lockdep.h | 9 +++++ tools/include/linux/rcupdate.h | 12 +++++++ tools/include/linux/stacktrace.h | 8 +++++ tools/lib/bitmap.c | 35 +++++++++++++++++++ tools/lib/lockdep/Build | 2 +- tools/lib/lockdep/Makefile | 2 +- tools/lib/lockdep/include/liblockdep/common.h | 4 +-- tools/lib/lockdep/include/liblockdep/mutex.h | 2 +- tools/lib/lockdep/include/liblockdep/rwlock.h | 2 +- tools/lib/lockdep/lockdep.c | 4 +-- tools/lib/lockdep/preload.c | 6 +++- 14 files changed, 109 insertions(+), 9 deletions(-) create mode 100644 tools/include/linux/kprobes.h create mode 100644 tools/include/linux/rcupdate.h
Signature · 1 line
2.20.1
PATCH v2 1/12 tools headers: Add kprobes.h header
This is now needed by liblockdep as a result of 2f43c6022d84 ("kprobes:
Prohibit probing on lockdep functions").
--- tools/include/linux/kprobes.h | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 tools/include/linux/kprobes.h
tools/include/linux/kprobes.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifndef _TOOLS_LINUX_KPROBES_H_ +#define _TOOLS_LINUX_KPROBES_H_ + +#define NOKPROBE_SYMBOL (x) +#define nokprobe_inline + +#endif
Signature · 1 line
2.20.1
PATCH v2 3/12 tools/kernel.h: extend with dummy RCU functions
In reply to Sasha LevinThese calls were added by 108c14858b9e ("locking/lockdep: Add support for dynamic keys") and require no special handling in userspace, so just add empty function definitions.
--- tools/include/linux/kernel.h | 7 +++++++ 1 file changed, 7 insertions(+)
tools/include/linux/kernel.h +7 -0
@@ -119,4 +119,11 @@ int scnprintf_pad(char * buf, size_t size, const char * fmt, ...);#define current_gfp_context (k) 0#define synchronize_rcu () +static __maybe_unused int system_state; +#define SYSTEM_SCHEDULING 0 + +#define might_sleep () +#define rcu_read_lock () +#define rcu_read_unlock () +#endif
Signature · 1 line
2.20.1
PATCH v2 4/12 tools bitmap: add bitmap_andnot definition
In reply to Sasha LevinAdd definition of bitmap_andnot() and wire tools/lib/bitmap.c into liblockdep.
This is needed as a result of de4643a77356 ("locking/lockdep: Reuse lock chains that have been freed").
--- tools/include/linux/bitmap.h | 10 ++++++++++ tools/lib/bitmap.c | 15 +++++++++++++++ tools/lib/lockdep/Build | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-)
tools/include/linux/bitmap.h +10 -0
@@ -18,6 +18,8 @@ int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,int __bitmap_equal (const unsigned long *bitmap1,const unsigned long *bitmap2,unsigned int bits);void bitmap_clear (unsigned long *map,unsigned int start,int len); +int __bitmap_andnot (unsigned long *dst,const unsigned long *bitmap1, +const unsigned long *bitmap2,unsigned int bits);#define BITMAP_FIRST_WORD_MASK (start) (~0UL << ((start) & (BITS_PER_LONG - 1)))
@@ -178,4 +180,12 @@ static inline int bitmap_equal(const unsigned long *src1, return __bitmap_equal(src1, src2, nbits); } +static inline int bitmap_andnot (unsigned long *dst,const unsigned long *src1, +const unsigned long *src2,unsigned int nbits) +{ +if (small_const_nbits (nbits)) +return (*dst = *src1 & ~(*src2) &BITMAP_LAST_WORD_MASK (nbits)) !=0 ; +return __bitmap_andnot (dst, src1, src2, nbits); +} +#endif /* _PERF_BITOPS_H */
tools/lib/bitmap.c +15 -0
@@ -86,3 +86,18 @@ int __bitmap_equal(const unsigned long *bitmap1,return 1 ; } + +int __bitmap_andnot (unsigned long *dst,const unsigned long *bitmap1, +const unsigned long *bitmap2,unsigned int bits) +{ +unsigned int k; +unsigned int lim = bits/BITS_PER_LONG ; +unsigned long result =0 ; + +for (k =0 ; k < lim; k++) + result |= (dst[k] = bitmap1[k] & ~bitmap2[k]); +if (bits %BITS_PER_LONG ) + result |= (dst[k] = bitmap1[k] & ~bitmap2[k] & +BITMAP_LAST_WORD_MASK (bits)); +return result !=0 ; +}
tools/lib/lockdep/Build +1 -1
@@ -1 +1 @@ -liblockdep-y += common.o lockdep.o preload.o rbtree.o +liblockdep-y += common.o lockdep.o preload.o rbtree.o ../../lib/bitmap.o
Signature · 1 line
2.20.1
PATCH v2 5/12 tools/lib/lockdep: add definition required for IRQ flag tracing
In reply to Sasha LevinWe are going to start building with CONFIG_TRACE_IRQFLAGS defined, so let's wire up a few dummy variables in our task_struct.
This isn't needed in userspace, but due to some refactoring in kernel-side lockdep it's easier to just wire it up and enable CONFIG_TRACE_IRQFLAGS.
--- tools/include/linux/lockdep.h | 8 ++++++++ tools/lib/lockdep/lockdep.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-)
tools/include/linux/lockdep.h +8 -0
@@ -23,6 +23,8 @@#include "../../../include/linux/lockdep.h" +static bool early_boot_irqs_disabled; +struct task_struct {u64 curr_chain_key;int lockdep_depth;
@@ -31,6 +33,12 @@ struct task_struct {gfp_t lockdep_reclaim_gfp;int pid;int state; +int softirqs_enabled, hardirqs_enabled, softirqs_disabled, hardirqs_disabled, irq_events; +unsigned long softirq_disable_ip, softirq_enable_ip; +unsigned int softirq_disable_event, softirq_enable_event; +unsigned long hardirq_disable_ip, hardirq_enable_ip; +unsigned int hardirq_disable_event, hardirq_enable_event; +int softirq_context, hardirq_context;char comm[17 ]; };
tools/lib/lockdep/lockdep.c +2 -2
@@ -15,10 +15,10 @@ u32 prandom_u32(void)abort (); } -void print_irqtrace_events (struct task_struct *curr) +/*void print_irqtrace_events(struct task_struct *curr) { abort(); -} +}*/ static struct new_utsname *init_utsname (void ) {
Signature · 1 line
2.20.1
PATCH v2 6/12 tools/kernel.h: add BUILD_BUG_ON_NOT_POWER_OF_2 macro
In reply to Sasha LevinThis is now needed as a result of 12593b7467f9 ("locking/lockdep: Reduce space occupied by stack traces").
--- tools/include/linux/kernel.h | 6 ++++++ 1 file changed, 6 insertions(+)
tools/include/linux/kernel.h +6 -0
@@ -38,6 +38,12 @@#define BUILD_BUG_ON (condition) ((void)sizeof(char[1 - 2*!!(condition)]))#define BUILD_BUG_ON_ZERO (e) (sizeof(struct { int:-!!(e); })) +/* Force a compilation error if a constant expression is not a power of 2 */ +#define __BUILD_BUG_ON_NOT_POWER_OF_2 (n) \ + BUILD_BUG_ON(((n) & ((n) - 1)) != 0) +#define BUILD_BUG_ON_NOT_POWER_OF_2 (n) \ + BUILD_BUG_ON((n) == 0 || (((n) & ((n) - 1)) != 0)) +#ifndef max#define max (x, y) ({ \ typeof(x) _max1 = (x); \
Signature · 1 line
2.20.1
PATCH v2 7/12 tools bitmap: add bitmap_clear definition
In reply to Sasha LevinThis is needed as a result of de4643a77356 ("locking/lockdep: Reuse lock chains that have been freed").
--- tools/lib/bitmap.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
tools/lib/bitmap.c +20 -0
@@ -101,3 +101,23 @@ int __bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1, BITMAP_LAST_WORD_MASK(bits));return result !=0 ; } + +void bitmap_clear (unsigned long *map,unsigned int start,int len) +{ +unsigned long *p = map +BIT_WORD (start); +const unsigned int size = start + len; +int bits_to_clear =BITS_PER_LONG - (start %BITS_PER_LONG ); +unsigned long mask_to_clear =BITMAP_FIRST_WORD_MASK (start); + +while (len - bits_to_clear >=0 ) { + *p &= ~mask_to_clear; + len -= bits_to_clear; + bits_to_clear =BITS_PER_LONG ; + mask_to_clear = ~0UL ; + p++; + } +if (len) { + mask_to_clear &=BITMAP_LAST_WORD_MASK (size); + *p &= ~mask_to_clear; + } +}
Signature · 1 line
2.20.1
PATCH v2 9/12 tools/lib/lockdep: Enable building with CONFIG_TRACE_IRQFLAGS
In reply to Sasha LevinAt this point it's always enabled with CONFIG_PROVE_LOCKING, so it's easier to enable it in liblockdep as well rather than try and fix up the lockdep code.
--- tools/lib/lockdep/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/lockdep/Makefile +1 -1
@@ -78,7 +78,7 @@ export Q VERBOSE 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 ?= -g -DCONFIG_LOCKDEP -DCONFIG_STACKTRACE -DCONFIG_PROVE_LOCKING -DCONFIG_TRACE_IRQFLAGS -DBITS_PER_LONG=__WORDSIZE -DLIBLOCKDEP_VERSION='"$(LIBLOCKDEP_VERSION)"' -rdynamic -O0 -g CFLAGS += -fPIC CFLAGS += -Wall
Signature · 1 line
2.20.1
PATCH v2 8/12 tools/lib/lockdep: Hook up vsprintf, find_bit, hweight libraries
In reply to Sasha LevinThey already exist in tools/lib/, and are now required by liblockdep, so just add them to the build manifest.
--- tools/lib/lockdep/Build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/lockdep/Build +1 -1
@@ -1 +1 @@ -liblockdep-y += common.o lockdep.o preload.o rbtree.o ../../lib/bitmap.o +liblockdep-y += common.o lockdep.o preload.o rbtree.o ../../lib/bitmap.o ../../lib/vsprintf.o ../../lib/find_bit.o ../../lib/hweight.o
Signature · 1 line
2.20.1
PATCH v2 12/12 tools/lib/lockdep: switch to using lockdep_init_map_waits
In reply to Sasha LevinAs of de8f5e4f2dc1 ("lockdep: Introduce wait-type checks") lockdep exports lockdep_init_map_waits() instead of lockdep_init_map() for initialization.
--- tools/include/linux/kernel.h | 2 ++ tools/include/linux/lockdep.h | 1 + tools/lib/lockdep/include/liblockdep/common.h | 4 ++-- tools/lib/lockdep/include/liblockdep/mutex.h | 2 +- tools/lib/lockdep/include/liblockdep/rwlock.h | 2 +- tools/lib/lockdep/preload.c | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-)
tools/include/linux/kernel.h +2 -0
@@ -132,4 +132,6 @@ static __maybe_unused int system_state;#define rcu_read_lock ()#define rcu_read_unlock () +#define in_nmi () 0 +#endif
tools/include/linux/lockdep.h +1 -0
@@ -34,6 +34,7 @@ struct task_struct {int pid;int state;int softirqs_enabled, hardirqs_enabled, softirqs_disabled, hardirqs_disabled, irq_events; +int hardirq_threaded, irq_config;unsigned long softirq_disable_ip, softirq_enable_ip;unsigned int softirq_disable_event, softirq_enable_event;unsigned long hardirq_disable_ip, hardirq_enable_ip;
tools/lib/lockdep/include/liblockdep/common.h +2 -2
@@ -37,8 +37,8 @@ struct lockdep_map {#endif }; -void lockdep_init_map (struct lockdep_map *lock,const char *name, -struct lock_class_key *key,int subclass); +void lockdep_init_map_waits (struct lockdep_map *lock,const char *name, +struct lock_class_key *key,int subclass,short inner,short outer);void lock_acquire (struct lockdep_map *lock,unsigned int subclass,int trylock,int read,int check,struct lockdep_map *nest_lock,unsigned long ip);
tools/lib/lockdep/include/liblockdep/mutex.h +1 -1
@@ -24,7 +24,7 @@ static inline int __mutex_init(liblockdep_pthread_mutex_t *lock,struct lock_class_key *key, const pthread_mutexattr_t *__mutexattr) { - lockdep_init_map(&lock->dep_map, name, key, 0); + lockdep_init_map_waits(&lock->dep_map, name, key, 0, 0, 0);return pthread_mutex_init (&lock->mutex, __mutexattr); }
tools/lib/lockdep/include/liblockdep/rwlock.h +1 -1
@@ -23,7 +23,7 @@ static inline int __rwlock_init(liblockdep_pthread_rwlock_t *lock,struct lock_class_key *key, const pthread_rwlockattr_t *attr) { - lockdep_init_map(&lock->dep_map, name, key, 0); + lockdep_init_map_waits(&lock->dep_map, name, key, 0, 0, 0);return pthread_rwlock_init (&lock->rwlock, attr); }
tools/lib/lockdep/preload.c +1 -1
@@ -199,7 +199,7 @@ static struct lock_lookup *__get_lock(void *lock)* TODO: Get the real name of the lock using libdwarf */ sprintf (l->name,"%p" , lock); -lockdep_init_map (&l->dep_map, l->name, &l->key,0 ); +// lockdep_init_map_waits(&l->dep_map, l->name, &l->key, 0, 0, 0); ll_pthread_rwlock_wrlock (&locks_rwlock);/* This might have changed since the last time we fetched it */
Signature · 1 line
2.20.1
PATCH v2 11/12 tools/lib/lockdep: call lockdep_init_task on init
In reply to Sasha LevinWe now have to explicitly call lockdep_init_task() when starting up.
--- tools/lib/lockdep/preload.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/lib/lockdep/preload.c +4 -0
@@ -9,6 +9,8 @@#include "include/liblockdep/mutex.h" #include "../../include/linux/rbtree.h" +extern struct task_struct *__curr (void ); +/** * struct lock_lookup - liblockdep's view of a single unique lock * @orig: pointer to the original pthread lock, used for lookups
@@ -421,6 +423,8 @@ __attribute__((constructor)) static void init_preload(void)if (__init_state == done)return ; +lockdep_init_task (__curr ()); +#ifndef __GLIBC__ __init_state = prepare;
Signature · 1 line
2.20.1
PATCH v2 10/12 tools/lib/lockdep: New stacktrace API
In reply to Sasha LevinThe kernel switched to using kernel/stacktrace.c, and the API slightly changed.
Adjust it to make stack traces work again.
--- tools/include/linux/stacktrace.h | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/include/linux/stacktrace.h +8 -0
@@ -15,10 +15,18 @@ static inline void print_stack_trace(struct stack_trace *trace, int spaces)backtrace_symbols_fd ((void **)trace->entries, trace->nr_entries,1 ); } +static inline void stack_trace_print (const long unsigned int *entries,unsigned int nr,int spaces) +{ +backtrace_symbols_fd ((void **)entries, nr,1 ); +} +#define save_stack_trace (trace) \ ((trace)->nr_entries = \ backtrace((void **)(trace)->entries, (trace)->max_entries)) +#define stack_trace_save (e, m, x) \ + backtrace((void **)(e), (m)) +static inline int dump_stack (void ) {void *array[64 ];
Signature · 1 line
2.20.1
PATCH v2 2/12 tools headers: Add rcupdate.h header
In reply to Sasha LevinThis is now needed by liblockdep as a result of a0b0fd53e1e6 ("locking/lockdep: Free lock classes that are no longer in use").
--- tools/include/linux/rcupdate.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 tools/include/linux/rcupdate.h
tools/include/linux/rcupdate.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LIBLOCKDEP_RCUPDATE_H_ +#define _LIBLOCKDEP_RCUPDATE_H_ + +#define call_rcu (x, y) +#define init_rcu_head (x) + +struct rcu_head { +char dummy; +}; + +#endif
Signature · 1 line
2.20.1
Ping?
Quoted 44 lines · Sasha Levin
Hi Ingo,
This series fixes up most of liblockdep to work with the current kernel tree.
Change in v2:
- Rebase on top of the 5.7 merge window work.
Sasha Levin (12):
tools headers: Addkprobes.hheader
tools headers: Addrcupdate.hheader
tools/kernel.h: extend with dummy RCU functions
tools bitmap: addbitmap_andnotdefinitiontools/lib/lockdep: add definition required for IRQ flag tracingtools/kernel.h: addBUILD_BUG_ON_NOT_POWER_OF_2macro tools bitmap: addbitmap_cleardefinitiontools/lib/lockdep: Hook up vsprintf,find_bit, hweight librariestools/lib/lockdep: Enable building withCONFIG_TRACE_IRQFLAGStools/lib/lockdep: New stacktrace APItools/lib/lockdep: calllockdep_init_taskon inittools/lib/lockdep: switch to usinglockdep_init_map_waitstools/include/linux/bitmap.h | 10 ++++++ tools/include/linux/kernel.h | 15 ++++++++ tools/include/linux/kprobes.h | 7 ++++ tools/include/linux/lockdep.h | 9 +++++ tools/include/linux/rcupdate.h | 12 +++++++ tools/include/linux/stacktrace.h | 8 +++++ tools/lib/bitmap.c | 35 +++++++++++++++++++ tools/lib/lockdep/Build | 2 +- tools/lib/lockdep/Makefile | 2 +- tools/lib/lockdep/include/liblockdep/common.h | 4 +-- tools/lib/lockdep/include/liblockdep/mutex.h | 2 +- tools/lib/lockdep/include/liblockdep/rwlock.h | 2 +- tools/lib/lockdep/lockdep.c | 4 +-- tools/lib/lockdep/preload.c | 6 +++- 14 files changed, 109 insertions(+), 9 deletions(-)create mode 100644
tools/include/linux/kprobes.hcreate mode 100644tools/include/linux/rcupdate.hSignature · 1 line
2.20.1
Signature · 2 lines
Thanks, Sasha