mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
perf tools improvements and fixes:
User visible bug fixes: - Fix reading of build-id from vDSO (Ben Hutchings) - Fix processing samples for guests, noticed with 'perf kvm', but noticeable as well via other tools, such as 'perf top' (Ravi Bangoria) Build infrastructure: - Add feature-dump target and FEATURES_DUMP make variable, to allow reusing the feature detection results among multiple tools/ living codebases, such as perf and lib/bpf (Jiri Olsa) - 'make -C tools/perf build-test' improvements, making it more paralelizable and allowing building it outside of the source tree, using O= (Wang Nan) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJWmV0JAAoJENZQFvNTUqpAjuMQALEDS6HtPwN5y/XpMLJqqWdI EigVIOIZQUIsrNTJXT+qYWJ2T4SOeQzX9GjsuenbLy6qOwej4mj//se10v1Ev3zK THlwz6pvRlMDtzOoV1zzkPaUdgbiWfuyuC5OTDo+YNtHdWeXNt4gND0CxqWTOs6N DouCpHkrRa1DgYtV93hyg0XXJg4gox6P1Efq1gk4tlOpeiWJt188k8RjyBfhAueL vjbO2ms3RmJhHa8qvuQdl+xW8rCIW3R//IPHJucsOYFl9dczYPxq/t9PbyOiI/fh nBBn/4UAhgR0Rn9mDOJXoMGqXshHZA214T0+2XL8SFVdj/4YiUc3I+kwrJxBGGHk BfJwnY/FWTAON0TSkHzG9AuRd29swefobx02EhxbuTyllCcsNCfwXCYPeHLlvtyQ jO5WRFjQ0zRA0pz01YkNP3Ib6M0FW2l42o2m96sBPjRE1Crxy6dkHSFFCelL5sON aTM2q3cODRXOKC7hoayJvFwsc1a7pQWw2MWKSbrIt/1QPuETJrDvHYi30C7JHPLf 0IxbI9Zt0WvlKVC+RhiZJSbkJOMap8Jl6tVCS3n2UM09Bj7wjaRGXbuLt0GwAtlI lJXUdf3xOsfDg+6XUMir7VkPFUWKa8cKzOvpyWaXgAMUjWO5aNxxkx8QodsgNkWH LdyRyeOoFz574tTf/h1W =XjpY -----END PGP SIGNATURE----- Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent Pull perf tools improvements and fixes from Arnaldo Carvalho de Melo: User visible bug fixes: - Fix reading of build-id from vDSO (Ben Hutchings) - Fix processing samples for guests, noticed with 'perf kvm', but noticeable as well via other tools, such as 'perf top' (Ravi Bangoria) Build infrastructure: - Add feature-dump target and FEATURES_DUMP make variable, to allow reusing the feature detection results among multiple tools/ living codebases, such as perf and lib/bpf (Jiri Olsa) - 'make -C tools/perf build-test' improvements, making it more paralelizable and allowing building it outside of the source tree, using O= (Wang Nan) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
commit
f5540ecb89
5 changed files with 70 additions and 18 deletions
|
@ -77,6 +77,9 @@ include config/utilities.mak
|
|||
# Define NO_AUXTRACE if you do not want AUX area tracing support
|
||||
#
|
||||
# Define NO_LIBBPF if you do not want BPF support
|
||||
#
|
||||
# Define FEATURES_DUMP to provide features detection dump file
|
||||
# and bypass the feature detection
|
||||
|
||||
# As per kernel Makefile, avoid funny character set dependencies
|
||||
unexport LC_ALL
|
||||
|
@ -166,6 +169,15 @@ ifeq ($(config),1)
|
|||
include config/Makefile
|
||||
endif
|
||||
|
||||
# The FEATURE_DUMP_EXPORT holds location of the actual
|
||||
# FEATURE_DUMP file to be used to bypass feature detection
|
||||
# (for bpf or any other subproject)
|
||||
ifeq ($(FEATURES_DUMP),)
|
||||
FEATURE_DUMP_EXPORT := $(realpath $(OUTPUT)FEATURE-DUMP)
|
||||
else
|
||||
FEATURE_DUMP_EXPORT := $(FEATURES_DUMP)
|
||||
endif
|
||||
|
||||
export prefix bindir sharedir sysconfdir DESTDIR
|
||||
|
||||
# sparse is architecture-neutral, which means that we need to tell it
|
||||
|
@ -436,7 +448,7 @@ $(LIBAPI)-clean:
|
|||
$(Q)$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null
|
||||
|
||||
$(LIBBPF): fixdep FORCE
|
||||
$(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) $(OUTPUT)libbpf.a FEATURES_DUMP=$(realpath $(OUTPUT)FEATURE-DUMP)
|
||||
$(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) $(OUTPUT)libbpf.a FEATURES_DUMP=$(FEATURE_DUMP_EXPORT)
|
||||
|
||||
$(LIBBPF)-clean:
|
||||
$(call QUIET_CLEAN, libbpf)
|
||||
|
@ -610,6 +622,17 @@ clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean
|
|||
$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
|
||||
$(python-clean)
|
||||
|
||||
#
|
||||
# To provide FEATURE-DUMP into $(FEATURE_DUMP_COPY)
|
||||
# file if defined, with no further action.
|
||||
feature-dump:
|
||||
ifdef FEATURE_DUMP_COPY
|
||||
@cp $(OUTPUT)FEATURE-DUMP $(FEATURE_DUMP_COPY)
|
||||
@echo "FEATURE-DUMP file copied into $(FEATURE_DUMP_COPY)"
|
||||
else
|
||||
@echo "FEATURE-DUMP file available in $(OUTPUT)FEATURE-DUMP"
|
||||
endif
|
||||
|
||||
#
|
||||
# Trick: if ../../.git does not exist - we are building out of tree for example,
|
||||
# then force version regeneration:
|
||||
|
|
|
@ -181,7 +181,11 @@ LDFLAGS += -Wl,-z,noexecstack
|
|||
|
||||
EXTLIBS = -lpthread -lrt -lm -ldl
|
||||
|
||||
ifeq ($(FEATURES_DUMP),)
|
||||
include $(srctree)/tools/build/Makefile.feature
|
||||
else
|
||||
include $(FEATURES_DUMP)
|
||||
endif
|
||||
|
||||
ifeq ($(feature-stackprotector-all), 1)
|
||||
CFLAGS += -fstack-protector-all
|
||||
|
|
|
@ -5,7 +5,7 @@ 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
|
||||
@echo "Testing Makefile.perf"; $(MAKE) -sf tests/make MK=Makefile.perf SET_PARALLEL=1 SET_O=1
|
||||
else
|
||||
# run only specific test over 'Makefile'
|
||||
%:
|
||||
|
@ -13,6 +13,26 @@ else
|
|||
endif
|
||||
else
|
||||
PERF := .
|
||||
PERF_O := $(PERF)
|
||||
O_OPT :=
|
||||
|
||||
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
|
||||
|
@ -156,11 +176,11 @@ 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)/python/perf.so
|
||||
test_make_python_perf_so := test -f $(PERF_O)/python/perf.so
|
||||
|
||||
test_make_perf_o := test -f $(PERF)/perf.o
|
||||
test_make_util_map_o := test -f $(PERF)/util/map.o
|
||||
test_make_util_pmu_bison_o := test -f $(PERF)/util/pmu-bison.o
|
||||
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 \
|
||||
|
@ -227,7 +247,7 @@ 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)/perf
|
||||
test_default = test -x $(PERF_O)/perf
|
||||
test = $(if $(test_$1),$(test_$1),$(test_default))
|
||||
|
||||
test_default_O = test -x $$TMP_O/perf
|
||||
|
@ -247,12 +267,12 @@ endif
|
|||
|
||||
MAKEFLAGS := --no-print-directory
|
||||
|
||||
clean := @(cd $(PERF); make -s -f $(MK) clean >/dev/null)
|
||||
clean := @(cd $(PERF); make -s -f $(MK) $(O_OPT) clean >/dev/null)
|
||||
|
||||
$(run):
|
||||
$(call clean)
|
||||
@TMP_DEST=$$(mktemp -d); \
|
||||
cmd="cd $(PERF) && make -f $(MK) DESTDIR=$$TMP_DEST $($@)"; \
|
||||
cmd="cd $(PERF) && make -f $(MK) $(PARALLEL_OPT) $(O_OPT) DESTDIR=$$TMP_DEST $($@)"; \
|
||||
echo "- $@: $$cmd" && echo $$cmd > $@ && \
|
||||
( eval $$cmd ) >> $@ 2>&1; \
|
||||
echo " test: $(call test,$@)" >> $@ 2>&1; \
|
||||
|
@ -263,7 +283,7 @@ $(run_O):
|
|||
$(call clean)
|
||||
@TMP_O=$$(mktemp -d); \
|
||||
TMP_DEST=$$(mktemp -d); \
|
||||
cmd="cd $(PERF) && make -f $(MK) O=$$TMP_O DESTDIR=$$TMP_DEST $($(patsubst %_O,%,$@))"; \
|
||||
cmd="cd $(PERF) && make -f $(MK) $(PARALLEL_OPT) O=$$TMP_O DESTDIR=$$TMP_DEST $($(patsubst %_O,%,$@))"; \
|
||||
echo "- $@: $$cmd" && echo $$cmd > $@ && \
|
||||
( eval $$cmd ) >> $@ 2>&1 && \
|
||||
echo " test: $(call test_O,$@)" >> $@ 2>&1; \
|
||||
|
@ -276,17 +296,22 @@ tarpkg:
|
|||
( eval $$cmd ) >> $@ 2>&1 && \
|
||||
rm -f $@
|
||||
|
||||
KERNEL_O := ../..
|
||||
ifneq ($(O),)
|
||||
KERNEL_O := $(O)
|
||||
endif
|
||||
|
||||
make_kernelsrc:
|
||||
@echo "- make -C <kernelsrc> tools/perf"
|
||||
@echo "- make -C <kernelsrc> $(PARALLEL_OPT) $(K_O_OPT) tools/perf"
|
||||
$(call clean); \
|
||||
(make -C ../.. tools/perf) > $@ 2>&1 && \
|
||||
test -x perf && rm -f $@ || (cat $@ ; false)
|
||||
(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 perf"
|
||||
@echo "- make -C <kernelsrc>/tools $(PARALLEL_OPT) $(K_O_OPT) perf"
|
||||
$(call clean); \
|
||||
(make -C ../../tools perf) > $@ 2>&1 && \
|
||||
test -x perf && rm -f $@ || (cat $@ ; false)
|
||||
(make -C ../../tools $(PARALLEL_OPT) $(K_O_OPT) perf) > $@ 2>&1 && \
|
||||
test -x $(KERNEL_O)/tools/perf/perf && rm -f $@ || (cat $@ ; false)
|
||||
|
||||
all: $(run) $(run_O) tarpkg make_kernelsrc make_kernelsrc_tools
|
||||
@echo OK
|
||||
|
|
|
@ -1149,7 +1149,7 @@ static struct machine *machines__find_for_cpumode(struct machines *machines,
|
|||
|
||||
machine = machines__find(machines, pid);
|
||||
if (!machine)
|
||||
machine = machines__find(machines, DEFAULT_GUEST_KERNEL_ID);
|
||||
machine = machines__findnew(machines, DEFAULT_GUEST_KERNEL_ID);
|
||||
return machine;
|
||||
}
|
||||
|
||||
|
|
|
@ -1466,7 +1466,7 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)
|
|||
* Read the build id if possible. This is required for
|
||||
* DSO_BINARY_TYPE__BUILDID_DEBUGINFO to work
|
||||
*/
|
||||
if (filename__read_build_id(dso->name, build_id, BUILD_ID_SIZE) > 0)
|
||||
if (filename__read_build_id(dso->long_name, build_id, BUILD_ID_SIZE) > 0)
|
||||
dso__set_build_id(dso, build_id);
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue