Commit 7246f4dc authored by Sasha Levin's avatar Sasha Levin Committed by Linus Torvalds
Browse files

tools/lib/lockdep: drop liblockdep 



TL;DR: While a tool like liblockdep is useful, it probably doesn't
belong within the kernel tree.

liblockdep attempts to reuse kernel code both directly (by directly
building the kernel's lockdep code) as well as indirectly (by using
sanitized headers). This makes liblockdep an integral part of the
kernel.

It also makes liblockdep quite unique: while other userspace code might
use sanitized headers, it generally doesn't attempt to use kernel code
directly which means that changes on the kernel side of things don't
affect (and break) it directly.

All our workflows and tooling around liblockdep don't support this
uniqueness. Changes that go into the kernel code aren't validated to not
break in-tree userspace code.

liblockdep ended up being very fragile, breaking over and over, to the
point that living in the same tree as the lockdep code lost most of it's
value.

liblockdep should continue living in an external tree, syncing with
the kernel often, in a controllable way.

Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d9c8e52f

MAINTAINERS

+0 −5
Original line number Diff line number Diff line
@@ -10799,11 +10799,6 @@ F: drivers/ata/ 
F:	include/linux/ata.h

F:	include/linux/libata.h









LIBLOCKDEP









M:	Sasha Levin <alexander.levin@microsoft.com>









S:	Maintained









F:	tools/lib/lockdep/

















LIBNVDIMM BLK: MMIO-APERTURE DRIVER









M:	Dan Williams <dan.j.williams@intel.com>









M:	Vishal Verma <vishal.l.verma@intel.com>
































tools/Makefile



+3
−13






























Original line number
Diff line number
Diff line







@@ -24,7 +24,6 @@ help:







	@echo '  intel-speed-select     - Intel Speed Select tool'









	@echo '  kvm_stat               - top-like utility for displaying kvm statistics'









	@echo '  leds                   - LEDs  tools'









	@echo '  liblockdep             - user-space wrapper for kernel locking-validator'









	@echo '  objtool                - an ELF object analysis tool'









	@echo '  pci                    - PCI tools'









	@echo '  perf                   - Linux performance measurement and analysis tool'








@@ -72,9 +71,6 @@ cgroup counter firewire hv guest bootconfig spi usb virtio vm bpf iio gpio objto







bpf/%: FORCE









	$(call descend,$@)



















liblockdep: FORCE









	$(call descend,lib/lockdep)



















libapi: FORCE









	$(call descend,lib/api)


















@@ -101,7 +97,7 @@ freefall: FORCE







kvm_stat: FORCE









	$(call descend,kvm/$@)



















all: acpi cgroup counter cpupower gpio hv firewire liblockdep \









all: acpi cgroup counter cpupower gpio hv firewire \









		perf selftests bootconfig spi turbostat usb \









		virtio vm bpf x86_energy_perf_policy \









		tmon freefall iio objtool kvm_stat wmi \








@@ -116,9 +112,6 @@ cpupower_install:







cgroup_install counter_install firewire_install gpio_install hv_install iio_install perf_install bootconfig_install spi_install usb_install virtio_install vm_install bpf_install objtool_install wmi_install pci_install debugging_install tracing_install:









	$(call descend,$(@:_install=),install)



















liblockdep_install:









	$(call descend,lib/lockdep,install)



















selftests_install:









	$(call descend,testing/$(@:_install=),install)


















@@ -135,7 +128,7 @@ kvm_stat_install:







	$(call descend,kvm/$(@:_install=),install)



















install: acpi_install cgroup_install counter_install cpupower_install gpio_install \









		hv_install firewire_install iio_install liblockdep_install \









		hv_install firewire_install iio_install \









		perf_install selftests_install turbostat_install usb_install \









		virtio_install vm_install bpf_install x86_energy_perf_policy_install \









		tmon_install freefall_install objtool_install kvm_stat_install \








@@ -151,9 +144,6 @@ cpupower_clean:







cgroup_clean counter_clean hv_clean firewire_clean bootconfig_clean spi_clean usb_clean virtio_clean vm_clean wmi_clean bpf_clean iio_clean gpio_clean objtool_clean leds_clean pci_clean firmware_clean debugging_clean tracing_clean:









	$(call descend,$(@:_clean=),clean)



















liblockdep_clean:









	$(call descend,lib/lockdep,clean)



















libapi_clean:









	$(call descend,lib/api,clean)


















@@ -185,7 +175,7 @@ build_clean:







clean: acpi_clean cgroup_clean counter_clean cpupower_clean hv_clean firewire_clean \









		perf_clean selftests_clean turbostat_clean bootconfig_clean spi_clean usb_clean virtio_clean \









		vm_clean bpf_clean iio_clean x86_energy_perf_policy_clean tmon_clean \









		freefall_clean build_clean libbpf_clean libsubcmd_clean liblockdep_clean \









		freefall_clean build_clean libbpf_clean libsubcmd_clean \









		gpio_clean objtool_clean leds_clean wmi_clean pci_clean firmware_clean debugging_clean \









		intel-speed-select_clean tracing_clean










































tools/lib/lockdep/.gitignore
deleted100644 → 0



+0
−2






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0-only









liblockdep.so.*
























tools/lib/lockdep/Build
deleted100644 → 0



+0
−1






























Original line number
Diff line number
Diff line









liblockdep-y += common.o lockdep.o preload.o rbtree.o
























tools/lib/lockdep/Makefile
deleted100644 → 0



+0
−162






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









# file format version









FILE_VERSION = 1



















LIBLOCKDEP_VERSION=$(shell make --no-print-directory -sC ../../.. kernelversion)



















# 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 and LD, or setting CROSS_COMPILE as a prefix.









$(call allow-override,CC,$(CROSS_COMPILE)gcc)









$(call allow-override,AR,$(CROSS_COMPILE)ar)









$(call allow-override,LD,$(CROSS_COMPILE)ld)



















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



















MAKEFLAGS += --no-print-directory



















include ../../scripts/Makefile.include



















# copy a bit from Linux kbuild



















ifeq ("$(origin V)", "command line")









  VERBOSE = $(V)









endif









ifndef VERBOSE









  VERBOSE = 0









endif



















ifeq ($(srctree),)









srctree := $(patsubst %/,%,$(dir $(CURDIR)))









srctree := $(patsubst %/,%,$(dir $(srctree)))









srctree := $(patsubst %/,%,$(dir $(srctree)))









#$(info Determined 'srctree' to be $(srctree))









endif



















# Shell quotes









libdir_SQ = $(subst ','\'',$(libdir))









bindir_SQ = $(subst ','\'',$(bindir))



















LIB_IN := $(OUTPUT)liblockdep-in.o



















BIN_FILE = lockdep









LIB_FILE = $(OUTPUT)liblockdep.a $(OUTPUT)liblockdep.so.$(LIBLOCKDEP_VERSION)



















CONFIG_INCLUDES =









CONFIG_LIBS	=









CONFIG_FLAGS	=



















OBJ		= $@









N		=



















export Q VERBOSE



















INCLUDES = -I. -I./uinclude -I./include -I../../include $(CONFIG_INCLUDES)



















# Set compile option CFLAGS if not set elsewhere









CFLAGS ?= -g -DCONFIG_LOCKDEP -DCONFIG_STACKTRACE -DCONFIG_PROVE_LOCKING -DBITS_PER_LONG=__WORDSIZE -DLIBLOCKDEP_VERSION='"$(LIBLOCKDEP_VERSION)"' -rdynamic -O0 -g









CFLAGS += -fPIC









CFLAGS += -Wall



















override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ)



















ifeq ($(VERBOSE),1)









  Q =









  print_shared_lib_compile =









  print_install =









else









  Q = @









  print_shared_lib_compile =	echo '  LD       '$(OBJ);









  print_static_lib_build =	echo '  LD       '$(OBJ);









  print_install =		echo '  INSTALL  '$1'	to	$(DESTDIR_SQ)$2';









endif



















all:



















export srctree OUTPUT CC LD CFLAGS V









include $(srctree)/tools/build/Makefile.include



















do_compile_shared_library =			\









	($(print_shared_lib_compile)		\









	$(CC) $(LDFLAGS) --shared $^ -o $@ -lpthread -ldl -Wl,-soname='$(@F)';$(shell ln -sf $(@F) $(@D)/liblockdep.so))



















do_build_static_lib =				\









	($(print_static_lib_build)		\









	$(RM) $@;  $(AR) rcs $@ $^)



















CMD_TARGETS = $(LIB_FILE)



















TARGETS = $(CMD_TARGETS)





























all: fixdep all_cmd



















all_cmd: $(CMD_TARGETS)



















$(LIB_IN): force









	$(Q)$(MAKE) $(build)=liblockdep



















$(OUTPUT)liblockdep.so.$(LIBLOCKDEP_VERSION): $(LIB_IN)









	$(Q)$(do_compile_shared_library)



















$(OUTPUT)liblockdep.a: $(LIB_IN)









	$(Q)$(do_build_static_lib)



















tags:	force









	$(RM) tags









	find . -name '*.[ch]' | xargs ctags --extra=+f --c-kinds=+px \









	--regex-c++='/_PE\(([^,)]*).*/TEP_ERRNO__\1/'



















TAGS:	force









	$(RM) TAGS









	find . -name '*.[ch]' | xargs etags \









	--regex='/_PE(\([^,)]*\).*/TEP_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) $(OUTPUT)*.o *~ $(TARGETS) $(OUTPUT)*.a $(OUTPUT)*liblockdep*.so* $(VERSION_FILES) $(OUTPUT).*.d $(OUTPUT).*.cmd









	$(RM) tags TAGS



















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)