liblockdep: userspace lockdep
v5 cover liblockdep: userspace lockdep
liblockdep is a tiny wrapper built around kernel/lockdep.c. The aim is to provide the same functionality the kernel gets from lockdep to userspace.
The bulk of the code here is the LD_PRELOAD support which provides users an easy way to test their code without having to integrate liblockdep into said code. Simply doing:
lockdep my_app
Would provide lockdep support to my_app.
There is also a small test suite to test both mutexes and rwlocks, it's based on the tests in lib/locking-selftest.c.
This entire patch series was reviewed by lockdep maintainers and accepted to the tip tree previously. It was pulled out so that the potential merge of liblockdep won't delay the rest of the commits in the tip locking tree.
For some more background about this entire thing, the folks at LWN did an awesome overview: http://lwn.net/Articles/536363/
Changes from v4:
- Build issue on Ubuntu.
- More work from Peter.
Changes from v3:
- More fixes/suggestions/code from Peter.
Changes from v2:
- Fix possible build breakage due to recent changes to kernel/lockdep.c
Changes from v1:
- Addressed Peter's comments.
Sasha Levin (9):
lockdep: Be nice about building from userspace
liblockdep: Wrap kernel/lockdep.c to allow usage from userspace
liblockdep: Add public headers for pthread_mutex_t implementation
liblockdep: Add pthread_mutex_t test suite
liblockdep: Add public headers for pthread_rwlock_t implementation
liblockdep: Add pthread_rwlock_t test suite
liblockdep: Support using LD_PRELOAD
liblockdep: Add the 'lockdep' user-space utility
liblockdep: Add a MAINTAINERS entry
MAINTAINERS | 5 + kernel/lockdep.c | 4 + tools/lib/lockdep/Makefile | 251 ++++++++++++ tools/lib/lockdep/common.c | 33 ++ tools/lib/lockdep/include/liblockdep/common.h | 50 +++ tools/lib/lockdep/include/liblockdep/mutex.h | 70 ++++ tools/lib/lockdep/include/liblockdep/rwlock.h | 86 ++++ tools/lib/lockdep/lockdep | 3 + tools/lib/lockdep/lockdep.c | 2 + tools/lib/lockdep/lockdep_internals.h | 1 + tools/lib/lockdep/lockdep_states.h | 1 + tools/lib/lockdep/preload.c | 447 +++++++++++++++++++++ tools/lib/lockdep/rbtree.c | 1 + tools/lib/lockdep/run_tests.sh | 27 ++ tools/lib/lockdep/tests/AA.c | 13 + tools/lib/lockdep/tests/ABBA.c | 13 + tools/lib/lockdep/tests/ABBCCA.c | 15 + tools/lib/lockdep/tests/ABBCCDDA.c | 17 + tools/lib/lockdep/tests/ABCABC.c | 15 + tools/lib/lockdep/tests/ABCDBCDA.c | 17 + tools/lib/lockdep/tests/ABCDBDDA.c | 17 + tools/lib/lockdep/tests/WW.c | 13 + tools/lib/lockdep/tests/common.h | 12 + tools/lib/lockdep/tests/unlock_balance.c | 12 + tools/lib/lockdep/uinclude/asm/hweight.h | 0 tools/lib/lockdep/uinclude/asm/sections.h | 0 tools/lib/lockdep/uinclude/linux/bitops.h | 0 tools/lib/lockdep/uinclude/linux/compiler.h | 7 + tools/lib/lockdep/uinclude/linux/debug_locks.h | 12 + tools/lib/lockdep/uinclude/linux/delay.h | 0 tools/lib/lockdep/uinclude/linux/export.h | 7 + tools/lib/lockdep/uinclude/linux/ftrace.h | 0 tools/lib/lockdep/uinclude/linux/gfp.h | 0 tools/lib/lockdep/uinclude/linux/hardirq.h | 11 + tools/lib/lockdep/uinclude/linux/hash.h | 1 + tools/lib/lockdep/uinclude/linux/interrupt.h | 0 tools/lib/lockdep/uinclude/linux/irqflags.h | 38 ++ tools/lib/lockdep/uinclude/linux/kallsyms.h | 32 ++ tools/lib/lockdep/uinclude/linux/kern_levels.h | 25 ++ tools/lib/lockdep/uinclude/linux/kernel.h | 44 ++ tools/lib/lockdep/uinclude/linux/kmemcheck.h | 8 + tools/lib/lockdep/uinclude/linux/linkage.h | 0 tools/lib/lockdep/uinclude/linux/list.h | 1 + tools/lib/lockdep/uinclude/linux/lockdep.h | 55 +++ tools/lib/lockdep/uinclude/linux/mm_types.h | 0 tools/lib/lockdep/uinclude/linux/module.h | 6 + tools/lib/lockdep/uinclude/linux/mutex.h | 0 tools/lib/lockdep/uinclude/linux/poison.h | 1 + tools/lib/lockdep/uinclude/linux/prefetch.h | 6 + tools/lib/lockdep/uinclude/linux/proc_fs.h | 0 tools/lib/lockdep/uinclude/linux/rbtree.h | 1 + .../lib/lockdep/uinclude/linux/rbtree_augmented.h | 2 + tools/lib/lockdep/uinclude/linux/rcu.h | 16 + tools/lib/lockdep/uinclude/linux/seq_file.h | 0 tools/lib/lockdep/uinclude/linux/spinlock.h | 25 ++ tools/lib/lockdep/uinclude/linux/stacktrace.h | 32 ++ tools/lib/lockdep/uinclude/linux/stringify.h | 7 + tools/lib/lockdep/uinclude/linux/system.h | 0 tools/lib/lockdep/uinclude/linux/types.h | 58 +++ tools/lib/lockdep/uinclude/linux/util.h | 0 tools/lib/lockdep/uinclude/trace/events/lock.h | 0 61 files changed, 1520 insertions(+) create mode 100644 tools/lib/lockdep/Makefile create mode 100644 tools/lib/lockdep/common.c create mode 100644 tools/lib/lockdep/include/liblockdep/common.h create mode 100644 tools/lib/lockdep/include/liblockdep/mutex.h create mode 100644 tools/lib/lockdep/include/liblockdep/rwlock.h create mode 100755 tools/lib/lockdep/lockdep create mode 100644 tools/lib/lockdep/lockdep.c create mode 100644 tools/lib/lockdep/lockdep_internals.h create mode 100644 tools/lib/lockdep/lockdep_states.h create mode 100644 tools/lib/lockdep/preload.c create mode 100644 tools/lib/lockdep/rbtree.c create mode 100755 tools/lib/lockdep/run_tests.sh create mode 100644 tools/lib/lockdep/tests/AA.c create mode 100644 tools/lib/lockdep/tests/ABBA.c create mode 100644 tools/lib/lockdep/tests/ABBCCA.c create mode 100644 tools/lib/lockdep/tests/ABBCCDDA.c create mode 100644 tools/lib/lockdep/tests/ABCABC.c create mode 100644 tools/lib/lockdep/tests/ABCDBCDA.c create mode 100644 tools/lib/lockdep/tests/ABCDBDDA.c create mode 100644 tools/lib/lockdep/tests/WW.c create mode 100644 tools/lib/lockdep/tests/common.h create mode 100644 tools/lib/lockdep/tests/unlock_balance.c create mode 100644 tools/lib/lockdep/uinclude/asm/hweight.h create mode 100644 tools/lib/lockdep/uinclude/asm/sections.h create mode 100644 tools/lib/lockdep/uinclude/linux/bitops.h create mode 100644 tools/lib/lockdep/uinclude/linux/compiler.h create mode 100644 tools/lib/lockdep/uinclude/linux/debug_locks.h create mode 100644 tools/lib/lockdep/uinclude/linux/delay.h create mode 100644 tools/lib/lockdep/uinclude/linux/export.h create mode 100644 tools/lib/lockdep/uinclude/linux/ftrace.h create mode 100644 tools/lib/lockdep/uinclude/linux/gfp.h create mode 100644 tools/lib/lockdep/uinclude/linux/hardirq.h create mode 100644 tools/lib/lockdep/uinclude/linux/hash.h create mode 100644 tools/lib/lockdep/uinclude/linux/interrupt.h create mode 100644 tools/lib/lockdep/uinclude/linux/irqflags.h create mode 100644 tools/lib/lockdep/uinclude/linux/kallsyms.h create mode 100644 tools/lib/lockdep/uinclude/linux/kern_levels.h create mode 100644 tools/lib/lockdep/uinclude/linux/kernel.h create mode 100644 tools/lib/lockdep/uinclude/linux/kmemcheck.h create mode 100644 tools/lib/lockdep/uinclude/linux/linkage.h create mode 100644 tools/lib/lockdep/uinclude/linux/list.h create mode 100644 tools/lib/lockdep/uinclude/linux/lockdep.h create mode 100644 tools/lib/lockdep/uinclude/linux/mm_types.h create mode 100644 tools/lib/lockdep/uinclude/linux/module.h create mode 100644 tools/lib/lockdep/uinclude/linux/mutex.h create mode 100644 tools/lib/lockdep/uinclude/linux/poison.h create mode 100644 tools/lib/lockdep/uinclude/linux/prefetch.h create mode 100644 tools/lib/lockdep/uinclude/linux/proc_fs.h create mode 100644 tools/lib/lockdep/uinclude/linux/rbtree.h create mode 100644 tools/lib/lockdep/uinclude/linux/rbtree_augmented.h create mode 100644 tools/lib/lockdep/uinclude/linux/rcu.h create mode 100644 tools/lib/lockdep/uinclude/linux/seq_file.h create mode 100644 tools/lib/lockdep/uinclude/linux/spinlock.h create mode 100644 tools/lib/lockdep/uinclude/linux/stacktrace.h create mode 100644 tools/lib/lockdep/uinclude/linux/stringify.h create mode 100644 tools/lib/lockdep/uinclude/linux/system.h create mode 100644 tools/lib/lockdep/uinclude/linux/types.h create mode 100644 tools/lib/lockdep/uinclude/linux/util.h create mode 100644 tools/lib/lockdep/uinclude/trace/events/lock.h
Signature · 1 line
1.8.1.2
PATCH v5 1/9 lockdep: Be nice about building from userspace
Lockdep is an awesome piece of code which detects locking issues which are relevant both to userspace and kernelspace. We can easily make lockdep work in userspace since there is really no kernel spacific magic going on in the code.
All we need is to wrap two functions which are used by lockdep and are very kernel specific.
Doing that will allow tools located in tools/ to easily utilize lockdep's code for their own use.
--- kernel/lockdep.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/lockdep.c +4 -0
@@ -584,6 +584,7 @@ static int very_verbose(struct lock_class *class)/* * Is this the address of a static object: */ +#ifdef __KERNEL__static int static_obj (void *obj) { unsigned long start = (unsigned long) &_stext,
@@ -610,6 +611,7 @@ static int static_obj(void *obj)*/ return is_module_address(addr) || is_module_percpu_address(addr); } +#endif /* * To make lock name printouts unique, we calculate a unique
@@ -4114,6 +4116,7 @@ void debug_check_no_locks_held(struct task_struct *task)print_held_locks_bug (task); } +#ifdef __KERNEL__void debug_show_all_locks (void ) {struct task_struct *g, *p;
@@ -4171,6 +4174,7 @@ retry: read_unlock(&tasklist_lock); }EXPORT_SYMBOL_GPL (debug_show_all_locks); +#endif /* * Careful: only use this function if you are sure that
Signature · 1 line
1.8.1.2
PATCH v5 2/9 liblockdep: Wrap kernel/lockdep.c to allow usage from userspace
In reply to Sasha Levinkernel/lockdep.c deals with validating locking scenarios for various architectures supported by the kernel. There isn't anything kernel specific going on in lockdep, and when we compare userspace to other architectures that don't have to deal with irqs such as s390, they become all too similar.
We wrap kernel/lockdep.c and include/linux/lockdep.h with several headers which allow us to build and use lockdep from userspace. We don't touch the kernel code itself which means that any work done on lockdep in the kernel will automatically benefit userspace lockdep as well!
--- tools/lib/lockdep/Makefile | 251 +++++++++++++++++++++ tools/lib/lockdep/common.c | 33 +++ tools/lib/lockdep/lockdep.c | 2 + tools/lib/lockdep/lockdep_internals.h | 1 + tools/lib/lockdep/lockdep_states.h | 1 + tools/lib/lockdep/rbtree.c | 1 + tools/lib/lockdep/uinclude/asm/hweight.h | 0 tools/lib/lockdep/uinclude/asm/sections.h | 0 tools/lib/lockdep/uinclude/linux/bitops.h | 0 tools/lib/lockdep/uinclude/linux/compiler.h | 7 + tools/lib/lockdep/uinclude/linux/debug_locks.h | 12 + tools/lib/lockdep/uinclude/linux/delay.h | 0 tools/lib/lockdep/uinclude/linux/export.h | 7 + tools/lib/lockdep/uinclude/linux/ftrace.h | 0 tools/lib/lockdep/uinclude/linux/gfp.h | 0 tools/lib/lockdep/uinclude/linux/hardirq.h | 11 + tools/lib/lockdep/uinclude/linux/hash.h | 1 + tools/lib/lockdep/uinclude/linux/interrupt.h | 0 tools/lib/lockdep/uinclude/linux/irqflags.h | 38 ++++ tools/lib/lockdep/uinclude/linux/kallsyms.h | 32 +++ tools/lib/lockdep/uinclude/linux/kern_levels.h | 25 ++ tools/lib/lockdep/uinclude/linux/kernel.h | 44 ++++ tools/lib/lockdep/uinclude/linux/kmemcheck.h | 8 + tools/lib/lockdep/uinclude/linux/linkage.h | 0 tools/lib/lockdep/uinclude/linux/list.h | 1 + tools/lib/lockdep/uinclude/linux/lockdep.h | 55 +++++ tools/lib/lockdep/uinclude/linux/mm_types.h | 0 tools/lib/lockdep/uinclude/linux/module.h | 6 + tools/lib/lockdep/uinclude/linux/mutex.h | 0 tools/lib/lockdep/uinclude/linux/poison.h | 1 + tools/lib/lockdep/uinclude/linux/prefetch.h | 6 + tools/lib/lockdep/uinclude/linux/proc_fs.h | 0 tools/lib/lockdep/uinclude/linux/rbtree.h | 1 + .../lib/lockdep/uinclude/linux/rbtree_augmented.h | 2 + tools/lib/lockdep/uinclude/linux/rcu.h | 16 ++ tools/lib/lockdep/uinclude/linux/seq_file.h | 0 tools/lib/lockdep/uinclude/linux/spinlock.h | 25 ++ tools/lib/lockdep/uinclude/linux/stacktrace.h | 32 +++ tools/lib/lockdep/uinclude/linux/stringify.h | 7 + tools/lib/lockdep/uinclude/linux/system.h | 0 tools/lib/lockdep/uinclude/linux/types.h | 58 +++++ tools/lib/lockdep/uinclude/linux/util.h | 0 tools/lib/lockdep/uinclude/trace/events/lock.h | 0 43 files changed, 684 insertions(+) create mode 100644 tools/lib/lockdep/Makefile create mode 100644 tools/lib/lockdep/common.c create mode 100644 tools/lib/lockdep/lockdep.c create mode 100644 tools/lib/lockdep/lockdep_internals.h create mode 100644 tools/lib/lockdep/lockdep_states.h create mode 100644 tools/lib/lockdep/rbtree.c create mode 100644 tools/lib/lockdep/uinclude/asm/hweight.h create mode 100644 tools/lib/lockdep/uinclude/asm/sections.h create mode 100644 tools/lib/lockdep/uinclude/linux/bitops.h create mode 100644 tools/lib/lockdep/uinclude/linux/compiler.h create mode 100644 tools/lib/lockdep/uinclude/linux/debug_locks.h create mode 100644 tools/lib/lockdep/uinclude/linux/delay.h create mode 100644 tools/lib/lockdep/uinclude/linux/export.h create mode 100644 tools/lib/lockdep/uinclude/linux/ftrace.h create mode 100644 tools/lib/lockdep/uinclude/linux/gfp.h create mode 100644 tools/lib/lockdep/uinclude/linux/hardirq.h create mode 100644 tools/lib/lockdep/uinclude/linux/hash.h create mode 100644 tools/lib/lockdep/uinclude/linux/interrupt.h create mode 100644 tools/lib/lockdep/uinclude/linux/irqflags.h create mode 100644 tools/lib/lockdep/uinclude/linux/kallsyms.h create mode 100644 tools/lib/lockdep/uinclude/linux/kern_levels.h create mode 100644 tools/lib/lockdep/uinclude/linux/kernel.h create mode 100644 tools/lib/lockdep/uinclude/linux/kmemcheck.h create mode 100644 tools/lib/lockdep/uinclude/linux/linkage.h create mode 100644 tools/lib/lockdep/uinclude/linux/list.h create mode 100644 tools/lib/lockdep/uinclude/linux/lockdep.h create mode 100644 tools/lib/lockdep/uinclude/linux/mm_types.h create mode 100644 tools/lib/lockdep/uinclude/linux/module.h create mode 100644 tools/lib/lockdep/uinclude/linux/mutex.h create mode 100644 tools/lib/lockdep/uinclude/linux/poison.h create mode 100644 tools/lib/lockdep/uinclude/linux/prefetch.h create mode 100644 tools/lib/lockdep/uinclude/linux/proc_fs.h create mode 100644 tools/lib/lockdep/uinclude/linux/rbtree.h create mode 100644 tools/lib/lockdep/uinclude/linux/rbtree_augmented.h create mode 100644 tools/lib/lockdep/uinclude/linux/rcu.h create mode 100644 tools/lib/lockdep/uinclude/linux/seq_file.h create mode 100644 tools/lib/lockdep/uinclude/linux/spinlock.h create mode 100644 tools/lib/lockdep/uinclude/linux/stacktrace.h create mode 100644 tools/lib/lockdep/uinclude/linux/stringify.h create mode 100644 tools/lib/lockdep/uinclude/linux/system.h create mode 100644 tools/lib/lockdep/uinclude/linux/types.h create mode 100644 tools/lib/lockdep/uinclude/linux/util.h create mode 100644 tools/lib/lockdep/uinclude/trace/events/lock.h
tools/lib/lockdep/Makefile new file +251 -0
@@ -0,0 +1,251 @@ +# liblockdep version +LL_VERSION = 0 +LL_PATCHLEVEL = 0 +LL_EXTRAVERSION = 1 + +# file format version +FILE_VERSION = 1 + +MAKEFLAGS += --no-print-directory + + +# Makefiles suck: This macro sets a default value of $(2) for the +# variable named by $(1), unless the variable has been set by +# environment or command line. This is necessary for CC and AR +# because make sets default values, so the simpler ?= approach +# won't work as expected. +define allow-override + $(if $(or $(findstring environment,$(origin $(1))),\ + $(findstring command line,$(origin $(1)))),,\ + $(eval $(1) = $(2))) +endef + +# Allow setting CC and AR, or setting CROSS_COMPILE as a prefix. +$(call allow-override,CC,$(CROSS_COMPILE)gcc) +$(call allow-override,AR,$(CROSS_COMPILE)ar) + +INSTALL = install + +# Use DESTDIR for installing into a different root directory. +# This is useful for building a package. The program will be +# installed in this directory as if it was the root directory. +# Then the build tool can move it later. +DESTDIR ?= +DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))' + +prefix ?= /usr/local +libdir_relative = lib +libdir = $(prefix)/$(libdir_relative) +bindir_relative = bin +bindir = $(prefix)/$(bindir_relative) + +export DESTDIR DESTDIR_SQ INSTALL + +# copy a bit from Linux kbuild + +ifeq ("$(origin V)", "command line") + VERBOSE = $(V) +endif +ifndef VERBOSE + VERBOSE = 0 +endif + +ifeq ("$(origin O)", "command line") + BUILD_OUTPUT := $(O) +endif + +ifeq ($(BUILD_SRC),) +ifneq ($(BUILD_OUTPUT),) + +define build_output + $(if $(VERBOSE:1=),@)$(MAKE) -C $(BUILD_OUTPUT) \ + BUILD_SRC=$(CURDIR) -f $(CURDIR)/Makefile $1 +endef + +saved-output := $(BUILD_OUTPUT) +BUILD_OUTPUT := $(shell cd $(BUILD_OUTPUT) && /bin/pwd) +$(if $(BUILD_OUTPUT),, \ + $(error output directory "$(saved-output)" does not exist)) + +all: sub-make + +gui: force + $(call build_output, all_cmd) + +$(filter-out gui,$(MAKECMDGOALS)): sub-make + +sub-make: force + $(call build_output, $(MAKECMDGOALS)) + + +# Leave processing to above invocation of make +skip-makefile := 1 + +endif # BUILD_OUTPUT +endif # BUILD_SRC + +# We process the rest of the Makefile if this is the final invocation of make +ifeq ($(skip-makefile),) + +srctree := $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR)) +objtree := $(CURDIR) +src := $(srctree) +obj := $(objtree) + +export prefix libdir bindir src obj + +# Shell quotes +libdir_SQ = $(subst ','\'',$(libdir)) +bindir_SQ = $(subst ','\'',$(bindir)) + +LIB_FILE = liblockdep.a liblockdep.so +BIN_FILE = lockdep + +CONFIG_INCLUDES = +CONFIG_LIBS = +CONFIG_FLAGS = + +OBJ = $@ +N = + +export Q VERBOSE + +LIBLOCKDEP_VERSION = $(LL_VERSION).$(LL_PATCHLEVEL).$(LL_EXTRAVERSION) + +INCLUDES = -I. -I/usr/local/include -I./uinclude $(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 + +override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ) + +ifeq ($(VERBOSE),1) + Q = + print_compile = + print_app_build = + print_fpic_compile = + print_shared_lib_compile = + print_install = +else + Q = @ + print_compile = echo ' CC '$(OBJ); + print_app_build = echo ' BUILD '$(OBJ); + print_fpic_compile = echo ' CC FPIC '$(OBJ); + print_shared_lib_compile = echo ' BUILD SHARED LIB '$(OBJ); + print_static_lib_build = echo ' BUILD STATIC LIB '$(OBJ); + print_install = echo ' INSTALL '$1' to $(DESTDIR_SQ)$2'; +endif + +do_fpic_compile = \ + ($(print_fpic_compile) \ + $(CC) -c $(CFLAGS) $(EXT) -fPIC $< -o $@) + +do_app_build = \ + ($(print_app_build) \ + $(CC) $^ -rdynamic -o $@ $(CONFIG_LIBS) $(LIBS)) + +do_compile_shared_library = \ + ($(print_shared_lib_compile) \ + $(CC) --shared $^ -o $@ -lpthread -ldl) + +do_build_static_lib = \ + ($(print_static_lib_build) \ + $(RM) $@; $(AR) rcs $@ $^) + + +define do_compile + $(print_compile) \ + $(CC) -c $(CFLAGS) $(EXT) $< -o $(obj)/$@; +endef + +$(obj)/%.o: $(src)/%.c + $(Q)$(call do_compile) + +%.o: $(src)/%.c + $(Q)$(call do_compile) + +PEVENT_LIB_OBJS = common.o lockdep.o preload.o rbtree.o + +ALL_OBJS = $(PEVENT_LIB_OBJS) + +CMD_TARGETS = $(LIB_FILE) + +TARGETS = $(CMD_TARGETS) + + +all: all_cmd + +all_cmd: $(CMD_TARGETS) + +liblockdep.so: $(PEVENT_LIB_OBJS) + $(Q)$(do_compile_shared_library) + +liblockdep.a: $(PEVENT_LIB_OBJS) + $(Q)$(do_build_static_lib) + +$(PEVENT_LIB_OBJS): %.o: $(src)/%.c + $(Q)$(do_fpic_compile) + +## make deps + +all_objs := $(sort $(ALL_OBJS)) +all_deps := $(all_objs:%.o=.%.d) + +# let .d file also depends on the source and header files +define check_deps + @set -e; $(RM) $@; \ + $(CC) -MM $(CFLAGS) $< > $@.$$$$; \ + sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \ + $(RM) $@.$$$$ +endef + +$(all_deps): .%.d: $(src)/%.c + $(Q)$(call check_deps) + +$(all_objs) : %.o : .%.d + +dep_includes := $(wildcard $(all_deps)) + +ifneq ($(dep_includes),) + include $(dep_includes) +endif + +### Detect environment changes +TRACK_CFLAGS = $(subst ','\'',$(CFLAGS)):$(ARCH):$(CROSS_COMPILE) + +tags: force + $(RM) tags + find . -name '*.[ch]' | xargs ctags --extra=+f --c-kinds=+px \ + --regex-c++='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/' + +TAGS: force + $(RM) TAGS + find . -name '*.[ch]' | xargs etags \ + --regex='/_PE(\([^,)]*\).*/PEVENT_ERRNO__\1/' + +define do_install + $(print_install) \ + if [ ! -d '$(DESTDIR_SQ)$2' ]; then \ + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \ + fi; \ + $(INSTALL) $1 '$(DESTDIR_SQ)$2' +endef + +install_lib: all_cmd + $(Q)$(call do_install,$(LIB_FILE),$(libdir_SQ)) + $(Q)$(call do_install,$(BIN_FILE),$(bindir_SQ)) + +install: install_lib + +clean: + $(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d + $(RM) tags TAGS + +endif # skip-makefile + +PHONY += force +force: + +# Declare the contents of the .PHONY variable as phony. We keep that +# information in a variable so we can use it in if_changed and friends. +.PHONY: $(PHONY)
tools/lib/lockdep/common.c new file +33 -0
@@ -0,0 +1,33 @@ +#include <stddef.h> +#include <stdbool.h> +#include <linux/compiler.h> +#include <linux/lockdep.h> +#include <unistd.h> +#include <sys/syscall.h> + +static __threadstruct task_struct current_obj; + +/* lockdep wants these */ +bool debug_locks = true; +bool debug_locks_silent; + +__attribute__((constructor))static void liblockdep_init (void ) +{ +lockdep_init (); +} + +__attribute__((destructor))static void liblockdep_exit (void ) +{ +debug_check_no_locks_held (¤t_obj); +} + +struct task_struct *__curr (void ) +{ +if (current_obj.pid ==0 ) { +/* Makes lockdep output pretty */ +prctl (PR_GET_NAME , current_obj.comm); + current_obj.pid =syscall (__NR_gettid); + } + +return ¤t_obj; +}
tools/lib/lockdep/lockdep.c new file +2 -0
@@ -0,0 +1,2 @@ +#include <linux/lockdep.h> +#include "../../../kernel/lockdep.c"
tools/lib/lockdep/lockdep_internals.h new file +1 -0
@@ -0,0 +1 @@ +#include "../../../kernel/lockdep_internals.h"
tools/lib/lockdep/lockdep_states.h new file +1 -0
@@ -0,0 +1 @@ +#include "../../../kernel/lockdep_states.h"
tools/lib/lockdep/rbtree.c new file +1 -0
@@ -0,0 +1 @@ +#include "../../../lib/rbtree.c"
tools/lib/lockdep/uinclude/asm/hweight.h new file +0 -0
tools/lib/lockdep/uinclude/asm/sections.h new file +0 -0
tools/lib/lockdep/uinclude/linux/bitops.h new file +0 -0
tools/lib/lockdep/uinclude/linux/compiler.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifndef _LIBLOCKDEP_LINUX_COMPILER_H_ +#define _LIBLOCKDEP_LINUX_COMPILER_H_ + +#define __used __attribute__((__unused__)) +#define unlikely + +#endif
tools/lib/lockdep/uinclude/linux/debug_locks.h new file +12 -0
@@ -0,0 +1,12 @@ +#ifndef _LIBLOCKDEP_DEBUG_LOCKS_H_ +#define _LIBLOCKDEP_DEBUG_LOCKS_H_ + +#include <stddef.h> +#include <linux/compiler.h> + +#define DEBUG_LOCKS_WARN_ON (x) (x) + +extern bool debug_locks; +extern bool debug_locks_silent; + +#endif
tools/lib/lockdep/uinclude/linux/delay.h new file +0 -0
tools/lib/lockdep/uinclude/linux/export.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifndef _LIBLOCKDEP_LINUX_EXPORT_H_ +#define _LIBLOCKDEP_LINUX_EXPORT_H_ + +#define EXPORT_SYMBOL (sym) +#define EXPORT_SYMBOL_GPL (sym) + +#endif
tools/lib/lockdep/uinclude/linux/ftrace.h new file +0 -0
tools/lib/lockdep/uinclude/linux/gfp.h new file +0 -0
tools/lib/lockdep/uinclude/linux/hardirq.h new file +11 -0
@@ -0,0 +1,11 @@ +#ifndef _LIBLOCKDEP_LINUX_HARDIRQ_H_ +#define _LIBLOCKDEP_LINUX_HARDIRQ_H_ + +#define SOFTIRQ_BITS 0UL +#define HARDIRQ_BITS 0UL +#define SOFTIRQ_SHIFT 0UL +#define HARDIRQ_SHIFT 0UL +#define hardirq_count () 0UL +#define softirq_count () 0UL + +#endif
tools/lib/lockdep/uinclude/linux/hash.h new file +1 -0
@@ -0,0 +1 @@ +#include "../../../include/linux/hash.h"
tools/lib/lockdep/uinclude/linux/interrupt.h new file +0 -0
tools/lib/lockdep/uinclude/linux/irqflags.h new file +38 -0
@@ -0,0 +1,38 @@ +#ifndef _LIBLOCKDEP_LINUX_TRACE_IRQFLAGS_H_ +#define _LIBLOCKDEP_LINUX_TRACE_IRQFLAGS_H_ + +# define trace_hardirq_context (p) 0 +# define trace_softirq_context (p) 0 +# define trace_hardirqs_enabled (p) 0 +# define trace_softirqs_enabled (p) 0 +# define trace_hardirq_enter () do { } while (0) +# define trace_hardirq_exit () do { } while (0) +# define lockdep_softirq_enter () do { } while (0) +# define lockdep_softirq_exit () do { } while (0) +# define INIT_TRACE_IRQFLAGS + +# define stop_critical_timings () do { } while (0) +# define start_critical_timings () do { } while (0) + +#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_save_flags (flags) ((flags) = 0) +#define raw_irqs_disabled_flags (flags) do { } while (0) +#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_save_flags (flags) ((flags) = 0) +#define irqs_disabled () (1) +#define irqs_disabled_flags (flags) (0) +#define safe_halt () do { } while (0) + +#define trace_lock_release (x, y) +#define trace_lock_acquire (a, b, c, d, e, f, g) + +#endif
tools/lib/lockdep/uinclude/linux/kallsyms.h new file +32 -0
@@ -0,0 +1,32 @@ +#ifndef _LIBLOCKDEP_LINUX_KALLSYMS_H_ +#define _LIBLOCKDEP_LINUX_KALLSYMS_H_ + +#include <linux/kernel.h> +#include <stdio.h> + +#define KSYM_NAME_LEN 128 + +struct module ; + +static inline const char *kallsyms_lookup (unsigned long addr, +unsigned long *symbolsize, +unsigned long *offset, +char **modname,char *namebuf) +{ +return NULL ; +} + +#include <execinfo.h> +#include <stdlib.h> +static inline void print_ip_sym (unsigned long ip) +{ +char **name; + + name =backtrace_symbols ((void **)&ip,1 ); + +printf ("%s\n" , *name); + +free (name); +} + +#endif
tools/lib/lockdep/uinclude/linux/kern_levels.h new file +25 -0
@@ -0,0 +1,25 @@ +#ifndef __KERN_LEVELS_H__ +#define __KERN_LEVELS_H__ + +#define KERN_SOH ""/* ASCII Start Of Header */ +#define KERN_SOH_ASCII '' + +#define KERN_EMERG KERN_SOH ""/* system is unusable */ +#define KERN_ALERT KERN_SOH ""/* action must be taken immediately */ +#define KERN_CRIT KERN_SOH ""/* critical conditions */ +#define KERN_ERR KERN_SOH ""/* error conditions */ +#define KERN_WARNING KERN_SOH ""/* warning conditions */ +#define KERN_NOTICE KERN_SOH ""/* normal but significant condition */ +#define KERN_INFO KERN_SOH ""/* informational */ +#define KERN_DEBUG KERN_SOH ""/* debug-level messages */ + +#define KERN_DEFAULT KERN_SOH ""/* the default kernel loglevel */ + +/* +* Annotation for a "continued" line of log printout (only done after a +* line that had no enclosing \n). Only to be used by core/arch code +* during early bootup (a continued line is not SMP-safe otherwise). +*/ +#define KERN_CONT "" + +#endif
tools/lib/lockdep/uinclude/linux/kernel.h new file +44 -0
44 lines not on this page · raw message
tools/lib/lockdep/uinclude/linux/kmemcheck.h new file +8 -0
@@ -0,0 +1,8 @@ +#ifndef _LIBLOCKDEP_LINUX_KMEMCHECK_H_ +#define _LIBLOCKDEP_LINUX_KMEMCHECK_H_ + +static inline void kmemcheck_mark_initialized (void *address,unsigned int n) +{ +} + +#endif
tools/lib/lockdep/uinclude/linux/linkage.h new file +0 -0
tools/lib/lockdep/uinclude/linux/list.h new file +1 -0
@@ -0,0 +1 @@ +#include "../../../include/linux/list.h"
tools/lib/lockdep/uinclude/linux/lockdep.h new file +55 -0
55 lines not on this page · raw message
tools/lib/lockdep/uinclude/linux/mm_types.h new file +0 -0
tools/lib/lockdep/uinclude/linux/module.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef _LIBLOCKDEP_LINUX_MODULE_H_ +#define _LIBLOCKDEP_LINUX_MODULE_H_ + +#define module_param (name, type, perm) + +#endif
tools/lib/lockdep/uinclude/linux/mutex.h new file +0 -0
tools/lib/lockdep/uinclude/linux/poison.h new file +1 -0
@@ -0,0 +1 @@ +#include "../../../include/linux/poison.h"
tools/lib/lockdep/uinclude/linux/prefetch.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef _LIBLOCKDEP_LINUX_PREFETCH_H_ +#define _LIBLOCKDEP_LINUX_PREFETCH_H + +static inline void prefetch (void *a __attribute__((unused))) { } + +#endif
tools/lib/lockdep/uinclude/linux/proc_fs.h new file +0 -0
tools/lib/lockdep/uinclude/linux/rbtree.h new file +1 -0
@@ -0,0 +1 @@ +#include "../../../include/linux/rbtree.h"
tools/lib/lockdep/uinclude/linux/rbtree_augmented.h new file +2 -0
@@ -0,0 +1,2 @@ +#define __always_inline +#include "../../../include/linux/rbtree_augmented.h"
tools/lib/lockdep/uinclude/linux/rcu.h new file +16 -0
@@ -0,0 +1,16 @@ +#ifndef _LIBLOCKDEP_RCU_H_ +#define _LIBLOCKDEP_RCU_H_ + +int rcu_scheduler_active; + +static inline int rcu_lockdep_current_cpu_online (void ) +{ +return 1 ; +} + +static inline int rcu_is_cpu_idle (void ) +{ +return 1 ; +} + +#endif
tools/lib/lockdep/uinclude/linux/seq_file.h new file +0 -0
tools/lib/lockdep/uinclude/linux/spinlock.h new file +25 -0
@@ -0,0 +1,25 @@ +#ifndef _LIBLOCKDEP_SPINLOCK_H_ +#define _LIBLOCKDEP_SPINLOCK_H_ + +#include <pthread.h> +#include <stdbool.h> + +#define arch_spinlock_t pthread_mutex_t +#define __ARCH_SPIN_LOCK_UNLOCKED PTHREAD_MUTEX_INITIALIZER + +static inline void arch_spin_lock (arch_spinlock_t *mutex) +{ +pthread_mutex_lock (mutex); +} + +static inline void arch_spin_unlock (arch_spinlock_t *mutex) +{ +pthread_mutex_unlock (mutex); +} + +static inline bool arch_spin_is_locked (arch_spinlock_t *mutex) +{ +return true; +} + +#endif
tools/lib/lockdep/uinclude/linux/stacktrace.h new file +32 -0
@@ -0,0 +1,32 @@ +#ifndef _LIBLOCKDEP_LINUX_STACKTRACE_H_ +#define _LIBLOCKDEP_LINUX_STACKTRACE_H_ + +#include <execinfo.h> + +struct stack_trace { +unsigned int nr_entries, max_entries; +unsigned long *entries; +int skip; +}; + +static inline void print_stack_trace (struct stack_trace *trace,int spaces) +{ +backtrace_symbols_fd ((void **)trace->entries, trace->nr_entries,1 ); +} + +#define save_stack_trace (trace) \ + ((trace)->nr_entries = \ + backtrace((void **)(trace)->entries, (trace)->max_entries)) + +static inline int dump_stack (void ) +{ +void *array[64 ]; +size_t size; + + size =backtrace (array,64 ); +backtrace_symbols_fd (array, size,1 ); + +return 0 ; +} + +#endif
tools/lib/lockdep/uinclude/linux/stringify.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifndef _LIBLOCKDEP_LINUX_STRINGIFY_H_ +#define _LIBLOCKDEP_LINUX_STRINGIFY_H_ + +#define __stringify_1(x...) #x +#define __stringify(x...) __stringify_1(x) + +#endif
tools/lib/lockdep/uinclude/linux/system.h new file +0 -0
tools/lib/lockdep/uinclude/linux/types.h new file +58 -0
58 lines not on this page · raw message
tools/lib/lockdep/uinclude/linux/util.h new file +0 -0
tools/lib/lockdep/uinclude/trace/events/lock.h new file +0 -0
Signature · 1 line
1.8.1.2
tip-bot for Sasha Levin
merge bot[tip:core/locking] liblockdep: Wrap kernel/locking/ lockdep.c to allow usage from userspace
liblockdep: Wrap kernel/locking/lockdep.c to allow usage from userspace
Commit-ID: 5634bd7d2ab14fbf736b62b0788fb68e2cb0fde2 Gitweb: http://git.kernel.org/tip/5634bd7d2ab14fbf736b62b0788fb68e2cb0fde2 Author: Sasha Levin <[email protected]> AuthorDate: Thu, 13 Jun 2013 18:41:17 -0400 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 27 Nov 2013 11:55:21 +0100
liblockdep: Wrap kernel/locking/lockdep.c to allow usage from userspace
kernel/locking/lockdep.c deals with validating locking scenarios for various architectures supported by the kernel. There isn't anything kernel specific going on in lockdep, and when we compare userspace to other architectures that don't have to deal with irqs such as s390, they become all too similar.
We wrap kernel/locking/lockdep.c and include/linux/lockdep.h with several headers which allow us to build and use lockdep from userspace. We don't touch the kernel code itself which means that any work done on lockdep in the kernel will automatically benefit userspace lockdep as well!
--- tools/lib/lockdep/Makefile | 251 +++++++++++++++++++++ tools/lib/lockdep/common.c | 33 +++ tools/lib/lockdep/lockdep.c | 2 + tools/lib/lockdep/lockdep_internals.h | 1 + tools/lib/lockdep/lockdep_states.h | 1 + tools/lib/lockdep/rbtree.c | 1 + tools/lib/lockdep/uinclude/asm/hweight.h | 3 + tools/lib/lockdep/uinclude/asm/sections.h | 3 + tools/lib/lockdep/uinclude/linux/bitops.h | 3 + tools/lib/lockdep/uinclude/linux/compiler.h | 7 + tools/lib/lockdep/uinclude/linux/debug_locks.h | 12 + tools/lib/lockdep/uinclude/linux/delay.h | 3 + tools/lib/lockdep/uinclude/linux/export.h | 7 + tools/lib/lockdep/uinclude/linux/ftrace.h | 3 + tools/lib/lockdep/uinclude/linux/gfp.h | 3 + tools/lib/lockdep/uinclude/linux/hardirq.h | 11 + tools/lib/lockdep/uinclude/linux/hash.h | 1 + tools/lib/lockdep/uinclude/linux/interrupt.h | 3 + tools/lib/lockdep/uinclude/linux/irqflags.h | 38 ++++ tools/lib/lockdep/uinclude/linux/kallsyms.h | 32 +++ tools/lib/lockdep/uinclude/linux/kern_levels.h | 25 ++ tools/lib/lockdep/uinclude/linux/kernel.h | 44 ++++ tools/lib/lockdep/uinclude/linux/kmemcheck.h | 8 + tools/lib/lockdep/uinclude/linux/linkage.h | 3 + tools/lib/lockdep/uinclude/linux/list.h | 1 + tools/lib/lockdep/uinclude/linux/lockdep.h | 55 +++++ tools/lib/lockdep/uinclude/linux/module.h | 6 + tools/lib/lockdep/uinclude/linux/mutex.h | 3 + tools/lib/lockdep/uinclude/linux/poison.h | 1 + tools/lib/lockdep/uinclude/linux/prefetch.h | 6 + tools/lib/lockdep/uinclude/linux/proc_fs.h | 3 + tools/lib/lockdep/uinclude/linux/rbtree.h | 1 + .../lib/lockdep/uinclude/linux/rbtree_augmented.h | 2 + tools/lib/lockdep/uinclude/linux/rcu.h | 16 ++ tools/lib/lockdep/uinclude/linux/seq_file.h | 3 + tools/lib/lockdep/uinclude/linux/spinlock.h | 25 ++ tools/lib/lockdep/uinclude/linux/stacktrace.h | 32 +++ tools/lib/lockdep/uinclude/linux/stringify.h | 7 + tools/lib/lockdep/uinclude/linux/types.h | 58 +++++ tools/lib/lockdep/uinclude/trace/events/lock.h | 3 + 40 files changed, 720 insertions(+)
tools/lib/lockdep/Makefile new file +251 -0
@@ -0,0 +1,251 @@ +# liblockdep version +LL_VERSION = 0 +LL_PATCHLEVEL = 0 +LL_EXTRAVERSION = 1 + +# file format version +FILE_VERSION = 1 + +MAKEFLAGS += --no-print-directory + + +# Makefiles suck: This macro sets a default value of $(2) for the +# variable named by $(1), unless the variable has been set by +# environment or command line. This is necessary for CC and AR +# because make sets default values, so the simpler ?= approach +# won't work as expected. +define allow-override + $(if $(or $(findstring environment,$(origin $(1))),\ + $(findstring command line,$(origin $(1)))),,\ + $(eval $(1) = $(2))) +endef + +# Allow setting CC and AR, or setting CROSS_COMPILE as a prefix. +$(call allow-override,CC,$(CROSS_COMPILE)gcc) +$(call allow-override,AR,$(CROSS_COMPILE)ar) + +INSTALL = install + +# Use DESTDIR for installing into a different root directory. +# This is useful for building a package. The program will be +# installed in this directory as if it was the root directory. +# Then the build tool can move it later. +DESTDIR ?= +DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))' + +prefix ?= /usr/local +libdir_relative = lib +libdir = $(prefix)/$(libdir_relative) +bindir_relative = bin +bindir = $(prefix)/$(bindir_relative) + +export DESTDIR DESTDIR_SQ INSTALL + +# copy a bit from Linux kbuild + +ifeq ("$(origin V)", "command line") + VERBOSE = $(V) +endif +ifndef VERBOSE + VERBOSE = 0 +endif + +ifeq ("$(origin O)", "command line") + BUILD_OUTPUT := $(O) +endif + +ifeq ($(BUILD_SRC),) +ifneq ($(BUILD_OUTPUT),) + +define build_output + $(if $(VERBOSE:1=),@)$(MAKE) -C $(BUILD_OUTPUT) \ + BUILD_SRC=$(CURDIR) -f $(CURDIR)/Makefile $1 +endef + +saved-output := $(BUILD_OUTPUT) +BUILD_OUTPUT := $(shell cd $(BUILD_OUTPUT) && /bin/pwd) +$(if $(BUILD_OUTPUT),, \ + $(error output directory "$(saved-output)" does not exist)) + +all: sub-make + +gui: force + $(call build_output, all_cmd) + +$(filter-out gui,$(MAKECMDGOALS)): sub-make + +sub-make: force + $(call build_output, $(MAKECMDGOALS)) + + +# Leave processing to above invocation of make +skip-makefile := 1 + +endif # BUILD_OUTPUT +endif # BUILD_SRC + +# We process the rest of the Makefile if this is the final invocation of make +ifeq ($(skip-makefile),) + +srctree := $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR)) +objtree := $(CURDIR) +src := $(srctree) +obj := $(objtree) + +export prefix libdir bindir src obj + +# Shell quotes +libdir_SQ = $(subst ','\'',$(libdir)) +bindir_SQ = $(subst ','\'',$(bindir)) + +LIB_FILE = liblockdep.a liblockdep.so +BIN_FILE = lockdep + +CONFIG_INCLUDES = +CONFIG_LIBS = +CONFIG_FLAGS = + +OBJ = $@ +N = + +export Q VERBOSE + +LIBLOCKDEP_VERSION = $(LL_VERSION).$(LL_PATCHLEVEL).$(LL_EXTRAVERSION) + +INCLUDES = -I. -I/usr/local/include -I./uinclude $(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 + +override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ) + +ifeq ($(VERBOSE),1) + Q = + print_compile = + print_app_build = + print_fpic_compile = + print_shared_lib_compile = + print_install = +else + Q = @ + print_compile = echo ' CC '$(OBJ); + print_app_build = echo ' BUILD '$(OBJ); + print_fpic_compile = echo ' CC FPIC '$(OBJ); + print_shared_lib_compile = echo ' BUILD SHARED LIB '$(OBJ); + print_static_lib_build = echo ' BUILD STATIC LIB '$(OBJ); + print_install = echo ' INSTALL '$1' to $(DESTDIR_SQ)$2'; +endif + +do_fpic_compile = \ + ($(print_fpic_compile) \ + $(CC) -c $(CFLAGS) $(EXT) -fPIC $< -o $@) + +do_app_build = \ + ($(print_app_build) \ + $(CC) $^ -rdynamic -o $@ $(CONFIG_LIBS) $(LIBS)) + +do_compile_shared_library = \ + ($(print_shared_lib_compile) \ + $(CC) --shared $^ -o $@ -lpthread -ldl) + +do_build_static_lib = \ + ($(print_static_lib_build) \ + $(RM) $@; $(AR) rcs $@ $^) + + +define do_compile + $(print_compile) \ + $(CC) -c $(CFLAGS) $(EXT) $< -o $(obj)/$@; +endef + +$(obj)/%.o: $(src)/%.c + $(Q)$(call do_compile) + +%.o: $(src)/%.c + $(Q)$(call do_compile) + +PEVENT_LIB_OBJS = common.o lockdep.o preload.o rbtree.o + +ALL_OBJS = $(PEVENT_LIB_OBJS) + +CMD_TARGETS = $(LIB_FILE) + +TARGETS = $(CMD_TARGETS) + + +all: all_cmd + +all_cmd: $(CMD_TARGETS) + +liblockdep.so: $(PEVENT_LIB_OBJS) + $(Q)$(do_compile_shared_library) + +liblockdep.a: $(PEVENT_LIB_OBJS) + $(Q)$(do_build_static_lib) + +$(PEVENT_LIB_OBJS): %.o: $(src)/%.c + $(Q)$(do_fpic_compile) + +## make deps + +all_objs := $(sort $(ALL_OBJS)) +all_deps := $(all_objs:%.o=.%.d) + +# let .d file also depends on the source and header files +define check_deps + @set -e; $(RM) $@; \ + $(CC) -MM $(CFLAGS) $< > $@.$$$$; \ + sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \ + $(RM) $@.$$$$ +endef + +$(all_deps): .%.d: $(src)/%.c + $(Q)$(call check_deps) + +$(all_objs) : %.o : .%.d + +dep_includes := $(wildcard $(all_deps)) + +ifneq ($(dep_includes),) + include $(dep_includes) +endif + +### Detect environment changes +TRACK_CFLAGS = $(subst ','\'',$(CFLAGS)):$(ARCH):$(CROSS_COMPILE) + +tags: force + $(RM) tags + find . -name '*.[ch]' | xargs ctags --extra=+f --c-kinds=+px \ + --regex-c++='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/' + +TAGS: force + $(RM) TAGS + find . -name '*.[ch]' | xargs etags \ + --regex='/_PE(\([^,)]*\).*/PEVENT_ERRNO__\1/' + +define do_install + $(print_install) \ + if [ ! -d '$(DESTDIR_SQ)$2' ]; then \ + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \ + fi; \ + $(INSTALL) $1 '$(DESTDIR_SQ)$2' +endef + +install_lib: all_cmd + $(Q)$(call do_install,$(LIB_FILE),$(libdir_SQ)) + $(Q)$(call do_install,$(BIN_FILE),$(bindir_SQ)) + +install: install_lib + +clean: + $(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d + $(RM) tags TAGS + +endif # skip-makefile + +PHONY += force +force: + +# Declare the contents of the .PHONY variable as phony. We keep that +# information in a variable so we can use it in if_changed and friends. +.PHONY: $(PHONY)
tools/lib/lockdep/common.c new file +33 -0
@@ -0,0 +1,33 @@ +#include <stddef.h> +#include <stdbool.h> +#include <linux/compiler.h> +#include <linux/lockdep.h> +#include <unistd.h> +#include <sys/syscall.h> + +static __threadstruct task_struct current_obj; + +/* lockdep wants these */ +bool debug_locks = true; +bool debug_locks_silent; + +__attribute__((constructor))static void liblockdep_init (void ) +{ +lockdep_init (); +} + +__attribute__((destructor))static void liblockdep_exit (void ) +{ +debug_check_no_locks_held (¤t_obj); +} + +struct task_struct *__curr (void ) +{ +if (current_obj.pid ==0 ) { +/* Makes lockdep output pretty */ +prctl (PR_GET_NAME , current_obj.comm); + current_obj.pid =syscall (__NR_gettid); + } + +return ¤t_obj; +}
tools/lib/lockdep/lockdep.c new file +2 -0
@@ -0,0 +1,2 @@ +#include <linux/lockdep.h> +#include "../../../kernel/locking/lockdep.c"
tools/lib/lockdep/lockdep_internals.h new file +1 -0
@@ -0,0 +1 @@ +#include "../../../kernel/locking/lockdep_internals.h"
tools/lib/lockdep/lockdep_states.h new file +1 -0
@@ -0,0 +1 @@ +#include "../../../kernel/locking/lockdep_states.h"
tools/lib/lockdep/rbtree.c new file +1 -0
@@ -0,0 +1 @@ +#include "../../../lib/rbtree.c"
tools/lib/lockdep/uinclude/asm/hweight.h new file +3 -0
@@ -0,0 +1,3 @@ + +/* empty file */ +
tools/lib/lockdep/uinclude/asm/sections.h new file +3 -0
@@ -0,0 +1,3 @@ + +/* empty file */ +
tools/lib/lockdep/uinclude/linux/bitops.h new file +3 -0
@@ -0,0 +1,3 @@ + +/* empty file */ +
tools/lib/lockdep/uinclude/linux/compiler.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifndef _LIBLOCKDEP_LINUX_COMPILER_H_ +#define _LIBLOCKDEP_LINUX_COMPILER_H_ + +#define __used __attribute__((__unused__)) +#define unlikely + +#endif
tools/lib/lockdep/uinclude/linux/debug_locks.h new file +12 -0
@@ -0,0 +1,12 @@ +#ifndef _LIBLOCKDEP_DEBUG_LOCKS_H_ +#define _LIBLOCKDEP_DEBUG_LOCKS_H_ + +#include <stddef.h> +#include <linux/compiler.h> + +#define DEBUG_LOCKS_WARN_ON (x) (x) + +extern bool debug_locks; +extern bool debug_locks_silent; + +#endif
tools/lib/lockdep/uinclude/linux/delay.h new file +3 -0
@@ -0,0 +1,3 @@ + +/* empty file */ +
tools/lib/lockdep/uinclude/linux/export.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifndef _LIBLOCKDEP_LINUX_EXPORT_H_ +#define _LIBLOCKDEP_LINUX_EXPORT_H_ + +#define EXPORT_SYMBOL (sym) +#define EXPORT_SYMBOL_GPL (sym) + +#endif
tools/lib/lockdep/uinclude/linux/ftrace.h new file +3 -0
@@ -0,0 +1,3 @@ + +/* empty file */ +
tools/lib/lockdep/uinclude/linux/gfp.h new file +3 -0
@@ -0,0 +1,3 @@ + +/* empty file */ +
tools/lib/lockdep/uinclude/linux/hardirq.h new file +11 -0
@@ -0,0 +1,11 @@ +#ifndef _LIBLOCKDEP_LINUX_HARDIRQ_H_ +#define _LIBLOCKDEP_LINUX_HARDIRQ_H_ + +#define SOFTIRQ_BITS 0UL +#define HARDIRQ_BITS 0UL +#define SOFTIRQ_SHIFT 0UL +#define HARDIRQ_SHIFT 0UL +#define hardirq_count () 0UL +#define softirq_count () 0UL + +#endif
tools/lib/lockdep/uinclude/linux/hash.h new file +1 -0
@@ -0,0 +1 @@ +#include "../../../include/linux/hash.h"
tools/lib/lockdep/uinclude/linux/interrupt.h new file +3 -0
@@ -0,0 +1,3 @@ + +/* empty file */ +
tools/lib/lockdep/uinclude/linux/irqflags.h new file +38 -0
@@ -0,0 +1,38 @@ +#ifndef _LIBLOCKDEP_LINUX_TRACE_IRQFLAGS_H_ +#define _LIBLOCKDEP_LINUX_TRACE_IRQFLAGS_H_ + +# define trace_hardirq_context (p) 0 +# define trace_softirq_context (p) 0 +# define trace_hardirqs_enabled (p) 0 +# define trace_softirqs_enabled (p) 0 +# define trace_hardirq_enter () do { } while (0) +# define trace_hardirq_exit () do { } while (0) +# define lockdep_softirq_enter () do { } while (0) +# define lockdep_softirq_exit () do { } while (0) +# define INIT_TRACE_IRQFLAGS + +# define stop_critical_timings () do { } while (0) +# define start_critical_timings () do { } while (0) + +#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_save_flags (flags) ((flags) = 0) +#define raw_irqs_disabled_flags (flags) do { } while (0) +#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_save_flags (flags) ((flags) = 0) +#define irqs_disabled () (1) +#define irqs_disabled_flags (flags) (0) +#define safe_halt () do { } while (0) + +#define trace_lock_release (x, y) +#define trace_lock_acquire (a, b, c, d, e, f, g) + +#endif
tools/lib/lockdep/uinclude/linux/kallsyms.h new file +32 -0
@@ -0,0 +1,32 @@ +#ifndef _LIBLOCKDEP_LINUX_KALLSYMS_H_ +#define _LIBLOCKDEP_LINUX_KALLSYMS_H_ + +#include <linux/kernel.h> +#include <stdio.h> + +#define KSYM_NAME_LEN 128 + +struct module ; + +static inline const char *kallsyms_lookup (unsigned long addr, +unsigned long *symbolsize, +unsigned long *offset, +char **modname,char *namebuf) +{ +return NULL ; +} + +#include <execinfo.h> +#include <stdlib.h> +static inline void print_ip_sym (unsigned long ip) +{ +char **name; + + name =backtrace_symbols ((void **)&ip,1 ); + +printf ("%s\n" , *name); + +free (name); +} + +#endif
tools/lib/lockdep/uinclude/linux/kern_levels.h new file +25 -0
@@ -0,0 +1,25 @@ +#ifndef __KERN_LEVELS_H__ +#define __KERN_LEVELS_H__ + +#define KERN_SOH ""/* ASCII Start Of Header */ +#define KERN_SOH_ASCII '' + +#define KERN_EMERG KERN_SOH ""/* system is unusable */ +#define KERN_ALERT KERN_SOH ""/* action must be taken immediately */ +#define KERN_CRIT KERN_SOH ""/* critical conditions */ +#define KERN_ERR KERN_SOH ""/* error conditions */ +#define KERN_WARNING KERN_SOH ""/* warning conditions */ +#define KERN_NOTICE KERN_SOH ""/* normal but significant condition */ +#define KERN_INFO KERN_SOH ""/* informational */ +#define KERN_DEBUG KERN_SOH ""/* debug-level messages */ + +#define KERN_DEFAULT KERN_SOH ""/* the default kernel loglevel */ + +/* +* Annotation for a "continued" line of log printout (only done after a +* line that had no enclosing \n). Only to be used by core/arch code +* during early bootup (a continued line is not SMP-safe otherwise). +*/ +#define KERN_CONT "" + +#endif
tools/lib/lockdep/uinclude/linux/kernel.h new file +44 -0
44 lines not on this page · raw message
tools/lib/lockdep/uinclude/linux/kmemcheck.h new file +8 -0
@@ -0,0 +1,8 @@ +#ifndef _LIBLOCKDEP_LINUX_KMEMCHECK_H_ +#define _LIBLOCKDEP_LINUX_KMEMCHECK_H_ + +static inline void kmemcheck_mark_initialized (void *address,unsigned int n) +{ +} + +#endif
tools/lib/lockdep/uinclude/linux/linkage.h new file +3 -0
@@ -0,0 +1,3 @@ + +/* empty file */ +
tools/lib/lockdep/uinclude/linux/list.h new file +1 -0
@@ -0,0 +1 @@ +#include "../../../include/linux/list.h"
tools/lib/lockdep/uinclude/linux/lockdep.h new file +55 -0
55 lines not on this page · raw message
tools/lib/lockdep/uinclude/linux/module.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef _LIBLOCKDEP_LINUX_MODULE_H_ +#define _LIBLOCKDEP_LINUX_MODULE_H_ + +#define module_param (name, type, perm) + +#endif
tools/lib/lockdep/uinclude/linux/mutex.h new file +3 -0
@@ -0,0 +1,3 @@ + +/* empty file */ +
tools/lib/lockdep/uinclude/linux/poison.h new file +1 -0
@@ -0,0 +1 @@ +#include "../../../include/linux/poison.h"
tools/lib/lockdep/uinclude/linux/prefetch.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef _LIBLOCKDEP_LINUX_PREFETCH_H_ +#define _LIBLOCKDEP_LINUX_PREFETCH_H + +static inline void prefetch (void *a __attribute__((unused))) { } + +#endif
tools/lib/lockdep/uinclude/linux/proc_fs.h new file +3 -0
@@ -0,0 +1,3 @@ + +/* empty file */ +
tools/lib/lockdep/uinclude/linux/rbtree.h new file +1 -0
@@ -0,0 +1 @@ +#include "../../../include/linux/rbtree.h"
tools/lib/lockdep/uinclude/linux/rbtree_augmented.h new file +2 -0
@@ -0,0 +1,2 @@ +#define __always_inline +#include "../../../include/linux/rbtree_augmented.h"
tools/lib/lockdep/uinclude/linux/rcu.h new file +16 -0
@@ -0,0 +1,16 @@ +#ifndef _LIBLOCKDEP_RCU_H_ +#define _LIBLOCKDEP_RCU_H_ + +int rcu_scheduler_active; + +static inline int rcu_lockdep_current_cpu_online (void ) +{ +return 1 ; +} + +static inline int rcu_is_cpu_idle (void ) +{ +return 1 ; +} + +#endif
tools/lib/lockdep/uinclude/linux/seq_file.h new file +3 -0
@@ -0,0 +1,3 @@ + +/* empty file */ +
tools/lib/lockdep/uinclude/linux/spinlock.h new file +25 -0
@@ -0,0 +1,25 @@ +#ifndef _LIBLOCKDEP_SPINLOCK_H_ +#define _LIBLOCKDEP_SPINLOCK_H_ + +#include <pthread.h> +#include <stdbool.h> + +#define arch_spinlock_t pthread_mutex_t +#define __ARCH_SPIN_LOCK_UNLOCKED PTHREAD_MUTEX_INITIALIZER + +static inline void arch_spin_lock (arch_spinlock_t *mutex) +{ +pthread_mutex_lock (mutex); +} + +static inline void arch_spin_unlock (arch_spinlock_t *mutex) +{ +pthread_mutex_unlock (mutex); +} + +static inline bool arch_spin_is_locked (arch_spinlock_t *mutex) +{ +return true; +} + +#endif
tools/lib/lockdep/uinclude/linux/stacktrace.h new file +32 -0
@@ -0,0 +1,32 @@ +#ifndef _LIBLOCKDEP_LINUX_STACKTRACE_H_ +#define _LIBLOCKDEP_LINUX_STACKTRACE_H_ + +#include <execinfo.h> + +struct stack_trace { +unsigned int nr_entries, max_entries; +unsigned long *entries; +int skip; +}; + +static inline void print_stack_trace (struct stack_trace *trace,int spaces) +{ +backtrace_symbols_fd ((void **)trace->entries, trace->nr_entries,1 ); +} + +#define save_stack_trace (trace) \ + ((trace)->nr_entries = \ + backtrace((void **)(trace)->entries, (trace)->max_entries)) + +static inline int dump_stack (void ) +{ +void *array[64 ]; +size_t size; + + size =backtrace (array,64 ); +backtrace_symbols_fd (array, size,1 ); + +return 0 ; +} + +#endif
tools/lib/lockdep/uinclude/linux/stringify.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifndef _LIBLOCKDEP_LINUX_STRINGIFY_H_ +#define _LIBLOCKDEP_LINUX_STRINGIFY_H_ + +#define __stringify_1(x...) #x +#define __stringify(x...) __stringify_1(x) + +#endif
tools/lib/lockdep/uinclude/linux/types.h new file +58 -0
58 lines not on this page · raw message
tools/lib/lockdep/uinclude/trace/events/lock.h new file +3 -0
@@ -0,0 +1,3 @@ + +/* empty file */ +
PATCH v5 3/9 liblockdep: Add public headers for pthread_mutex_t implementation
In reply to Sasha LevinThese headers provide the same API as their pthread mutex counterparts.
The design here is to allow to easily switch to liblockdep lock validation just by adding a "liblockdep_" to pthread_mutex_*() calls, which means that it's easy to integrate liblockdep into existing codebases.
--- tools/lib/lockdep/include/liblockdep/common.h | 50 +++++++++++++++++++ tools/lib/lockdep/include/liblockdep/mutex.h | 70 +++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 tools/lib/lockdep/include/liblockdep/common.h create mode 100644 tools/lib/lockdep/include/liblockdep/mutex.h
tools/lib/lockdep/include/liblockdep/common.h new file +50 -0
@@ -0,0 +1,50 @@ +#ifndef _LIBLOCKDEP_COMMON_H +#define _LIBLOCKDEP_COMMON_H + +#include <pthread.h> + +#define NR_LOCKDEP_CACHING_CLASSES 2 +#define MAX_LOCKDEP_SUBCLASSES 8UL + +#ifndef CALLER_ADDR0 +#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0)) +#endif + +#ifndef _RET_IP_ +#define _RET_IP_ CALLER_ADDR0 +#endif + +#ifndef _THIS_IP_ +#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) +#endif + +struct lockdep_subclass_key { +char __one_byte; +}; + +struct lock_class_key { +struct lockdep_subclass_key subkeys[MAX_LOCKDEP_SUBCLASSES ]; +}; + +struct lockdep_map { +struct lock_class_key *key; +struct lock_class *class_cache[NR_LOCKDEP_CACHING_CLASSES ]; +const char *name; +#ifdef CONFIG_LOCK_STAT +int cpu; +unsigned long ip; +#endif +}; + +void lockdep_init_map (struct lockdep_map *lock,const char *name, +struct lock_class_key *key,int subclass); +void lock_acquire (struct lockdep_map *lock,unsigned int subclass, +int trylock,int read,int check, +struct lockdep_map *nest_lock,unsigned long ip); +void lock_release (struct lockdep_map *lock,int nested, +unsigned long ip); + +#define STATIC_LOCKDEP_MAP_INIT (_name, _key) \ + { .name = (_name), .key = (void *)(_key), } + +#endif
tools/lib/lockdep/include/liblockdep/mutex.h new file +70 -0
70 lines not on this page · raw message
Signature · 1 line
1.8.1.2
tip-bot for Sasha Levin
merge bot[tip:core/locking] liblockdep: Add public headers for pthread_mutex_t implementation
liblockdep: Add public headers for pthread_mutex_t implementation
Commit-ID: 45e6207464b59dca63c8a9a79a7befbbf6a68fdb Gitweb: http://git.kernel.org/tip/45e6207464b59dca63c8a9a79a7befbbf6a68fdb Author: Sasha Levin <[email protected]> AuthorDate: Thu, 13 Jun 2013 18:41:18 -0400 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 27 Nov 2013 11:55:22 +0100
liblockdep: Add public headers for pthread_mutex_t implementation
These headers provide the same API as their pthread mutex counterparts.
The design here is to allow to easily switch to liblockdep lock validation just by adding a "liblockdep_" to pthread_mutex_*() calls, which means that it's easy to integrate liblockdep into existing codebases.
--- tools/lib/lockdep/include/liblockdep/common.h | 50 +++++++++++++++++++ tools/lib/lockdep/include/liblockdep/mutex.h | 70 +++++++++++++++++++++++++++ 2 files changed, 120 insertions(+)
tools/lib/lockdep/include/liblockdep/common.h new file +50 -0
@@ -0,0 +1,50 @@ +#ifndef _LIBLOCKDEP_COMMON_H +#define _LIBLOCKDEP_COMMON_H + +#include <pthread.h> + +#define NR_LOCKDEP_CACHING_CLASSES 2 +#define MAX_LOCKDEP_SUBCLASSES 8UL + +#ifndef CALLER_ADDR0 +#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0)) +#endif + +#ifndef _RET_IP_ +#define _RET_IP_ CALLER_ADDR0 +#endif + +#ifndef _THIS_IP_ +#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) +#endif + +struct lockdep_subclass_key { +char __one_byte; +}; + +struct lock_class_key { +struct lockdep_subclass_key subkeys[MAX_LOCKDEP_SUBCLASSES ]; +}; + +struct lockdep_map { +struct lock_class_key *key; +struct lock_class *class_cache[NR_LOCKDEP_CACHING_CLASSES ]; +const char *name; +#ifdef CONFIG_LOCK_STAT +int cpu; +unsigned long ip; +#endif +}; + +void lockdep_init_map (struct lockdep_map *lock,const char *name, +struct lock_class_key *key,int subclass); +void lock_acquire (struct lockdep_map *lock,unsigned int subclass, +int trylock,int read,int check, +struct lockdep_map *nest_lock,unsigned long ip); +void lock_release (struct lockdep_map *lock,int nested, +unsigned long ip); + +#define STATIC_LOCKDEP_MAP_INIT (_name, _key) \ + { .name = (_name), .key = (void *)(_key), } + +#endif
tools/lib/lockdep/include/liblockdep/mutex.h new file +70 -0
70 lines not on this page · raw message
PATCH v5 4/9 liblockdep: Add pthread_mutex_t test suite
In reply to Sasha LevinThis is a rather simple and basic test suite to test common locking issues.
Beyond tests, it also shows how to use the library.
--- tools/lib/lockdep/run_tests.sh | 27 +++++++++++++++++++++++++++ tools/lib/lockdep/tests/AA.c | 13 +++++++++++++ tools/lib/lockdep/tests/ABBA.c | 13 +++++++++++++ tools/lib/lockdep/tests/ABBCCA.c | 15 +++++++++++++++ tools/lib/lockdep/tests/ABBCCDDA.c | 17 +++++++++++++++++ tools/lib/lockdep/tests/ABCABC.c | 15 +++++++++++++++ tools/lib/lockdep/tests/ABCDBCDA.c | 17 +++++++++++++++++ tools/lib/lockdep/tests/ABCDBDDA.c | 17 +++++++++++++++++ tools/lib/lockdep/tests/common.h | 12 ++++++++++++ tools/lib/lockdep/tests/unlock_balance.c | 12 ++++++++++++ 10 files changed, 158 insertions(+) create mode 100755 tools/lib/lockdep/run_tests.sh create mode 100644 tools/lib/lockdep/tests/AA.c create mode 100644 tools/lib/lockdep/tests/ABBA.c create mode 100644 tools/lib/lockdep/tests/ABBCCA.c create mode 100644 tools/lib/lockdep/tests/ABBCCDDA.c create mode 100644 tools/lib/lockdep/tests/ABCABC.c create mode 100644 tools/lib/lockdep/tests/ABCDBCDA.c create mode 100644 tools/lib/lockdep/tests/ABCDBDDA.c create mode 100644 tools/lib/lockdep/tests/common.h create mode 100644 tools/lib/lockdep/tests/unlock_balance.c
tools/lib/lockdep/run_tests.sh new file +27 -0
@@ -0,0 +1,27 @@ +#! /bin/bash + +make &> /dev/null + +for i in `ls tests/*.c`; do + testname=$(basename -s .c "$i") + gcc -o tests/$testname -pthread -lpthread $i liblockdep.a -Iinclude -D__USE_LIBLOCKDEP &> /dev/null + echo -ne "$testname... " + if [ $(timeout 1 ./tests/$testname | wc -l) -gt 0 ]; then + echo "PASSED!" + else + echo "FAILED!" + fi + rm tests/$testname +done + +for i in `ls tests/*.c`; do + testname=$(basename -s .c "$i") + gcc -o tests/$testname -pthread -lpthread -Iinclude $i &> /dev/null + echo -ne "(PRELOAD) $testname... " + if [ $(timeout 1 ./lockdep ./tests/$testname | wc -l) -gt 0 ]; then + echo "PASSED!" + else + echo "FAILED!" + fi + rm tests/$testname +done
tools/lib/lockdep/tests/AA.c new file +13 -0
@@ -0,0 +1,13 @@ +#include <liblockdep/mutex.h> + +void main (void ) +{ +pthread_mutex_t a, b; + +pthread_mutex_init (&a,NULL ); +pthread_mutex_init (&b,NULL ); + +pthread_mutex_lock (&a); +pthread_mutex_lock (&b); +pthread_mutex_lock (&a); +}
tools/lib/lockdep/tests/ABBA.c new file +13 -0
@@ -0,0 +1,13 @@ +#include <liblockdep/mutex.h> +#include "common.h" + +void main (void ) +{ +pthread_mutex_t a, b; + +pthread_mutex_init (&a,NULL ); +pthread_mutex_init (&b,NULL ); + +LOCK_UNLOCK_2 (a, b); +LOCK_UNLOCK_2 (b, a); +}
tools/lib/lockdep/tests/ABBCCA.c new file +15 -0
@@ -0,0 +1,15 @@ +#include <liblockdep/mutex.h> +#include "common.h" + +void main (void ) +{ +pthread_mutex_t a, b, c; + +pthread_mutex_init (&a,NULL ); +pthread_mutex_init (&b,NULL ); +pthread_mutex_init (&c,NULL ); + +LOCK_UNLOCK_2 (a, b); +LOCK_UNLOCK_2 (b, c); +LOCK_UNLOCK_2 (c, a); +}
tools/lib/lockdep/tests/ABBCCDDA.c new file +17 -0
@@ -0,0 +1,17 @@ +#include <liblockdep/mutex.h> +#include "common.h" + +void main (void ) +{ +pthread_mutex_t a, b, c, d; + +pthread_mutex_init (&a,NULL ); +pthread_mutex_init (&b,NULL ); +pthread_mutex_init (&c,NULL ); +pthread_mutex_init (&d,NULL ); + +LOCK_UNLOCK_2 (a, b); +LOCK_UNLOCK_2 (b, c); +LOCK_UNLOCK_2 (c, d); +LOCK_UNLOCK_2 (d, a); +}
tools/lib/lockdep/tests/ABCABC.c new file +15 -0
@@ -0,0 +1,15 @@ +#include <liblockdep/mutex.h> +#include "common.h" + +void main (void ) +{ +pthread_mutex_t a, b, c; + +pthread_mutex_init (&a,NULL ); +pthread_mutex_init (&b,NULL ); +pthread_mutex_init (&c,NULL ); + +LOCK_UNLOCK_2 (a, b); +LOCK_UNLOCK_2 (c, a); +LOCK_UNLOCK_2 (b, c); +}
tools/lib/lockdep/tests/ABCDBCDA.c new file +17 -0
@@ -0,0 +1,17 @@ +#include <liblockdep/mutex.h> +#include "common.h" + +void main (void ) +{ +pthread_mutex_t a, b, c, d; + +pthread_mutex_init (&a,NULL ); +pthread_mutex_init (&b,NULL ); +pthread_mutex_init (&c,NULL ); +pthread_mutex_init (&d,NULL ); + +LOCK_UNLOCK_2 (a, b); +LOCK_UNLOCK_2 (c, d); +LOCK_UNLOCK_2 (b, c); +LOCK_UNLOCK_2 (d, a); +}
tools/lib/lockdep/tests/ABCDBDDA.c new file +17 -0
@@ -0,0 +1,17 @@ +#include <liblockdep/mutex.h> +#include "common.h" + +void main (void ) +{ +pthread_mutex_t a, b, c, d; + +pthread_mutex_init (&a,NULL ); +pthread_mutex_init (&b,NULL ); +pthread_mutex_init (&c,NULL ); +pthread_mutex_init (&d,NULL ); + +LOCK_UNLOCK_2 (a, b); +LOCK_UNLOCK_2 (c, d); +LOCK_UNLOCK_2 (b, d); +LOCK_UNLOCK_2 (d, a); +}
tools/lib/lockdep/tests/common.h new file +12 -0
@@ -0,0 +1,12 @@ +#ifndef _LIBLOCKDEP_TEST_COMMON_H +#define _LIBLOCKDEP_TEST_COMMON_H + +#define LOCK_UNLOCK_2 (a, b) \ + do { \ + pthread_mutex_lock(&(a)); \ + pthread_mutex_lock(&(b)); \ + pthread_mutex_unlock(&(b)); \ + pthread_mutex_unlock(&(a)); \ + } while(0) + +#endif
tools/lib/lockdep/tests/unlock_balance.c new file +12 -0
@@ -0,0 +1,12 @@ +#include <liblockdep/mutex.h> + +void main (void ) +{ +pthread_mutex_t a; + +pthread_mutex_init (&a,NULL ); + +pthread_mutex_lock (&a); +pthread_mutex_unlock (&a); +pthread_mutex_unlock (&a); +}
Signature · 1 line
1.8.1.2
tip-bot for Sasha Levin
merge bot[tip:core/locking] liblockdep: Add pthread_mutex_t test suite
liblockdep: Add pthread_mutex_t test suite
Commit-ID: 878f968eeb852383ff79dc3f181db24e5b52fd75 Gitweb: http://git.kernel.org/tip/878f968eeb852383ff79dc3f181db24e5b52fd75 Author: Sasha Levin <[email protected]> AuthorDate: Thu, 13 Jun 2013 18:41:19 -0400 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 27 Nov 2013 11:55:22 +0100
liblockdep: Add pthread_mutex_t test suite
This is a rather simple and basic test suite to test common locking issues.
Beyond tests, it also shows how to use the library.
--- tools/lib/lockdep/run_tests.sh | 27 +++++++++++++++++++++++++++ tools/lib/lockdep/tests/AA.c | 13 +++++++++++++ tools/lib/lockdep/tests/ABBA.c | 13 +++++++++++++ tools/lib/lockdep/tests/ABBCCA.c | 15 +++++++++++++++ tools/lib/lockdep/tests/ABBCCDDA.c | 17 +++++++++++++++++ tools/lib/lockdep/tests/ABCABC.c | 15 +++++++++++++++ tools/lib/lockdep/tests/ABCDBCDA.c | 17 +++++++++++++++++ tools/lib/lockdep/tests/ABCDBDDA.c | 17 +++++++++++++++++ tools/lib/lockdep/tests/common.h | 12 ++++++++++++ tools/lib/lockdep/tests/unlock_balance.c | 12 ++++++++++++ 10 files changed, 158 insertions(+)
tools/lib/lockdep/run_tests.sh new file +27 -0
@@ -0,0 +1,27 @@ +#! /bin/bash + +make &> /dev/null + +for i in `ls tests/*.c`; do + testname=$(basename -s .c "$i") + gcc -o tests/$testname -pthread -lpthread $i liblockdep.a -Iinclude -D__USE_LIBLOCKDEP &> /dev/null + echo -ne "$testname... " + if [ $(timeout 1 ./tests/$testname | wc -l) -gt 0 ]; then + echo "PASSED!" + else + echo "FAILED!" + fi + rm tests/$testname +done + +for i in `ls tests/*.c`; do + testname=$(basename -s .c "$i") + gcc -o tests/$testname -pthread -lpthread -Iinclude $i &> /dev/null + echo -ne "(PRELOAD) $testname... " + if [ $(timeout 1 ./lockdep ./tests/$testname | wc -l) -gt 0 ]; then + echo "PASSED!" + else + echo "FAILED!" + fi + rm tests/$testname +done
tools/lib/lockdep/tests/AA.c new file +13 -0
@@ -0,0 +1,13 @@ +#include <liblockdep/mutex.h> + +void main (void ) +{ +pthread_mutex_t a, b; + +pthread_mutex_init (&a,NULL ); +pthread_mutex_init (&b,NULL ); + +pthread_mutex_lock (&a); +pthread_mutex_lock (&b); +pthread_mutex_lock (&a); +}
tools/lib/lockdep/tests/ABBA.c new file +13 -0
@@ -0,0 +1,13 @@ +#include <liblockdep/mutex.h> +#include "common.h" + +void main (void ) +{ +pthread_mutex_t a, b; + +pthread_mutex_init (&a,NULL ); +pthread_mutex_init (&b,NULL ); + +LOCK_UNLOCK_2 (a, b); +LOCK_UNLOCK_2 (b, a); +}
tools/lib/lockdep/tests/ABBCCA.c new file +15 -0
@@ -0,0 +1,15 @@ +#include <liblockdep/mutex.h> +#include "common.h" + +void main (void ) +{ +pthread_mutex_t a, b, c; + +pthread_mutex_init (&a,NULL ); +pthread_mutex_init (&b,NULL ); +pthread_mutex_init (&c,NULL ); + +LOCK_UNLOCK_2 (a, b); +LOCK_UNLOCK_2 (b, c); +LOCK_UNLOCK_2 (c, a); +}
tools/lib/lockdep/tests/ABBCCDDA.c new file +17 -0
@@ -0,0 +1,17 @@ +#include <liblockdep/mutex.h> +#include "common.h" + +void main (void ) +{ +pthread_mutex_t a, b, c, d; + +pthread_mutex_init (&a,NULL ); +pthread_mutex_init (&b,NULL ); +pthread_mutex_init (&c,NULL ); +pthread_mutex_init (&d,NULL ); + +LOCK_UNLOCK_2 (a, b); +LOCK_UNLOCK_2 (b, c); +LOCK_UNLOCK_2 (c, d); +LOCK_UNLOCK_2 (d, a); +}
tools/lib/lockdep/tests/ABCABC.c new file +15 -0
@@ -0,0 +1,15 @@ +#include <liblockdep/mutex.h> +#include "common.h" + +void main (void ) +{ +pthread_mutex_t a, b, c; + +pthread_mutex_init (&a,NULL ); +pthread_mutex_init (&b,NULL ); +pthread_mutex_init (&c,NULL ); + +LOCK_UNLOCK_2 (a, b); +LOCK_UNLOCK_2 (c, a); +LOCK_UNLOCK_2 (b, c); +}
tools/lib/lockdep/tests/ABCDBCDA.c new file +17 -0
@@ -0,0 +1,17 @@ +#include <liblockdep/mutex.h> +#include "common.h" + +void main (void ) +{ +pthread_mutex_t a, b, c, d; + +pthread_mutex_init (&a,NULL ); +pthread_mutex_init (&b,NULL ); +pthread_mutex_init (&c,NULL ); +pthread_mutex_init (&d,NULL ); + +LOCK_UNLOCK_2 (a, b); +LOCK_UNLOCK_2 (c, d); +LOCK_UNLOCK_2 (b, c); +LOCK_UNLOCK_2 (d, a); +}
tools/lib/lockdep/tests/ABCDBDDA.c new file +17 -0
@@ -0,0 +1,17 @@ +#include <liblockdep/mutex.h> +#include "common.h" + +void main (void ) +{ +pthread_mutex_t a, b, c, d; + +pthread_mutex_init (&a,NULL ); +pthread_mutex_init (&b,NULL ); +pthread_mutex_init (&c,NULL ); +pthread_mutex_init (&d,NULL ); + +LOCK_UNLOCK_2 (a, b); +LOCK_UNLOCK_2 (c, d); +LOCK_UNLOCK_2 (b, d); +LOCK_UNLOCK_2 (d, a); +}
tools/lib/lockdep/tests/common.h new file +12 -0
@@ -0,0 +1,12 @@ +#ifndef _LIBLOCKDEP_TEST_COMMON_H +#define _LIBLOCKDEP_TEST_COMMON_H + +#define LOCK_UNLOCK_2 (a, b) \ + do { \ + pthread_mutex_lock(&(a)); \ + pthread_mutex_lock(&(b)); \ + pthread_mutex_unlock(&(b)); \ + pthread_mutex_unlock(&(a)); \ + } while(0) + +#endif
tools/lib/lockdep/tests/unlock_balance.c new file +12 -0
@@ -0,0 +1,12 @@ +#include <liblockdep/mutex.h> + +void main (void ) +{ +pthread_mutex_t a; + +pthread_mutex_init (&a,NULL ); + +pthread_mutex_lock (&a); +pthread_mutex_unlock (&a); +pthread_mutex_unlock (&a); +}
PATCH v5 5/9 liblockdep: Add public headers for pthread_rwlock_t implementation
In reply to Sasha LevinBoth pthreads and lockdep support dealing with rwlocks, so here's the liblockdep implementation for those.
--- tools/lib/lockdep/include/liblockdep/rwlock.h | 86 +++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 tools/lib/lockdep/include/liblockdep/rwlock.h
tools/lib/lockdep/include/liblockdep/rwlock.h new file +86 -0
@@ -0,0 +1,86 @@ +#ifndef _LIBLOCKDEP_RWLOCK_H +#define _LIBLOCKDEP_RWLOCK_H + +#include <pthread.h> +#include "common.h" + +struct liblockdep_pthread_rwlock { +pthread_rwlock_t rwlock; +struct lockdep_map dep_map; +}; + +typedef struct liblockdep_pthread_rwlock liblockdep_pthread_rwlock_t ; + +#define LIBLOCKDEP_PTHREAD_RWLOCK_INITIALIZER (rwl) \ + (struct liblockdep_pthread_rwlock) { \ + .rwlock = PTHREAD_RWLOCK_INITIALIZER, \ + .dep_map = STATIC_LOCKDEP_MAP_INIT(#rwl, &((&(rwl))->dep_map)), \ +} + +static inline int __rwlock_init (liblockdep_pthread_rwlock_t *lock, +const char *name, +struct lock_class_key *key, +const pthread_rwlockattr_t *attr) +{ +lockdep_init_map (&lock->dep_map, name, key,0 ); + +return pthread_rwlock_init (&lock->rwlock, attr); +} + +#define liblockdep_pthread_rwlock_init (lock, attr) \ +({ \ + static struct lock_class_key __key; \ + \ + __rwlock_init((lock), #lock, &__key, (attr)); \ +}) + +static inline int liblockdep_pthread_rwlock_rdlock (liblockdep_pthread_rwlock_t *lock) +{ +lock_acquire (&lock->dep_map,0 ,0 ,2 ,2 ,NULL , (unsigned long )_RET_IP_); +return pthread_rwlock_rdlock (&lock->rwlock); + +} + +static inline int liblockdep_pthread_rwlock_unlock (liblockdep_pthread_rwlock_t *lock) +{ +lock_release (&lock->dep_map,0 , (unsigned long )_RET_IP_); +return pthread_rwlock_unlock (&lock->rwlock); +} + +static inline int liblockdep_pthread_rwlock_wrlock (liblockdep_pthread_rwlock_t *lock) +{ +lock_acquire (&lock->dep_map,0 ,0 ,0 ,2 ,NULL , (unsigned long )_RET_IP_); +return pthread_rwlock_wrlock (&lock->rwlock); +} + +static inline int liblockdep_pthread_rwlock_tryrdlock (liblockdep_pthread_rwlock_t *lock) +{ +lock_acquire (&lock->dep_map,0 ,1 ,2 ,2 ,NULL , (unsigned long )_RET_IP_); +return pthread_rwlock_tryrdlock (&lock->rwlock) ==0 ?1 :0 ; +} + +static inline int liblockdep_pthread_rwlock_trywlock (liblockdep_pthread_rwlock_t *lock) +{ +lock_acquire (&lock->dep_map,0 ,1 ,0 ,2 ,NULL , (unsigned long )_RET_IP_); +return pthread_rwlock_trywlock (&lock->rwlock) ==0 ?1 :0 ; +} + +static inline int liblockdep_rwlock_destroy (liblockdep_pthread_rwlock_t *lock) +{ +return pthread_rwlock_destroy (&lock->rwlock); +} + +#ifdef __USE_LIBLOCKDEP + +#define pthread_rwlock_t liblockdep_pthread_rwlock_t +#define pthread_rwlock_init liblockdep_pthread_rwlock_init +#define pthread_rwlock_rdlock liblockdep_pthread_rwlock_rdlock +#define pthread_rwlock_unlock liblockdep_pthread_rwlock_unlock +#define pthread_rwlock_wrlock liblockdep_pthread_rwlock_wrlock +#define pthread_rwlock_tryrdlock liblockdep_pthread_rwlock_tryrdlock +#define pthread_rwlock_trywlock liblockdep_pthread_rwlock_trywlock +#define pthread_rwlock_destroy liblockdep_rwlock_destroy + +#endif + +#endif
Signature · 1 line
1.8.1.2
tip-bot for Sasha Levin
merge bot[tip:core/locking] liblockdep: Add public headers for pthread_rwlock_t implementation
liblockdep: Add public headers for pthread_rwlock_t implementation
Commit-ID: 5a52c9b480e09a782618dbf08de57f9ca54c8b49 Gitweb: http://git.kernel.org/tip/5a52c9b480e09a782618dbf08de57f9ca54c8b49 Author: Sasha Levin <[email protected]> AuthorDate: Thu, 13 Jun 2013 18:41:20 -0400 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 27 Nov 2013 11:55:23 +0100
liblockdep: Add public headers for pthread_rwlock_t implementation
Both pthreads and lockdep support dealing with rwlocks, so here's the liblockdep implementation for those.
--- tools/lib/lockdep/include/liblockdep/rwlock.h | 86 +++++++++++++++++++++++++++ 1 file changed, 86 insertions(+)
tools/lib/lockdep/include/liblockdep/rwlock.h new file +86 -0
@@ -0,0 +1,86 @@ +#ifndef _LIBLOCKDEP_RWLOCK_H +#define _LIBLOCKDEP_RWLOCK_H + +#include <pthread.h> +#include "common.h" + +struct liblockdep_pthread_rwlock { +pthread_rwlock_t rwlock; +struct lockdep_map dep_map; +}; + +typedef struct liblockdep_pthread_rwlock liblockdep_pthread_rwlock_t ; + +#define LIBLOCKDEP_PTHREAD_RWLOCK_INITIALIZER (rwl) \ + (struct liblockdep_pthread_rwlock) { \ + .rwlock = PTHREAD_RWLOCK_INITIALIZER, \ + .dep_map = STATIC_LOCKDEP_MAP_INIT(#rwl, &((&(rwl))->dep_map)), \ +} + +static inline int __rwlock_init (liblockdep_pthread_rwlock_t *lock, +const char *name, +struct lock_class_key *key, +const pthread_rwlockattr_t *attr) +{ +lockdep_init_map (&lock->dep_map, name, key,0 ); + +return pthread_rwlock_init (&lock->rwlock, attr); +} + +#define liblockdep_pthread_rwlock_init (lock, attr) \ +({ \ + static struct lock_class_key __key; \ + \ + __rwlock_init((lock), #lock, &__key, (attr)); \ +}) + +static inline int liblockdep_pthread_rwlock_rdlock (liblockdep_pthread_rwlock_t *lock) +{ +lock_acquire (&lock->dep_map,0 ,0 ,2 ,2 ,NULL , (unsigned long )_RET_IP_); +return pthread_rwlock_rdlock (&lock->rwlock); + +} + +static inline int liblockdep_pthread_rwlock_unlock (liblockdep_pthread_rwlock_t *lock) +{ +lock_release (&lock->dep_map,0 , (unsigned long )_RET_IP_); +return pthread_rwlock_unlock (&lock->rwlock); +} + +static inline int liblockdep_pthread_rwlock_wrlock (liblockdep_pthread_rwlock_t *lock) +{ +lock_acquire (&lock->dep_map,0 ,0 ,0 ,2 ,NULL , (unsigned long )_RET_IP_); +return pthread_rwlock_wrlock (&lock->rwlock); +} + +static inline int liblockdep_pthread_rwlock_tryrdlock (liblockdep_pthread_rwlock_t *lock) +{ +lock_acquire (&lock->dep_map,0 ,1 ,2 ,2 ,NULL , (unsigned long )_RET_IP_); +return pthread_rwlock_tryrdlock (&lock->rwlock) ==0 ?1 :0 ; +} + +static inline int liblockdep_pthread_rwlock_trywlock (liblockdep_pthread_rwlock_t *lock) +{ +lock_acquire (&lock->dep_map,0 ,1 ,0 ,2 ,NULL , (unsigned long )_RET_IP_); +return pthread_rwlock_trywlock (&lock->rwlock) ==0 ?1 :0 ; +} + +static inline int liblockdep_rwlock_destroy (liblockdep_pthread_rwlock_t *lock) +{ +return pthread_rwlock_destroy (&lock->rwlock); +} + +#ifdef __USE_LIBLOCKDEP + +#define pthread_rwlock_t liblockdep_pthread_rwlock_t +#define pthread_rwlock_init liblockdep_pthread_rwlock_init +#define pthread_rwlock_rdlock liblockdep_pthread_rwlock_rdlock +#define pthread_rwlock_unlock liblockdep_pthread_rwlock_unlock +#define pthread_rwlock_wrlock liblockdep_pthread_rwlock_wrlock +#define pthread_rwlock_tryrdlock liblockdep_pthread_rwlock_tryrdlock +#define pthread_rwlock_trywlock liblockdep_pthread_rwlock_trywlock +#define pthread_rwlock_destroy liblockdep_rwlock_destroy + +#endif + +#endif
PATCH v5 6/9 liblockdep: Add pthread_rwlock_t test suite
In reply to Sasha LevinA simple test to make sure we handle rwlocks correctly.
--- tools/lib/lockdep/tests/WW.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 tools/lib/lockdep/tests/WW.c
tools/lib/lockdep/tests/WW.c new file +13 -0
@@ -0,0 +1,13 @@ +#include <liblockdep/rwlock.h> + +void main (void ) +{ +pthread_rwlock_t a, b; + +pthread_rwlock_init (&a,NULL ); +pthread_rwlock_init (&b,NULL ); + +pthread_rwlock_wrlock (&a); +pthread_rwlock_rdlock (&b); +pthread_rwlock_wrlock (&a); +}
Signature · 1 line
1.8.1.2
tip-bot for Sasha Levin
merge bot[tip:core/locking] liblockdep: Add pthread_rwlock_t test suite
liblockdep: Add pthread_rwlock_t test suite
Commit-ID: dbe941827eab53194eda5cd350a4e1414f192658 Gitweb: http://git.kernel.org/tip/dbe941827eab53194eda5cd350a4e1414f192658 Author: Sasha Levin <[email protected]> AuthorDate: Thu, 13 Jun 2013 18:41:21 -0400 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 27 Nov 2013 11:55:24 +0100
liblockdep: Add pthread_rwlock_t test suite
A simple test to make sure we handle rwlocks correctly.
--- tools/lib/lockdep/tests/WW.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
tools/lib/lockdep/tests/WW.c new file +13 -0
@@ -0,0 +1,13 @@ +#include <liblockdep/rwlock.h> + +void main (void ) +{ +pthread_rwlock_t a, b; + +pthread_rwlock_init (&a,NULL ); +pthread_rwlock_init (&b,NULL ); + +pthread_rwlock_wrlock (&a); +pthread_rwlock_rdlock (&b); +pthread_rwlock_wrlock (&a); +}
PATCH v5 7/9 liblockdep: Support using LD_PRELOAD
In reply to Sasha LevinThis allows lockdep to be used without being compiled in the original program.
Usage is quite simple:
LD_PRELOAD=/path/to/liblockdep.so /path/to/my/program
And magically, you'll have lockdep checking in your program!
--- tools/lib/lockdep/preload.c | 447 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 447 insertions(+) create mode 100644 tools/lib/lockdep/preload.c
tools/lib/lockdep/preload.c new file +447 -0
@@ -0,0 +1,447 @@ +#define _GNU_SOURCE +#include <pthread.h> +#include <stdio.h> +#include <dlfcn.h> +#include <stdlib.h> +#include <sysexits.h> +#include "include/liblockdep/mutex.h" +#include "../../../include/linux/rbtree.h" + +/** +* struct lock_lookup - liblockdep's view of a single unique lock +* @orig: pointer to the original pthread lock, used for lookups +* @dep_map: lockdep's dep_map structure +* @key: lockdep's key structure +* @node: rb-tree node used to store the lock in a global tree +* @name: a unique name for the lock +*/ +struct lock_lookup { +void *orig;/* Original pthread lock, used for lookups */ +struct lockdep_map dep_map;/* Since all locks are dynamic, we need +* a dep_map and a key for each lock */ +/* +* Wait, there's no support for key classes? Yup :( +* Most big projects wrap the pthread api with their own calls to +* be compatible with different locking methods. This means that +* "classes" will be brokes since the function that creates all +* locks will point to a generic locking function instead of the +* actual code that wants to do the locking. +*/ +struct lock_class_key key; +struct rb_node node; +#define LIBLOCKDEP_MAX_LOCK_NAME 22 +char name[LIBLOCKDEP_MAX_LOCK_NAME ]; +}; + +/* This is where we store our locks */ +static struct rb_root locks =RB_ROOT ; +static pthread_rwlock_t locks_rwlock =PTHREAD_RWLOCK_INITIALIZER ; + +/* pthread mutex API */ + +#ifdef __GLIBC__ +extern int __pthread_mutex_init (pthread_mutex_t *mutex,const pthread_mutexattr_t *attr); +extern int __pthread_mutex_lock (pthread_mutex_t *mutex); +extern int __pthread_mutex_trylock (pthread_mutex_t *mutex); +extern int __pthread_mutex_unlock (pthread_mutex_t *mutex); +extern int __pthread_mutex_destroy (pthread_mutex_t *mutex); +#else +#define __pthread_mutex_init NULL +#define __pthread_mutex_lock NULL +#define __pthread_mutex_trylock NULL +#define __pthread_mutex_unlock NULL +#define __pthread_mutex_destroy NULL +#endif +static int (*ll_pthread_mutex_init)(pthread_mutex_t *mutex, +const pthread_mutexattr_t *attr) = __pthread_mutex_init; +static int (*ll_pthread_mutex_lock)(pthread_mutex_t *mutex) = __pthread_mutex_lock; +static int (*ll_pthread_mutex_trylock)(pthread_mutex_t *mutex) = __pthread_mutex_trylock; +static int (*ll_pthread_mutex_unlock)(pthread_mutex_t *mutex) = __pthread_mutex_unlock; +static int (*ll_pthread_mutex_destroy)(pthread_mutex_t *mutex) = __pthread_mutex_destroy; + +/* pthread rwlock API */ + +#ifdef __GLIBC__ +extern int __pthread_rwlock_init (pthread_rwlock_t *rwlock,const pthread_rwlockattr_t *attr); +extern int __pthread_rwlock_destroy (pthread_rwlock_t *rwlock); +extern int __pthread_rwlock_wrlock (pthread_rwlock_t *rwlock); +extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock); +extern int __pthread_rwlock_rdlock (pthread_rwlock_t *rwlock); +extern int __pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock); +extern int __pthread_rwlock_unlock (pthread_rwlock_t *rwlock); +#else +#define __pthread_rwlock_init NULL +#define __pthread_rwlock_destroy NULL +#define __pthread_rwlock_wrlock NULL +#define __pthread_rwlock_trywrlock NULL +#define __pthread_rwlock_rdlock NULL +#define __pthread_rwlock_tryrdlock NULL +#define __pthread_rwlock_unlock NULL +#endif + +static int (*ll_pthread_rwlock_init)(pthread_rwlock_t *rwlock, +const pthread_rwlockattr_t *attr) = __pthread_rwlock_init; +static int (*ll_pthread_rwlock_destroy)(pthread_rwlock_t *rwlock) = __pthread_rwlock_destroy; +static int (*ll_pthread_rwlock_rdlock)(pthread_rwlock_t *rwlock) = __pthread_rwlock_rdlock; +static int (*ll_pthread_rwlock_tryrdlock)(pthread_rwlock_t *rwlock) = __pthread_rwlock_tryrdlock; +static int (*ll_pthread_rwlock_trywrlock)(pthread_rwlock_t *rwlock) = __pthread_rwlock_trywrlock; +static int (*ll_pthread_rwlock_wrlock)(pthread_rwlock_t *rwlock) = __pthread_rwlock_wrlock; +static int (*ll_pthread_rwlock_unlock)(pthread_rwlock_t *rwlock) = __pthread_rwlock_unlock; + +enum { none, prepare, done, } __init_state; +static void init_preload (void ); +static void try_init_preload (void ) +{ +if (!__init_state != done) +init_preload (); +} + +static struct rb_node **__get_lock_node (void *lock,struct rb_node **parent) +{ +struct rb_node **node = &locks.rb_node; +struct lock_lookup *l; + + *parent =NULL ; + +while (*node) { + l = rb_entry(*node, struct lock_lookup, node); + + *parent = *node; +if (lock < l->orig) + node = &l->node.rb_left; +else if (lock > l->orig) + node = &l->node.rb_right; +else +return node; + } + +return node; +} + +#ifndef LIBLOCKDEP_STATIC_ENTRIES +#define LIBLOCKDEP_STATIC_ENTRIES 1024 +#endif + +#define ARRAY_SIZE (arr) (sizeof(arr) / sizeof((arr)[0])) + +static struct lock_lookup __locks[LIBLOCKDEP_STATIC_ENTRIES ]; +static int __locks_nr; + +static inline bool is_static_lock (struct lock_lookup *lock) +{ +return lock >= __locks && lock < __locks +ARRAY_SIZE (__locks); +} + +static struct lock_lookup *alloc_lock (void ) +{ +if (__init_state != done) { +/* +* Some programs attempt to initialize and use locks in their +* allocation path. This means that a call to malloc() would +* result in locks being initialized and locked. +* +* Why is it an issue for us? dlsym() below will try allocating +* to give us the original function. Since this allocation will +* result in a locking operations, we have to let pthread deal +* with it, but we can't! we don't have the pointer to the +* original API since we're inside dlsym() trying to get it +*/ + +int idx = __locks_nr++; +if (idx >=ARRAY_SIZE (__locks)) { +fprintf (stderr, +"LOCKDEP error: insufficient LIBLOCKDEP_STATIC_ENTRIES\n" ); +exit (EX_UNAVAILABLE ); + } +return __locks + idx; + } + +return malloc (sizeof (struct lock_lookup )); +} + +static inline void free_lock (struct lock_lookup *lock) +{ +if (likely (!is_static_lock (lock))) +free (lock); +} + +/** +* __get_lock - find or create a lock instance +* @lock: pointer to a pthread lock function +* +* Try to find an existing lock in the rbtree using the provided pointer. If +* one wasn't found - create it. +*/ +static struct lock_lookup *__get_lock (void *lock) +{ +struct rb_node **node, *parent; +struct lock_lookup *l; + +ll_pthread_rwlock_rdlock (&locks_rwlock); + node =__get_lock_node (lock, &parent); +ll_pthread_rwlock_unlock (&locks_rwlock); +if (*node) { + return rb_entry(*node, struct lock_lookup, node); + } + +/* We didn't find the lock, let's create it */ + l =alloc_lock (); +if (l ==NULL ) +return NULL ; + + l->orig = lock; +/* +* Currently the name of the lock is the ptr value of the pthread lock, +* while not optimal, it makes debugging a bit easier. +* +* 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 ); + +ll_pthread_rwlock_wrlock (&locks_rwlock); +/* This might have changed since the last time we fetched it */ + node =__get_lock_node (lock, &parent); +rb_link_node (&l->node, parent, node); +rb_insert_color (&l->node, &locks); +ll_pthread_rwlock_unlock (&locks_rwlock); + +return l; +} + +static void __del_lock (struct lock_lookup *lock) +{ +ll_pthread_rwlock_wrlock (&locks_rwlock); +rb_erase (&lock->node, &locks); +ll_pthread_rwlock_unlock (&locks_rwlock); +free_lock (lock); +} + +int pthread_mutex_init (pthread_mutex_t *mutex, +const pthread_mutexattr_t *attr) +{ +int r; + +/* +* We keep trying to init our preload module because there might be +* code in init sections that tries to touch locks before we are +* initialized, in that case we'll need to manually call preload +* to get us going. +* +* Funny enough, kernel's lockdep had the same issue, and used +* (almost) the same solution. See look_up_lock_class() in +* kernel/lockdep.c for details. +*/ +try_init_preload (); + + r =ll_pthread_mutex_init (mutex, attr); +if (r ==0 ) +/* +* We do a dummy initialization here so that lockdep could +* warn us if something fishy is going on - such as +* initializing a held lock. +*/ +__get_lock (mutex); + +return r; +} + +int pthread_mutex_lock (pthread_mutex_t *mutex) +{ +int r; + +try_init_preload (); + +lock_acquire (&__get_lock (mutex)->dep_map,0 ,0 ,0 ,2 ,NULL , + (unsigned long )_RET_IP_); +/* +* Here's the thing with pthread mutexes: unlike the kernel variant, +* they can fail. +* +* This means that the behaviour here is a bit different from what's +* going on in the kernel: there we just tell lockdep that we took the +* lock before actually taking it, but here we must deal with the case +* that locking failed. +* +* To do that we'll "release" the lock if locking failed - this way +* we'll get lockdep doing the correct checks when we try to take +* the lock, and if that fails - we'll be back to the correct +* state by releasing it. +*/ + r =ll_pthread_mutex_lock (mutex); +if (r) +lock_release (&__get_lock (mutex)->dep_map,0 , (unsigned long )_RET_IP_); + +return r; +} + +int pthread_mutex_trylock (pthread_mutex_t *mutex) +{ +int r; + +try_init_preload (); + +lock_acquire (&__get_lock (mutex)->dep_map,0 ,1 ,0 ,2 ,NULL , (unsigned long )_RET_IP_); + r =ll_pthread_mutex_trylock (mutex); +if (r) +lock_release (&__get_lock (mutex)->dep_map,0 , (unsigned long )_RET_IP_); + +return r; +} + +int pthread_mutex_unlock (pthread_mutex_t *mutex) +{ +int r; + +try_init_preload (); + +lock_release (&__get_lock (mutex)->dep_map,0 , (unsigned long )_RET_IP_); +/* +* Just like taking a lock, only in reverse! +* +* If we fail releasing the lock, tell lockdep we're holding it again. +*/ + r =ll_pthread_mutex_unlock (mutex); +if (r) +lock_acquire (&__get_lock (mutex)->dep_map,0 ,0 ,0 ,2 ,NULL , (unsigned long )_RET_IP_); + +return r; +} + +int pthread_mutex_destroy (pthread_mutex_t *mutex) +{ +try_init_preload (); + +/* +* Let's see if we're releasing a lock that's held. +* +* TODO: Hook into free() and add that check there as well. +*/ +debug_check_no_locks_freed (mutex, mutex +sizeof (*mutex)); +__del_lock (__get_lock (mutex)); +return ll_pthread_mutex_destroy (mutex); +} + +/* This is the rwlock part, very similar to what happened with mutex above */ +int pthread_rwlock_init (pthread_rwlock_t *rwlock, +const pthread_rwlockattr_t *attr) +{ +int r; + +try_init_preload (); + + r =ll_pthread_rwlock_init (rwlock, attr); +if (r ==0 ) +__get_lock (rwlock); + +return r; +} + +int pthread_rwlock_destroy (pthread_rwlock_t *rwlock) +{ +try_init_preload (); + +debug_check_no_locks_freed (rwlock, rwlock +sizeof (*rwlock)); +__del_lock (__get_lock (rwlock)); +return ll_pthread_rwlock_destroy (rwlock); +} + +int pthread_rwlock_rdlock (pthread_rwlock_t *rwlock) +{ +int r; + +init_preload (); + +lock_acquire (&__get_lock (rwlock)->dep_map,0 ,0 ,2 ,2 ,NULL , (unsigned long )_RET_IP_); + r =ll_pthread_rwlock_rdlock (rwlock); +if (r) +lock_release (&__get_lock (rwlock)->dep_map,0 , (unsigned long )_RET_IP_); + +return r; +} + +int pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock) +{ +int r; + +init_preload (); + +lock_acquire (&__get_lock (rwlock)->dep_map,0 ,1 ,2 ,2 ,NULL , (unsigned long )_RET_IP_); + r =ll_pthread_rwlock_tryrdlock (rwlock); +if (r) +lock_release (&__get_lock (rwlock)->dep_map,0 , (unsigned long )_RET_IP_); + +return r; +} + +int pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock) +{ +int r; + +init_preload (); + +lock_acquire (&__get_lock (rwlock)->dep_map,0 ,1 ,0 ,2 ,NULL , (unsigned long )_RET_IP_); + r =ll_pthread_rwlock_trywrlock (rwlock); +if (r) +lock_release (&__get_lock (rwlock)->dep_map,0 , (unsigned long )_RET_IP_); + +return r; +} + +int pthread_rwlock_wrlock (pthread_rwlock_t *rwlock) +{ +int r; + +init_preload (); + +lock_acquire (&__get_lock (rwlock)->dep_map,0 ,0 ,0 ,2 ,NULL , (unsigned long )_RET_IP_); + r =ll_pthread_rwlock_wrlock (rwlock); +if (r) +lock_release (&__get_lock (rwlock)->dep_map,0 , (unsigned long )_RET_IP_); + +return r; +} + +int pthread_rwlock_unlock (pthread_rwlock_t *rwlock) +{ +int r; + +init_preload (); + +lock_release (&__get_lock (rwlock)->dep_map,0 , (unsigned long )_RET_IP_); + r =ll_pthread_rwlock_unlock (rwlock); +if (r) +lock_acquire (&__get_lock (rwlock)->dep_map,0 ,0 ,0 ,2 ,NULL , (unsigned long )_RET_IP_); + +return r; +} + +__attribute__((constructor))static void init_preload (void ) +{ +if (__init_state != done) +return ; + +#ifndef __GLIBC__ + __init_state = prepare; + + ll_pthread_mutex_init =dlsym (RTLD_NEXT ,"pthread_mutex_init" ); + ll_pthread_mutex_lock =dlsym (RTLD_NEXT ,"pthread_mutex_lock" ); + ll_pthread_mutex_trylock =dlsym (RTLD_NEXT ,"pthread_mutex_trylock" ); + ll_pthread_mutex_unlock =dlsym (RTLD_NEXT ,"pthread_mutex_unlock" ); + ll_pthread_mutex_destroy =dlsym (RTLD_NEXT ,"pthread_mutex_destroy" ); + + ll_pthread_rwlock_init =dlsym (RTLD_NEXT ,"pthread_rwlock_init" ); + ll_pthread_rwlock_destroy =dlsym (RTLD_NEXT ,"pthread_rwlock_destroy" ); + ll_pthread_rwlock_rdlock =dlsym (RTLD_NEXT ,"pthread_rwlock_rdlock" ); + ll_pthread_rwlock_tryrdlock =dlsym (RTLD_NEXT ,"pthread_rwlock_tryrdlock" ); + ll_pthread_rwlock_wrlock =dlsym (RTLD_NEXT ,"pthread_rwlock_wrlock" ); + ll_pthread_rwlock_trywrlock =dlsym (RTLD_NEXT ,"pthread_rwlock_trywrlock" ); + ll_pthread_rwlock_unlock =dlsym (RTLD_NEXT ,"pthread_rwlock_unlock" ); +#endif + +printf ("%p\n" , ll_pthread_mutex_trylock);fflush (stdout); + +lockdep_init (); + + __init_state = done; +}
Signature · 1 line
1.8.1.2
tip-bot for Sasha Levin
merge bot[tip:core/locking] liblockdep: Support using LD_PRELOAD
liblockdep: Support using LD_PRELOAD
Commit-ID: 231941eec8aeee4f0ac210a28e484200b20f74d8 Gitweb: http://git.kernel.org/tip/231941eec8aeee4f0ac210a28e484200b20f74d8 Author: Sasha Levin <[email protected]> AuthorDate: Thu, 13 Jun 2013 18:41:22 -0400 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 27 Nov 2013 11:55:24 +0100
liblockdep: Support using LD_PRELOAD
This allows lockdep to be used without being compiled in the original program.
Usage is quite simple:
LD_PRELOAD=/path/to/liblockdep.so /path/to/my/program
And magically, you'll have lockdep checking in your program!
--- tools/lib/lockdep/preload.c | 447 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 447 insertions(+)
tools/lib/lockdep/preload.c new file +447 -0
@@ -0,0 +1,447 @@ +#define _GNU_SOURCE +#include <pthread.h> +#include <stdio.h> +#include <dlfcn.h> +#include <stdlib.h> +#include <sysexits.h> +#include "include/liblockdep/mutex.h" +#include "../../../include/linux/rbtree.h" + +/** +* struct lock_lookup - liblockdep's view of a single unique lock +* @orig: pointer to the original pthread lock, used for lookups +* @dep_map: lockdep's dep_map structure +* @key: lockdep's key structure +* @node: rb-tree node used to store the lock in a global tree +* @name: a unique name for the lock +*/ +struct lock_lookup { +void *orig;/* Original pthread lock, used for lookups */ +struct lockdep_map dep_map;/* Since all locks are dynamic, we need +* a dep_map and a key for each lock */ +/* +* Wait, there's no support for key classes? Yup :( +* Most big projects wrap the pthread api with their own calls to +* be compatible with different locking methods. This means that +* "classes" will be brokes since the function that creates all +* locks will point to a generic locking function instead of the +* actual code that wants to do the locking. +*/ +struct lock_class_key key; +struct rb_node node; +#define LIBLOCKDEP_MAX_LOCK_NAME 22 +char name[LIBLOCKDEP_MAX_LOCK_NAME ]; +}; + +/* This is where we store our locks */ +static struct rb_root locks =RB_ROOT ; +static pthread_rwlock_t locks_rwlock =PTHREAD_RWLOCK_INITIALIZER ; + +/* pthread mutex API */ + +#ifdef __GLIBC__ +extern int __pthread_mutex_init (pthread_mutex_t *mutex,const pthread_mutexattr_t *attr); +extern int __pthread_mutex_lock (pthread_mutex_t *mutex); +extern int __pthread_mutex_trylock (pthread_mutex_t *mutex); +extern int __pthread_mutex_unlock (pthread_mutex_t *mutex); +extern int __pthread_mutex_destroy (pthread_mutex_t *mutex); +#else +#define __pthread_mutex_init NULL +#define __pthread_mutex_lock NULL +#define __pthread_mutex_trylock NULL +#define __pthread_mutex_unlock NULL +#define __pthread_mutex_destroy NULL +#endif +static int (*ll_pthread_mutex_init)(pthread_mutex_t *mutex, +const pthread_mutexattr_t *attr) = __pthread_mutex_init; +static int (*ll_pthread_mutex_lock)(pthread_mutex_t *mutex) = __pthread_mutex_lock; +static int (*ll_pthread_mutex_trylock)(pthread_mutex_t *mutex) = __pthread_mutex_trylock; +static int (*ll_pthread_mutex_unlock)(pthread_mutex_t *mutex) = __pthread_mutex_unlock; +static int (*ll_pthread_mutex_destroy)(pthread_mutex_t *mutex) = __pthread_mutex_destroy; + +/* pthread rwlock API */ + +#ifdef __GLIBC__ +extern int __pthread_rwlock_init (pthread_rwlock_t *rwlock,const pthread_rwlockattr_t *attr); +extern int __pthread_rwlock_destroy (pthread_rwlock_t *rwlock); +extern int __pthread_rwlock_wrlock (pthread_rwlock_t *rwlock); +extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock); +extern int __pthread_rwlock_rdlock (pthread_rwlock_t *rwlock); +extern int __pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock); +extern int __pthread_rwlock_unlock (pthread_rwlock_t *rwlock); +#else +#define __pthread_rwlock_init NULL +#define __pthread_rwlock_destroy NULL +#define __pthread_rwlock_wrlock NULL +#define __pthread_rwlock_trywrlock NULL +#define __pthread_rwlock_rdlock NULL +#define __pthread_rwlock_tryrdlock NULL +#define __pthread_rwlock_unlock NULL +#endif + +static int (*ll_pthread_rwlock_init)(pthread_rwlock_t *rwlock, +const pthread_rwlockattr_t *attr) = __pthread_rwlock_init; +static int (*ll_pthread_rwlock_destroy)(pthread_rwlock_t *rwlock) = __pthread_rwlock_destroy; +static int (*ll_pthread_rwlock_rdlock)(pthread_rwlock_t *rwlock) = __pthread_rwlock_rdlock; +static int (*ll_pthread_rwlock_tryrdlock)(pthread_rwlock_t *rwlock) = __pthread_rwlock_tryrdlock; +static int (*ll_pthread_rwlock_trywrlock)(pthread_rwlock_t *rwlock) = __pthread_rwlock_trywrlock; +static int (*ll_pthread_rwlock_wrlock)(pthread_rwlock_t *rwlock) = __pthread_rwlock_wrlock; +static int (*ll_pthread_rwlock_unlock)(pthread_rwlock_t *rwlock) = __pthread_rwlock_unlock; + +enum { none, prepare, done, } __init_state; +static void init_preload (void ); +static void try_init_preload (void ) +{ +if (!__init_state != done) +init_preload (); +} + +static struct rb_node **__get_lock_node (void *lock,struct rb_node **parent) +{ +struct rb_node **node = &locks.rb_node; +struct lock_lookup *l; + + *parent =NULL ; + +while (*node) { + l = rb_entry(*node, struct lock_lookup, node); + + *parent = *node; +if (lock < l->orig) + node = &l->node.rb_left; +else if (lock > l->orig) + node = &l->node.rb_right; +else +return node; + } + +return node; +} + +#ifndef LIBLOCKDEP_STATIC_ENTRIES +#define LIBLOCKDEP_STATIC_ENTRIES 1024 +#endif + +#define ARRAY_SIZE (arr) (sizeof(arr) / sizeof((arr)[0])) + +static struct lock_lookup __locks[LIBLOCKDEP_STATIC_ENTRIES ]; +static int __locks_nr; + +static inline bool is_static_lock (struct lock_lookup *lock) +{ +return lock >= __locks && lock < __locks +ARRAY_SIZE (__locks); +} + +static struct lock_lookup *alloc_lock (void ) +{ +if (__init_state != done) { +/* +* Some programs attempt to initialize and use locks in their +* allocation path. This means that a call to malloc() would +* result in locks being initialized and locked. +* +* Why is it an issue for us? dlsym() below will try allocating +* to give us the original function. Since this allocation will +* result in a locking operations, we have to let pthread deal +* with it, but we can't! we don't have the pointer to the +* original API since we're inside dlsym() trying to get it +*/ + +int idx = __locks_nr++; +if (idx >=ARRAY_SIZE (__locks)) { +fprintf (stderr, +"LOCKDEP error: insufficient LIBLOCKDEP_STATIC_ENTRIES\n" ); +exit (EX_UNAVAILABLE ); + } +return __locks + idx; + } + +return malloc (sizeof (struct lock_lookup )); +} + +static inline void free_lock (struct lock_lookup *lock) +{ +if (likely (!is_static_lock (lock))) +free (lock); +} + +/** +* __get_lock - find or create a lock instance +* @lock: pointer to a pthread lock function +* +* Try to find an existing lock in the rbtree using the provided pointer. If +* one wasn't found - create it. +*/ +static struct lock_lookup *__get_lock (void *lock) +{ +struct rb_node **node, *parent; +struct lock_lookup *l; + +ll_pthread_rwlock_rdlock (&locks_rwlock); + node =__get_lock_node (lock, &parent); +ll_pthread_rwlock_unlock (&locks_rwlock); +if (*node) { + return rb_entry(*node, struct lock_lookup, node); + } + +/* We didn't find the lock, let's create it */ + l =alloc_lock (); +if (l ==NULL ) +return NULL ; + + l->orig = lock; +/* +* Currently the name of the lock is the ptr value of the pthread lock, +* while not optimal, it makes debugging a bit easier. +* +* 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 ); + +ll_pthread_rwlock_wrlock (&locks_rwlock); +/* This might have changed since the last time we fetched it */ + node =__get_lock_node (lock, &parent); +rb_link_node (&l->node, parent, node); +rb_insert_color (&l->node, &locks); +ll_pthread_rwlock_unlock (&locks_rwlock); + +return l; +} + +static void __del_lock (struct lock_lookup *lock) +{ +ll_pthread_rwlock_wrlock (&locks_rwlock); +rb_erase (&lock->node, &locks); +ll_pthread_rwlock_unlock (&locks_rwlock); +free_lock (lock); +} + +int pthread_mutex_init (pthread_mutex_t *mutex, +const pthread_mutexattr_t *attr) +{ +int r; + +/* +* We keep trying to init our preload module because there might be +* code in init sections that tries to touch locks before we are +* initialized, in that case we'll need to manually call preload +* to get us going. +* +* Funny enough, kernel's lockdep had the same issue, and used +* (almost) the same solution. See look_up_lock_class() in +* kernel/locking/lockdep.c for details. +*/ +try_init_preload (); + + r =ll_pthread_mutex_init (mutex, attr); +if (r ==0 ) +/* +* We do a dummy initialization here so that lockdep could +* warn us if something fishy is going on - such as +* initializing a held lock. +*/ +__get_lock (mutex); + +return r; +} + +int pthread_mutex_lock (pthread_mutex_t *mutex) +{ +int r; + +try_init_preload (); + +lock_acquire (&__get_lock (mutex)->dep_map,0 ,0 ,0 ,2 ,NULL , + (unsigned long )_RET_IP_); +/* +* Here's the thing with pthread mutexes: unlike the kernel variant, +* they can fail. +* +* This means that the behaviour here is a bit different from what's +* going on in the kernel: there we just tell lockdep that we took the +* lock before actually taking it, but here we must deal with the case +* that locking failed. +* +* To do that we'll "release" the lock if locking failed - this way +* we'll get lockdep doing the correct checks when we try to take +* the lock, and if that fails - we'll be back to the correct +* state by releasing it. +*/ + r =ll_pthread_mutex_lock (mutex); +if (r) +lock_release (&__get_lock (mutex)->dep_map,0 , (unsigned long )_RET_IP_); + +return r; +} + +int pthread_mutex_trylock (pthread_mutex_t *mutex) +{ +int r; + +try_init_preload (); + +lock_acquire (&__get_lock (mutex)->dep_map,0 ,1 ,0 ,2 ,NULL , (unsigned long )_RET_IP_); + r =ll_pthread_mutex_trylock (mutex); +if (r) +lock_release (&__get_lock (mutex)->dep_map,0 , (unsigned long )_RET_IP_); + +return r; +} + +int pthread_mutex_unlock (pthread_mutex_t *mutex) +{ +int r; + +try_init_preload (); + +lock_release (&__get_lock (mutex)->dep_map,0 , (unsigned long )_RET_IP_); +/* +* Just like taking a lock, only in reverse! +* +* If we fail releasing the lock, tell lockdep we're holding it again. +*/ + r =ll_pthread_mutex_unlock (mutex); +if (r) +lock_acquire (&__get_lock (mutex)->dep_map,0 ,0 ,0 ,2 ,NULL , (unsigned long )_RET_IP_); + +return r; +} + +int pthread_mutex_destroy (pthread_mutex_t *mutex) +{ +try_init_preload (); + +/* +* Let's see if we're releasing a lock that's held. +* +* TODO: Hook into free() and add that check there as well. +*/ +debug_check_no_locks_freed (mutex, mutex +sizeof (*mutex)); +__del_lock (__get_lock (mutex)); +return ll_pthread_mutex_destroy (mutex); +} + +/* This is the rwlock part, very similar to what happened with mutex above */ +int pthread_rwlock_init (pthread_rwlock_t *rwlock, +const pthread_rwlockattr_t *attr) +{ +int r; + +try_init_preload (); + + r =ll_pthread_rwlock_init (rwlock, attr); +if (r ==0 ) +__get_lock (rwlock); + +return r; +} + +int pthread_rwlock_destroy (pthread_rwlock_t *rwlock) +{ +try_init_preload (); + +debug_check_no_locks_freed (rwlock, rwlock +sizeof (*rwlock)); +__del_lock (__get_lock (rwlock)); +return ll_pthread_rwlock_destroy (rwlock); +} + +int pthread_rwlock_rdlock (pthread_rwlock_t *rwlock) +{ +int r; + +init_preload (); + +lock_acquire (&__get_lock (rwlock)->dep_map,0 ,0 ,2 ,2 ,NULL , (unsigned long )_RET_IP_); + r =ll_pthread_rwlock_rdlock (rwlock); +if (r) +lock_release (&__get_lock (rwlock)->dep_map,0 , (unsigned long )_RET_IP_); + +return r; +} + +int pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock) +{ +int r; + +init_preload (); + +lock_acquire (&__get_lock (rwlock)->dep_map,0 ,1 ,2 ,2 ,NULL , (unsigned long )_RET_IP_); + r =ll_pthread_rwlock_tryrdlock (rwlock); +if (r) +lock_release (&__get_lock (rwlock)->dep_map,0 , (unsigned long )_RET_IP_); + +return r; +} + +int pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock) +{ +int r; + +init_preload (); + +lock_acquire (&__get_lock (rwlock)->dep_map,0 ,1 ,0 ,2 ,NULL , (unsigned long )_RET_IP_); + r =ll_pthread_rwlock_trywrlock (rwlock); +if (r) +lock_release (&__get_lock (rwlock)->dep_map,0 , (unsigned long )_RET_IP_); + +return r; +} + +int pthread_rwlock_wrlock (pthread_rwlock_t *rwlock) +{ +int r; + +init_preload (); + +lock_acquire (&__get_lock (rwlock)->dep_map,0 ,0 ,0 ,2 ,NULL , (unsigned long )_RET_IP_); + r =ll_pthread_rwlock_wrlock (rwlock); +if (r) +lock_release (&__get_lock (rwlock)->dep_map,0 , (unsigned long )_RET_IP_); + +return r; +} + +int pthread_rwlock_unlock (pthread_rwlock_t *rwlock) +{ +int r; + +init_preload (); + +lock_release (&__get_lock (rwlock)->dep_map,0 , (unsigned long )_RET_IP_); + r =ll_pthread_rwlock_unlock (rwlock); +if (r) +lock_acquire (&__get_lock (rwlock)->dep_map,0 ,0 ,0 ,2 ,NULL , (unsigned long )_RET_IP_); + +return r; +} + +__attribute__((constructor))static void init_preload (void ) +{ +if (__init_state != done) +return ; + +#ifndef __GLIBC__ + __init_state = prepare; + + ll_pthread_mutex_init =dlsym (RTLD_NEXT ,"pthread_mutex_init" ); + ll_pthread_mutex_lock =dlsym (RTLD_NEXT ,"pthread_mutex_lock" ); + ll_pthread_mutex_trylock =dlsym (RTLD_NEXT ,"pthread_mutex_trylock" ); + ll_pthread_mutex_unlock =dlsym (RTLD_NEXT ,"pthread_mutex_unlock" ); + ll_pthread_mutex_destroy =dlsym (RTLD_NEXT ,"pthread_mutex_destroy" ); + + ll_pthread_rwlock_init =dlsym (RTLD_NEXT ,"pthread_rwlock_init" ); + ll_pthread_rwlock_destroy =dlsym (RTLD_NEXT ,"pthread_rwlock_destroy" ); + ll_pthread_rwlock_rdlock =dlsym (RTLD_NEXT ,"pthread_rwlock_rdlock" ); + ll_pthread_rwlock_tryrdlock =dlsym (RTLD_NEXT ,"pthread_rwlock_tryrdlock" ); + ll_pthread_rwlock_wrlock =dlsym (RTLD_NEXT ,"pthread_rwlock_wrlock" ); + ll_pthread_rwlock_trywrlock =dlsym (RTLD_NEXT ,"pthread_rwlock_trywrlock" ); + ll_pthread_rwlock_unlock =dlsym (RTLD_NEXT ,"pthread_rwlock_unlock" ); +#endif + +printf ("%p\n" , ll_pthread_mutex_trylock);fflush (stdout); + +lockdep_init (); + + __init_state = done; +}
PATCH v5 8/9 liblockdep: Add the 'lockdep' user-space utility
In reply to Sasha LevinThis is a simple wrapper to make using liblockdep on existing applications much easier.
After running 'make && make install', it becomes quite simple to test things with liblockdep. For example, to try it on perf:
lockdep perf
No other integration required.
--- tools/lib/lockdep/lockdep | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 tools/lib/lockdep/lockdep
tools/lib/lockdep/lockdep new file +3 -0
@@ -0,0 +1,3 @@ +#! /bin/bash + +LD_PRELOAD="liblockdep.so $LD_PRELOAD" "$@"
Signature · 1 line
1.8.1.2
tip-bot for Sasha Levin
merge bot[tip:core/locking] liblockdep: Add the 'lockdep' user-space utility
liblockdep: Add the 'lockdep' user-space utility
Commit-ID: f612ac05b7ce66919507d25f4c81e4272f7a8705 Gitweb: http://git.kernel.org/tip/f612ac05b7ce66919507d25f4c81e4272f7a8705 Author: Sasha Levin <[email protected]> AuthorDate: Thu, 13 Jun 2013 18:41:23 -0400 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 27 Nov 2013 11:56:25 +0100
liblockdep: Add the 'lockdep' user-space utility
This is a simple wrapper to make using liblockdep on existing applications much easier.
After running 'make && make install', it becomes quite simple to test things with liblockdep. For example, to try it on perf:
lockdep perf
No other integration required.
--- tools/lib/lockdep/lockdep | 3 +++ 1 file changed, 3 insertions(+)
tools/lib/lockdep/lockdep new file +3 -0
@@ -0,0 +1,3 @@ +#!/bin/bash + +LD_PRELOAD="./liblockdep.so $LD_PRELOAD" "$@"
PATCH v5 9/9 liblockdep: Add a MAINTAINERS entry
In reply to Sasha Levin--- MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+)
MAINTAINERS +5 -0
@@ -4784,6 +4784,11 @@ F: drivers/lguest/ F: include/linux/lguest*.h F: tools/lguest/ +LIBLOCK +M: Sasha Levin <[email protected]> +S: Maintained +F: tools/lib/lockdep/ + LINUX FOR IBM pSERIES (RS/6000) M: Paul Mackerras <[email protected]> W: http://www.ibm.com/linux/ltc/projects/ppc
Signature · 1 line
1.8.1.2
tip-bot for Sasha Levin
merge bot[tip:core/locking] liblockdep: Add a MAINTAINERS entry
liblockdep: Add a MAINTAINERS entry
Commit-ID: 1acd437c59c7dd78d8f1e5f07bea6a18b7b5cd77 Gitweb: http://git.kernel.org/tip/1acd437c59c7dd78d8f1e5f07bea6a18b7b5cd77 Author: Sasha Levin <[email protected]> AuthorDate: Thu, 13 Jun 2013 18:41:24 -0400 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 27 Nov 2013 11:56:32 +0100
liblockdep: Add a MAINTAINERS entry
--- MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+)
MAINTAINERS +5 -0
@@ -5111,6 +5111,11 @@ F: drivers/lguest/ F: include/linux/lguest*.h F: tools/lguest/ +LIBLOCKDEP +M: Sasha Levin <[email protected]> +S: Maintained +F: tools/lib/lockdep/ + LINUX FOR IBM pSERIES (RS/6000) M: Paul Mackerras <[email protected]> W: http://www.ibm.com/linux/ltc/projects/ppc
Quoted 14 lines · Sasha Levin
liblockdep is a tiny wrapper built around
kernel/lockdep.c. The aim is to provide the same functionality the kernel gets from lockdep to userspace.The bulk of the code here is the
LD_PRELOADsupport which provides users an easy way to test their code without having to integrate liblockdep into said code. Simply doing:lockdep
my_appWould provide lockdep support to
my_app.There is also a small test suite to test both mutexes and rwlocks, it's based on the tests in
lib/locking-selftest.c.
Quoted 7 lines
This entire patch series was reviewed by lockdep maintainers and accepted to the tip tree previously. It was pulled out so that the potential merge of liblockdep won't delay the rest of the commits in the tip locking tree.
For some more background about this entire thing, the folks at LWN did an awesome overview: http://lwn.net/Articles/536363/
Ingo, I don't think I see anything holding this back; however I remember reading some email about people not liking stuff like this living in the tools/ directory or such.
Will you pick this up?
Quoted 23 lines · Peter Zijlstra
Quoted 14 lines · Sasha Levin
liblockdep is a tiny wrapper built around
kernel/lockdep.c. The aim is to provide the same functionality the kernel gets from lockdep to userspace.The bulk of the code here is the
LD_PRELOADsupport which provides users an easy way to test their code without having to integrate liblockdep into said code. Simply doing:lockdep
my_appWould provide lockdep support to
my_app.There is also a small test suite to test both mutexes and rwlocks, it's based on the tests in
lib/locking-selftest.c.Quoted 7 lines
This entire patch series was reviewed by lockdep maintainers and accepted to the tip tree previously. It was pulled out so that the potential merge of liblockdep won't delay the rest of the commits in the tip locking tree.
For some more background about this entire thing, the folks at LWN did an awesome overview: http://lwn.net/Articles/536363/
Quoted 5 lines
Ingo, I don't think I see anything holding this back; however I remember reading some email about people not liking stuff like this living in the
tools/directory or such.Will you pick this up?
So I'd really be interested in how interesting/useful this is to userspace developers? Does it work for something complex as Firefox, or Apache, to the extent they make use of these locking APIs?
'people' not liking the in-tree solution was for example Linus, who's on Cc:, so if Linus you still have a strong opinion against it I won't merge it against you.
Thanks,
Ingo
Quoted 8 lines · Ingo Molnar
Quoted 5 lines
Ingo, I don't think I see anything holding this back; however I remember
Quoted 4 lines
reading some email about people not liking stuff like this living in the
tools/directory or such.Will you pick this up?
So I'd really be interested in how interesting/useful this is to userspace developers? Does it work for something complex as Firefox, or Apache, to the extent they make use of these locking APIs?
So far I've tested it on Firefox, Apache, QEMU, LKVM, GCC and random smallish programs. I haven't really done full testing for each of those, but just made sure that liblockdep behaves as it supposed to. I'm guessing that with further work it will dig up actual issues.
Thanks,
Sasha
Quoted 6 lines · Sasha Levin
Quoted 5 lines · Ingo Molnar
Quoted 5 lines
Ingo, I don't think I see anything holding this back; however I remember
Quoted 4 lines
reading some email about people not liking stuff like this living in the
tools/directory or such.Will you pick this up?
Quoted 8 lines
Quoted 3 lines
So I'd really be interested in how interesting/useful this is to userspace developers? Does it work for something complex as Firefox, or Apache, to the extent they make use of these locking APIs?
So far I've tested it on Firefox, Apache, QEMU, LKVM, GCC and random smallish programs. I haven't really done full testing for each of those, but just made sure that liblockdep behaves as it supposed to. I'm guessing that with further work it will dig up actual issues.
Would it be possible to collect and print some stats about lock API usages, a'ka /proc/lockdep_stats et al?
Also, Xorg might be something that uses rather involved locking. It might not use many pthread mutexes though.
Thanks,
Ingo
Quoted 6 lines · Sasha Levin
Quoted 5 lines · Ingo Molnar
Quoted 5 lines
Ingo, I don't think I see anything holding this back; however I remember
Quoted 4 lines
reading some email about people not liking stuff like this living in the
tools/directory or such.Will you pick this up?
Quoted 8 lines
Quoted 3 lines
So I'd really be interested in how interesting/useful this is to userspace developers? Does it work for something complex as Firefox, or Apache, to the extent they make use of these locking APIs?
So far I've tested it on Firefox, Apache, QEMU, LKVM, GCC and random smallish programs. I haven't really done full testing for each of those, but just made sure that liblockdep behaves as it supposed to. I'm guessing that with further work it will dig up actual issues.
The other issue is that with lock classes disabled you have to hit an actual deadlock to trigger any output.
I.e. much of the power of lockdep is diminished :-/ When actual deadlocks are triggered then it's not particularly complex to debug user-space apps:
gdb the hung task(s) and look at the backtraces.
Thanks,
Ingo
Quoted 18 lines · Ingo Molnar
Quoted 6 lines · Sasha Levin
Quoted 5 lines · Ingo Molnar
Quoted 5 lines
Ingo, I don't think I see anything holding this back; however I remember
Quoted 4 lines
reading some email about people not liking stuff like this living in the
tools/directory or such.Will you pick this up?
Quoted 8 lines
Quoted 3 lines
So I'd really be interested in how interesting/useful this is to userspace developers? Does it work for something complex as Firefox, or Apache, to the extent they make use of these locking APIs?
So far I've tested it on Firefox, Apache, QEMU, LKVM, GCC and random smallish programs. I haven't really done full testing for each of those, but just made sure that liblockdep behaves as it supposed to. I'm guessing that with further work it will dig up actual issues.
Quoted 6 lines
The other issue is that with lock classes disabled you have to hit an actual deadlock to trigger any output.
I.e. much of the power of lockdep is diminished :-/ When actual deadlocks are triggered then it's not particularly complex to debug user-space apps:
gdb the hung task(s) and look at the backtraces.
Lock classes are disabled only if you're using the LD_PRELOAD method of testing. If you actually re-compile your code with the library (by just including the header and setting a #define to enable it) you will have lock classes.
Thanks,
Sasha
Quoted 22 lines · Sasha Levin
Quoted 21 lines · Ingo Molnar
Quoted 6 lines · Sasha Levin
Quoted 5 lines · Ingo Molnar
Quoted 5 lines
Ingo, I don't think I see anything holding this back; however I remember
Quoted 4 lines
reading some email about people not liking stuff like this living in the
tools/directory or such.Will you pick this up?
Quoted 8 lines
Quoted 3 lines
So I'd really be interested in how interesting/useful this is to userspace developers? Does it work for something complex as Firefox, or Apache, to the extent they make use of these locking APIs?
So far I've tested it on Firefox, Apache, QEMU, LKVM, GCC and random smallish programs. I haven't really done full testing for each of those, but just made sure that liblockdep behaves as it supposed to. I'm guessing that with further work it will dig up actual issues.
The other issue is that with lock classes disabled you have to hit an actual deadlock to trigger any output.
Quoted 8 lines
Quoted 3 lines
I.e. much of the power of lockdep is diminished :-/ When actual deadlocks are triggered then it's not particularly complex to debug user-space apps:
gdb the hung task(s) and look at the backtraces.Lock classes are disabled only if you're using the
LD_PRELOADmethod of testing. If you actually re-compile your code with the library (by just including the header and setting a #define to enable it) you will have lock classes.
Hi Ingo,
Just wondering if you're planning on pushing it over to Linus from your tree, or should I go ahead and do it on my own?
Thanks,
Sasha
Quoted 12 lines · Sasha Levin
Quoted 11 lines
Quoted 6 lines
The other issue is that with lock classes disabled you have to hit an actual deadlock to trigger any output.
I.e. much of the power of lockdep is diminished :-/ When actual deadlocks are triggered then it's not particularly complex to debug user-space apps: gdb the hung task(s) and look at the backtraces.
Lock classes are disabled only if you're using the
LD_PRELOADmethod of testing. If you actually re-compile your code with the library (by just including the header and setting a #define to enable it) you will have lock classes.
Quoted 4 lines
Hi Ingo,
Just wondering if you're planning on pushing it over to Linus from your tree, or should I go ahead and do it on my own?
PeterZ is in favor as well so I'll apply them after the merge window, for v3.12.
Thanks,
Ingo
Quoted 15 lines · Ingo Molnar
Quoted 12 lines · Sasha Levin
Quoted 11 lines
Quoted 6 lines
The other issue is that with lock classes disabled you have to hit an actual deadlock to trigger any output.
I.e. much of the power of lockdep is diminished :-/ When actual deadlocks are triggered then it's not particularly complex to debug user-space apps: gdb the hung task(s) and look at the backtraces.
Lock classes are disabled only if you're using the
LD_PRELOADmethod of testing. If you actually re-compile your code with the library (by just including the header and setting a #define to enable it) you will have lock classes.
Quoted 7 lines
Quoted 4 lines
Hi Ingo,
Just wondering if you're planning on pushing it over to Linus from your tree, or should I go ahead and do it on my own?
PeterZ is in favor as well so I'll apply them after the merge window, for v3.12.
Hi Ingo,
Do you intend to send liblockdep in this merge window as planned?
Thanks,
Sasha
Quoted 21 lines · Sasha Levin
Quoted 20 lines · Ingo Molnar
Quoted 16 lines · Sasha Levin
Quoted 11 lines
Quoted 6 lines
The other issue is that with lock classes disabled you have to hit an actual deadlock to trigger any output.
I.e. much of the power of lockdep is diminished :-/ When actual deadlocks are triggered then it's not particularly complex to debug user-space apps: gdb the hung task(s) and look at the backtraces.
Lock classes are disabled only if you're using the
LD_PRELOADmethod of testing. If you actually re-compile your code with the library (by just including the header and setting a #define to enable it) you will have lock classes.Hi Ingo,
Just wondering if you're planning on pushing it over to Linus from your tree, or should I go ahead and do it on my own?
Quoted 6 lines
Quoted 2 lines
PeterZ is in favor as well so I'll apply them after the merge window, for v3.12.
Hi Ingo,
Do you intend to send liblockdep in this merge window as planned?
If Peter agrees with them and picks them up then the next merge window would be fine I guess.
Thanks,
Ingo
Quoted 10 lines · Ingo Molnar
Quoted 7 lines · Ingo Molnar
Quoted 2 lines
PeterZ is in favor as well so I'll apply them after the merge window, for v3.12.
Hi Ingo,
Do you intend to send liblockdep in this merge window as planned?
If Peter agrees with them and picks them up then the next merge window would be fine I guess.
I thought that Peter acked it, and the plan was to push it through the locking tree for 3.12?
Thanks,
Sasha
Quoted 27 lines · Ingo Molnar
Quoted 24 lines · Sasha Levin
Quoted 22 lines · Ingo Molnar
Quoted 12 lines · Sasha Levin
Quoted 11 lines
Quoted 6 lines
The other issue is that with lock classes disabled you have to hit an actual deadlock to trigger any output.
I.e. much of the power of lockdep is diminished :-/ When actual deadlocks are triggered then it's not particularly complex to debug user-space apps: gdb the hung task(s) and look at the backtraces.
Lock classes are disabled only if you're using the
LD_PRELOADmethod of testing. If you actually re-compile your code with the library (by just including the header and setting a #define to enable it) you will have lock classes.Quoted 4 lines
Hi Ingo,
Just wondering if you're planning on pushing it over to Linus from your tree, or should I go ahead and do it on my own?
PeterZ is in favor as well so I'll apply them after the merge window, for v3.12.
Quoted 6 lines
Quoted 3 lines
Hi Ingo,
Do you intend to send liblockdep in this merge window as planned?
If Peter agrees with them and picks them up then the next merge window would be fine I guess.
Ping? Anyone?
Thanks,
Sasha
Quoted 27 lines · Sasha Levin
Quoted 27 lines · Sasha Levin
Quoted 25 lines · Ingo Molnar
Quoted 22 lines · Sasha Levin
Quoted 13 lines
Quoted 4 lines
Quoted 4 lines
The other issue is that with lock classes disabled you have to hit an actual deadlock to trigger any output.
Quoted 8 lines
Quoted 3 lines
I.e. much of the power of lockdep is diminished :-/ When actual deadlocks are triggered then it's not particularly complex to debug user-space apps: gdb the hung task(s) and look at the backtraces.
Lock classes are disabled only if you're using the
LD_PRELOADmethod of testing. If you actually re-compile your code with the library (by just including the header and setting a #define to enable it) you will have lock classes.Quoted 4 lines
Hi Ingo,
Just wondering if you're planning on pushing it over to Linus from your tree, or should I go ahead and do it on my own?
PeterZ is in favor as well so I'll apply them after the merge window, for v3.12.
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Hi Ingo,
Do you intend to send liblockdep in this merge window as planned?
If Peter agrees with them and picks them up then the next merge window would be fine I guess.
Ping? Anyone?
Urgh, I missed Ingo throwing the ball back in my court.. sorry about that. I'll have a look on Monday.
Quoted 2 lines · Sasha Levin
Quoted 2 lines
If Peter agrees with them and picks them up then the next merge window would be fine I guess.
OK, picked them up; not sure it'll still make this window though :/