16c00db4bb
Pull AFS fixes from David Howells: "Here's a set of patches that fix a number of bugs in the in-kernel AFS client, including: - Fix directory locking to not use individual page locks for directory reading/scanning but rather to use a semaphore on the afs_vnode struct as the directory contents must be read in a single blob and data from different reads must not be mixed as the entire contents may be shuffled about between reads. - Fix address list parsing to handle port specifiers correctly. - Only give up callback records on a server if we actually talked to that server (we might not be able to access a server). - Fix some callback handling bugs, including refcounting, whole-volume callbacks and when callbacks actually get broken in response to a CB.CallBack op. - Fix some server/address rotation bugs, including giving up if we can't probe a server; giving up if a server says it doesn't have a volume, but there are more servers to try. - Fix the decoding of fetched statuses to be OpenAFS compatible. - Fix the handling of server lookups in Cache Manager ops (such as CB.InitCallBackState3) to use a UUID if possible and to handle no server being found. - Fix a bug in server lookup where not all addresses are compared. - Fix the non-encryption of calls that prevents some servers from being accessed (this also requires an AF_RXRPC patch that has already gone in through the net tree). There's also a patch that adds tracepoints to log Cache Manager ops that don't find a matching server, either by UUID or by address" * tag 'afs-fixes-20180514' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs: afs: Fix the non-encryption of calls afs: Fix CB.CallBack handling afs: Fix whole-volume callback handling afs: Fix afs_find_server search loop afs: Fix the handling of an unfound server in CM operations afs: Add a tracepoint to record callbacks from unlisted servers afs: Fix the handling of CB.InitCallBackState3 to find the server by UUID afs: Fix VNOVOL handling in address rotation afs: Fix AFSFetchStatus decoder to provide OpenAFS compatibility afs: Fix server rotation's handling of fileserver probe failure afs: Fix refcounting in callback registration afs: Fix giving up callbacks on server destruction afs: Fix address list parsing afs: Fix directory page locking
368 lines
12 KiB
Text
368 lines
12 KiB
Text
include ../scripts/Makefile.include
|
|
|
|
ifndef MK
|
|
ifeq ($(MAKECMDGOALS),)
|
|
# no target specified, trigger the whole suite
|
|
all:
|
|
@echo "Testing Makefile"; $(MAKE) -sf tests/make MK=Makefile
|
|
@echo "Testing Makefile.perf"; $(MAKE) -sf tests/make MK=Makefile.perf SET_PARALLEL=1 SET_O=1
|
|
else
|
|
# run only specific test over 'Makefile'
|
|
%:
|
|
@echo "Testing Makefile"; $(MAKE) -sf tests/make MK=Makefile $@
|
|
endif
|
|
else
|
|
PERF := .
|
|
PERF_O := $(PERF)
|
|
O_OPT :=
|
|
FULL_O := $(shell readlink -f $(PERF_O) || echo $(PERF_O))
|
|
|
|
ifneq ($(O),)
|
|
FULL_O := $(shell readlink -f $(O) || echo $(O))
|
|
PERF_O := $(FULL_O)
|
|
ifeq ($(SET_O),1)
|
|
O_OPT := 'O=$(FULL_O)'
|
|
endif
|
|
K_O_OPT := 'O=$(FULL_O)'
|
|
endif
|
|
|
|
PARALLEL_OPT=
|
|
ifeq ($(SET_PARALLEL),1)
|
|
cores := $(shell (getconf _NPROCESSORS_ONLN || egrep -c '^processor|^CPU[0-9]' /proc/cpuinfo) 2>/dev/null)
|
|
ifeq ($(cores),0)
|
|
cores := 1
|
|
endif
|
|
PARALLEL_OPT="-j$(cores)"
|
|
endif
|
|
|
|
# As per kernel Makefile, avoid funny character set dependencies
|
|
unexport LC_ALL
|
|
LC_COLLATE=C
|
|
LC_NUMERIC=C
|
|
export LC_COLLATE LC_NUMERIC
|
|
|
|
ifeq ($(srctree),)
|
|
srctree := $(patsubst %/,%,$(dir $(CURDIR)))
|
|
srctree := $(patsubst %/,%,$(dir $(srctree)))
|
|
#$(info Determined 'srctree' to be $(srctree))
|
|
endif
|
|
|
|
include $(srctree)/tools/scripts/Makefile.arch
|
|
|
|
# FIXME looks like x86 is the only arch running tests ;-)
|
|
# we need some IS_(32/64) flag to make this generic
|
|
ifeq ($(ARCH)$(IS_64_BIT), x861)
|
|
lib = lib64
|
|
else
|
|
lib = lib
|
|
endif
|
|
|
|
has = $(shell which $1 2>/dev/null)
|
|
|
|
# standard single make variable specified
|
|
make_clean_all := clean all
|
|
make_python_perf_so := python/perf.so
|
|
make_debug := DEBUG=1
|
|
make_no_libperl := NO_LIBPERL=1
|
|
make_no_libpython := NO_LIBPYTHON=1
|
|
make_no_scripts := NO_LIBPYTHON=1 NO_LIBPERL=1
|
|
make_no_newt := NO_NEWT=1
|
|
make_no_slang := NO_SLANG=1
|
|
make_no_gtk2 := NO_GTK2=1
|
|
make_no_ui := NO_NEWT=1 NO_SLANG=1 NO_GTK2=1
|
|
make_no_demangle := NO_DEMANGLE=1
|
|
make_no_libelf := NO_LIBELF=1
|
|
make_no_libunwind := NO_LIBUNWIND=1
|
|
make_no_libdw_dwarf_unwind := NO_LIBDW_DWARF_UNWIND=1
|
|
make_no_backtrace := NO_BACKTRACE=1
|
|
make_no_libnuma := NO_LIBNUMA=1
|
|
make_no_libaudit := NO_LIBAUDIT=1
|
|
make_no_libbionic := NO_LIBBIONIC=1
|
|
make_no_auxtrace := NO_AUXTRACE=1
|
|
make_no_libbpf := NO_LIBBPF=1
|
|
make_no_libcrypto := NO_LIBCRYPTO=1
|
|
make_with_babeltrace:= LIBBABELTRACE=1
|
|
make_no_sdt := NO_SDT=1
|
|
make_with_clangllvm := LIBCLANGLLVM=1
|
|
make_tags := tags
|
|
make_cscope := cscope
|
|
make_help := help
|
|
make_doc := doc
|
|
make_perf_o := perf.o
|
|
make_util_map_o := util/map.o
|
|
make_util_pmu_bison_o := util/pmu-bison.o
|
|
make_install := install
|
|
make_install_bin := install-bin
|
|
make_install_doc := install-doc
|
|
make_install_man := install-man
|
|
make_install_html := install-html
|
|
make_install_info := install-info
|
|
make_install_pdf := install-pdf
|
|
make_install_prefix := install prefix=/tmp/krava
|
|
make_install_prefix_slash := install prefix=/tmp/krava/
|
|
make_static := LDFLAGS=-static
|
|
|
|
# all the NO_* variable combined
|
|
make_minimal := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1
|
|
make_minimal += NO_DEMANGLE=1 NO_LIBELF=1 NO_LIBUNWIND=1 NO_BACKTRACE=1
|
|
make_minimal += NO_LIBNUMA=1 NO_LIBAUDIT=1 NO_LIBBIONIC=1
|
|
make_minimal += NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1 NO_LIBBPF=1
|
|
make_minimal += NO_LIBCRYPTO=1 NO_SDT=1 NO_JVMTI=1
|
|
|
|
# $(run) contains all available tests
|
|
run := make_pure
|
|
# Targets 'clean all' can be run together only through top level
|
|
# Makefile because we detect clean target in Makefile.perf and
|
|
# disable features detection
|
|
ifeq ($(MK),Makefile)
|
|
run += make_clean_all
|
|
MAKE_F := $(MAKE)
|
|
else
|
|
MAKE_F := $(MAKE) -f $(MK)
|
|
endif
|
|
run += make_python_perf_so
|
|
run += make_debug
|
|
run += make_no_libperl
|
|
run += make_no_libpython
|
|
run += make_no_scripts
|
|
run += make_no_newt
|
|
run += make_no_slang
|
|
run += make_no_gtk2
|
|
run += make_no_ui
|
|
run += make_no_demangle
|
|
run += make_no_libelf
|
|
run += make_no_libunwind
|
|
run += make_no_libdw_dwarf_unwind
|
|
run += make_no_backtrace
|
|
run += make_no_libnuma
|
|
run += make_no_libaudit
|
|
run += make_no_libbionic
|
|
run += make_no_auxtrace
|
|
run += make_no_libbpf
|
|
run += make_with_babeltrace
|
|
run += make_with_clangllvm
|
|
run += make_help
|
|
run += make_doc
|
|
run += make_perf_o
|
|
run += make_util_map_o
|
|
run += make_util_pmu_bison_o
|
|
run += make_install
|
|
run += make_install_bin
|
|
run += make_install_prefix
|
|
run += make_install_prefix_slash
|
|
# FIXME 'install-*' commented out till they're fixed
|
|
# run += make_install_doc
|
|
# run += make_install_man
|
|
# run += make_install_html
|
|
# run += make_install_info
|
|
# run += make_install_pdf
|
|
run += make_minimal
|
|
run += make_static
|
|
|
|
ifneq ($(call has,ctags),)
|
|
run += make_tags
|
|
endif
|
|
ifneq ($(call has,cscope),)
|
|
run += make_cscope
|
|
endif
|
|
|
|
# $(run_O) contains same portion of $(run) tests with '_O' attached
|
|
# to distinguish O=... tests
|
|
run_O := $(addsuffix _O,$(run))
|
|
|
|
# disable some tests for O=...
|
|
run_O := $(filter-out make_python_perf_so_O,$(run_O))
|
|
|
|
# define test for each compile as 'test_NAME' variable
|
|
# with the test itself as a value
|
|
test_make_tags = test -f tags
|
|
test_make_cscope = test -f cscope.out
|
|
|
|
test_make_tags_O := $(test_make_tags)
|
|
test_make_cscope_O := $(test_make_cscope)
|
|
|
|
test_ok := true
|
|
test_make_help := $(test_ok)
|
|
test_make_doc := $(test_ok)
|
|
test_make_help_O := $(test_ok)
|
|
test_make_doc_O := $(test_ok)
|
|
|
|
test_make_python_perf_so := test -f $(PERF_O)/python/perf.so
|
|
|
|
test_make_perf_o := test -f $(PERF_O)/perf.o
|
|
test_make_util_map_o := test -f $(PERF_O)/util/map.o
|
|
test_make_util_pmu_bison_o := test -f $(PERF_O)/util/pmu-bison.o
|
|
|
|
define test_dest_files
|
|
for file in $(1); do \
|
|
if [ ! -x $$TMP_DEST/$$file ]; then \
|
|
echo " failed to find: $$file"; \
|
|
fi \
|
|
done
|
|
endef
|
|
|
|
installed_files_bin := bin/perf
|
|
installed_files_bin += etc/bash_completion.d/perf
|
|
installed_files_bin += libexec/perf-core/perf-archive
|
|
|
|
installed_files_plugins := $(lib)/traceevent/plugins/plugin_cfg80211.so
|
|
installed_files_plugins += $(lib)/traceevent/plugins/plugin_scsi.so
|
|
installed_files_plugins += $(lib)/traceevent/plugins/plugin_xen.so
|
|
installed_files_plugins += $(lib)/traceevent/plugins/plugin_function.so
|
|
installed_files_plugins += $(lib)/traceevent/plugins/plugin_sched_switch.so
|
|
installed_files_plugins += $(lib)/traceevent/plugins/plugin_mac80211.so
|
|
installed_files_plugins += $(lib)/traceevent/plugins/plugin_kvm.so
|
|
installed_files_plugins += $(lib)/traceevent/plugins/plugin_kmem.so
|
|
installed_files_plugins += $(lib)/traceevent/plugins/plugin_hrtimer.so
|
|
installed_files_plugins += $(lib)/traceevent/plugins/plugin_jbd2.so
|
|
|
|
installed_files_all := $(installed_files_bin)
|
|
installed_files_all += $(installed_files_plugins)
|
|
|
|
test_make_install := $(call test_dest_files,$(installed_files_all))
|
|
test_make_install_O := $(call test_dest_files,$(installed_files_all))
|
|
test_make_install_bin := $(call test_dest_files,$(installed_files_bin))
|
|
test_make_install_bin_O := $(call test_dest_files,$(installed_files_bin))
|
|
|
|
# We prefix all installed files for make_install_prefix(_slash)
|
|
# with '/tmp/krava' to match installed/prefix-ed files.
|
|
installed_files_all_prefix := $(addprefix /tmp/krava/,$(installed_files_all))
|
|
test_make_install_prefix := $(call test_dest_files,$(installed_files_all_prefix))
|
|
test_make_install_prefix_O := $(call test_dest_files,$(installed_files_all_prefix))
|
|
|
|
test_make_install_prefix_slash := $(test_make_install_prefix)
|
|
test_make_install_prefix_slash_O := $(test_make_install_prefix_O)
|
|
|
|
# FIXME nothing gets installed
|
|
test_make_install_man := test -f $$TMP_DEST/share/man/man1/perf.1
|
|
test_make_install_man_O := $(test_make_install_man)
|
|
|
|
# FIXME nothing gets installed
|
|
test_make_install_doc := $(test_ok)
|
|
test_make_install_doc_O := $(test_ok)
|
|
|
|
# FIXME nothing gets installed
|
|
test_make_install_html := $(test_ok)
|
|
test_make_install_html_O := $(test_ok)
|
|
|
|
# FIXME nothing gets installed
|
|
test_make_install_info := $(test_ok)
|
|
test_make_install_info_O := $(test_ok)
|
|
|
|
# FIXME nothing gets installed
|
|
test_make_install_pdf := $(test_ok)
|
|
test_make_install_pdf_O := $(test_ok)
|
|
|
|
test_make_python_perf_so_O := test -f $$TMP_O/python/perf.so
|
|
test_make_perf_o_O := test -f $$TMP_O/perf.o
|
|
test_make_util_map_o_O := test -f $$TMP_O/util/map.o
|
|
test_make_util_pmu_bison_o_O := test -f $$TMP_O/util/pmu-bison.o
|
|
|
|
test_default = test -x $(PERF_O)/perf
|
|
test = $(if $(test_$1),$(test_$1),$(test_default))
|
|
|
|
test_default_O = test -x $$TMP_O/perf
|
|
test_O = $(if $(test_$1),$(test_$1),$(test_default_O))
|
|
|
|
all:
|
|
|
|
ifdef SHUF
|
|
run := $(shell shuf -e $(run))
|
|
run_O := $(shell shuf -e $(run_O))
|
|
endif
|
|
|
|
max_width := $(shell echo $(run_O) | sed 's/ /\n/g' | wc -L)
|
|
|
|
ifdef DEBUG
|
|
d := $(info run $(run))
|
|
d := $(info run_O $(run_O))
|
|
endif
|
|
|
|
MAKEFLAGS := --no-print-directory
|
|
|
|
clean := @(cd $(PERF); $(MAKE_F) -s $(O_OPT) clean >/dev/null && $(MAKE) -s $(O_OPT) -C ../build clean >/dev/null)
|
|
|
|
$(run):
|
|
$(call clean)
|
|
@TMP_DEST=$$(mktemp -d); \
|
|
cmd="cd $(PERF) && $(MAKE_F) $($@) $(PARALLEL_OPT) $(O_OPT) DESTDIR=$$TMP_DEST"; \
|
|
printf "%*.*s: %s\n" $(max_width) $(max_width) "$@" "$$cmd" && echo $$cmd > $@ && \
|
|
( eval $$cmd ) >> $@ 2>&1; \
|
|
echo " test: $(call test,$@)" >> $@ 2>&1; \
|
|
$(call test,$@) && \
|
|
rm -rf $@ $$TMP_DEST || (cat $@ ; false)
|
|
|
|
$(run_O):
|
|
$(call clean)
|
|
@TMP_O=$$(mktemp -d); \
|
|
TMP_DEST=$$(mktemp -d); \
|
|
cmd="cd $(PERF) && $(MAKE_F) $($(patsubst %_O,%,$@)) $(PARALLEL_OPT) O=$$TMP_O DESTDIR=$$TMP_DEST"; \
|
|
printf "%*.*s: %s\n" $(max_width) $(max_width) "$@" "$$cmd" && echo $$cmd > $@ && \
|
|
( eval $$cmd ) >> $@ 2>&1 && \
|
|
echo " test: $(call test_O,$@)" >> $@ 2>&1; \
|
|
$(call test_O,$@) && \
|
|
rm -rf $@ $$TMP_O $$TMP_DEST || (cat $@ ; false)
|
|
|
|
tarpkg:
|
|
@cmd="$(PERF)/tests/perf-targz-src-pkg $(PERF)"; \
|
|
echo "- $@: $$cmd" && echo $$cmd > $@ && \
|
|
( eval $$cmd ) >> $@ 2>&1 && \
|
|
rm -f $@
|
|
|
|
KERNEL_O := ../..
|
|
ifneq ($(O),)
|
|
KERNEL_O := $(O)
|
|
endif
|
|
|
|
make_kernelsrc:
|
|
@echo "- make -C <kernelsrc> $(PARALLEL_OPT) $(K_O_OPT) tools/perf"
|
|
$(call clean); \
|
|
(make -C ../.. $(PARALLEL_OPT) $(K_O_OPT) tools/perf) > $@ 2>&1 && \
|
|
test -x $(KERNEL_O)/tools/perf/perf && rm -f $@ || (cat $@ ; false)
|
|
|
|
make_kernelsrc_tools:
|
|
@echo "- make -C <kernelsrc>/tools $(PARALLEL_OPT) $(K_O_OPT) perf"
|
|
$(call clean); \
|
|
(make -C ../../tools $(PARALLEL_OPT) $(K_O_OPT) perf) > $@ 2>&1 && \
|
|
test -x $(KERNEL_O)/tools/perf/perf && rm -f $@ || (cat $@ ; false)
|
|
|
|
FEATURES_DUMP_FILE := $(FULL_O)/BUILD_TEST_FEATURE_DUMP
|
|
FEATURES_DUMP_FILE_STATIC := $(FULL_O)/BUILD_TEST_FEATURE_DUMP_STATIC
|
|
|
|
all: $(run) $(run_O) tarpkg make_kernelsrc make_kernelsrc_tools
|
|
@echo OK
|
|
@rm -f $(FEATURES_DUMP_FILE) $(FEATURES_DUMP_FILE_STATIC)
|
|
|
|
out: $(run_O)
|
|
@echo OK
|
|
@rm -f $(FEATURES_DUMP_FILE) $(FEATURES_DUMP_FILE_STATIC)
|
|
|
|
ifeq ($(REUSE_FEATURES_DUMP),1)
|
|
$(FEATURES_DUMP_FILE):
|
|
$(call clean)
|
|
@cmd="cd $(PERF) && make FEATURE_DUMP_COPY=$@ $(O_OPT) feature-dump"; \
|
|
echo "- $@: $$cmd" && echo $$cmd && \
|
|
( eval $$cmd ) > /dev/null 2>&1
|
|
|
|
$(FEATURES_DUMP_FILE_STATIC):
|
|
$(call clean)
|
|
@cmd="cd $(PERF) && make FEATURE_DUMP_COPY=$@ $(O_OPT) LDFLAGS='-static' feature-dump"; \
|
|
echo "- $@: $$cmd" && echo $$cmd && \
|
|
( eval $$cmd ) > /dev/null 2>&1
|
|
|
|
# Add feature dump dependency for run/run_O targets
|
|
$(foreach t,$(run) $(run_O),$(eval \
|
|
$(t): $(if $(findstring make_static,$(t)),\
|
|
$(FEATURES_DUMP_FILE_STATIC),\
|
|
$(FEATURES_DUMP_FILE))))
|
|
|
|
# Append 'FEATURES_DUMP=' option to all test cases. For example:
|
|
# make_no_libbpf: NO_LIBBPF=1 --> NO_LIBBPF=1 FEATURES_DUMP=/a/b/BUILD_TEST_FEATURE_DUMP
|
|
# make_static: LDFLAGS=-static --> LDFLAGS=-static FEATURES_DUMP=/a/b/BUILD_TEST_FEATURE_DUMP_STATIC
|
|
$(foreach t,$(run),$(if $(findstring make_static,$(t)),\
|
|
$(eval $(t) := $($(t)) FEATURES_DUMP=$(FEATURES_DUMP_FILE_STATIC)),\
|
|
$(eval $(t) := $($(t)) FEATURES_DUMP=$(FEATURES_DUMP_FILE))))
|
|
endif
|
|
|
|
.PHONY: all $(run) $(run_O) tarpkg clean make_kernelsrc make_kernelsrc_tools
|
|
endif # ifndef MK
|