Commit 2a987e65 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-fixes-for-v5.16-2021-12-07' of... 

Merge tag 'perf-tools-fixes-for-v5.16-2021-12-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

Pull perf tools fixes from Arnaldo Carvalho de Melo:

 - Fix SMT detection fast read path on sysfs.

 - Fix memory leaks when processing feature headers in perf.data files.

 - Fix 'Simple expression parser' 'perf test' on arch without CPU die
   topology info, such as s/390.

 - Fix building perf with BUILD_BPF_SKEL=1.

 - Fix 'perf bench' by reverting "perf bench: Fix two memory leaks
   detected with ASan".

 - Fix itrace space allowed for new attributes in 'perf script'.

 - Fix the build feature detection fast path, that was always failing on
   systems with python3 development packages, speeding up the build.

 - Reset shadow counts before loading, fixing metrics using
   duration_time.

 - Sync more kernel headers changed by the new futex_waitv syscall: s390
   and powerpc.

* tag 'perf-tools-fixes-for-v5.16-2021-12-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
  perf bpf_skel: Do not use typedef to avoid error on old clang
  perf bpf: Fix building perf with BUILD_BPF_SKEL=1 by default in more distros
  perf header: Fix memory leaks when processing feature headers
  perf test: Reset shadow counts before loading
  perf test: Fix 'Simple expression parser' test on arch without CPU die topology info
  tools build: Remove needless libpython-version feature check that breaks test-all fast path
  perf tools: Fix SMT detection fast read path
  tools headers UAPI: Sync powerpc syscall table file changed by new futex_waitv syscall
  perf inject: Fix itrace space allowed for new attributes
  tools headers UAPI: Sync s390 syscall table file changed by new futex_waitv syscall
  Revert "perf bench: Fix two memory leaks detected with ASan"
parents 95723243 5a897531

tools/build/Makefile.feature

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ FEATURE_TESTS_BASIC := \ 
        numa_num_possible_cpus          \

        libperl                         \

        libpython                       \

        libpython-version               \

        libslang                        \

        libslang-include-subdir         \

        libtraceevent                   \

tools/build/feature/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ FILES= \ 
         test-numa_num_possible_cpus.bin        \

         test-libperl.bin                       \

         test-libpython.bin                     \

         test-libpython-version.bin             \

         test-libslang.bin                      \

         test-libslang-include-subdir.bin       \

         test-libtraceevent.bin                 \
@@ -227,9 +226,6 @@ $(OUTPUT)test-libperl.bin: 
$(OUTPUT)test-libpython.bin:

	$(BUILD) $(FLAGS_PYTHON_EMBED)



$(OUTPUT)test-libpython-version.bin:

	$(BUILD)



$(OUTPUT)test-libbfd.bin:

	$(BUILD) -DPACKAGE='"perf"' -lbfd -ldl

tools/build/feature/test-all.c

+0 −5
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ 
# include "test-libpython.c"

#undef main



#define main main_test_libpython_version

# include "test-libpython-version.c"

#undef main



#define main main_test_libperl

# include "test-libperl.c"

#undef main
@@ -177,7 +173,6 @@ 
int main(int argc, char *argv[])

{

	main_test_libpython();

	main_test_libpython_version();

	main_test_libperl();

	main_test_hello();

	main_test_libelf();

tools/build/feature/test-libpython-version.c

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <Python.h>



#if PY_VERSION_HEX >= 0x03000000

	#error

#endif



int main(void)

{

	return 0;

}

tools/perf/Makefile.config

+0 −2
Original line number Diff line number Diff line
@@ -271,8 +271,6 @@ endif 


FEATURE_CHECK_CFLAGS-libpython := $(PYTHON_EMBED_CCOPTS)

FEATURE_CHECK_LDFLAGS-libpython := $(PYTHON_EMBED_LDOPTS)

FEATURE_CHECK_CFLAGS-libpython-version := $(PYTHON_EMBED_CCOPTS)

FEATURE_CHECK_LDFLAGS-libpython-version := $(PYTHON_EMBED_LDOPTS)



FEATURE_CHECK_LDFLAGS-libaio = -lrt