# git rev-parse -q --verify b229b6ca5abbd63ff40c1396095b1b36b18139c3^{commit} b229b6ca5abbd63ff40c1396095b1b36b18139c3 already have revision, skipping fetch # git checkout -q -f -B kisskb b229b6ca5abbd63ff40c1396095b1b36b18139c3 # git clean -qxdf # < git log -1 # commit b229b6ca5abbd63ff40c1396095b1b36b18139c3 # Merge: a2718383ef9d e9229d5b6254 # Author: Linus Torvalds # Date: Wed Oct 26 17:44:10 2022 -0700 # # Merge tag 'perf-tools-fixes-for-v6.1-2022-10-26' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux # # Pull perf tool fixes from Arnaldo Carvalho de Melo: # # - Fix some aspects of building with an older (than the one in the # kernel sources) libbpf present in a distro, when building with # LIBBPF_DYNAMIC=1. # # - Fix errno setting races with event_fd and the signal handler in 'perf # record'. # # - Fix Power10 hv-24x7 metric events when some events may have a zero # count based on system configuration. # # - Do not fail Intel-PT misc test w/o libpython, just skip it. # # - Fix incorrect arm64 Hisi hip08 L3 metrics (IF_BP_MISP_BR_RET, # IF_BP_MISP_BR_RET, IF_BP_MISP_BR_BL) due to mistakes in the # documentation used to generate the JSON files for these metrics. # # - Fix auxtrace (Intel PT, ARM Coresight) address filter symbol name # match for modules, we need to skip the module name. # # - Sync copies of files with the kernel sources, including ppc syscall # tables and assorted headers, some resulting in tools being able to # decode new network protocols (IPPROTO_L2TP) and statx masks # (STATX_DIOALIGN). # # - Fix PMU name pai_crypto in the vendor events file (JSON) for s390. # # - Fix man page build wrt perf-arm-coresight.txt as the build process # assumes files starting with 'perf-' are man pages, and this file # isn't one. # # * tag 'perf-tools-fixes-for-v6.1-2022-10-26' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: # perf vendor events arm64: Fix incorrect Hisi hip08 L3 metrics # perf auxtrace: Fix address filter symbol name match for modules # tools headers UAPI: Sync linux/perf_event.h with the kernel sources # tools headers cpufeatures: Sync with the kernel sources # tools headers uapi: Sync linux/stat.h with the kernel sources # tools include UAPI: Sync sound/asound.h copy with the kernel sources # tools headers uapi: Update linux/in.h copy # tools headers: Update the copy of x86's memcpy_64.S used in 'perf bench' # tools headers arm64: Sync arm64's cputype.h with the kernel sources # perf test: Do not fail Intel-PT misc test w/o libpython # perf list: Fix PMU name pai_crypto in perf list on s390 # perf record: Fix event fd races # perf bpf: Fix build with libbpf 0.7.0 by checking if bpf_program__set_insns() is available # perf bpf: Fix build with libbpf 0.7.0 by adding prototype for bpf_load_program() # perf vendor events power10: Fix hv-24x7 metric events # perf docs: Fix man page build wrt perf-arm-coresight.txt # tools headers UAPI: Sync powerpc syscall tables with the kernel sources # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 b229b6ca5abbd63ff40c1396095b1b36b18139c3 # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allyesconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:12782:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12787:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12789:warning: override: reassigning to symbol UML_NET_SLIP .config:12792:warning: override: reassigning to symbol UML_NET_MCAST .config:12794:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/arch/um/os-Linux/util.c:17:24: fatal error: sys/random.h: No such file or directory compilation terminated. make[3]: *** [/kisskb/src/scripts/Makefile.build:250: arch/um/os-Linux/util.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:500: arch/um/os-Linux] Error 2 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c: In function 'qib_unordered_wc': /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:22: error: 'struct cpuinfo_um' has no member named 'x86_vendor' return boot_cpu_data.x86_vendor != X86_VENDOR_AMD; ^ /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:37: error: 'X86_VENDOR_AMD' undeclared (first use in this function) return boot_cpu_data.x86_vendor != X86_VENDOR_AMD; ^ /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:149:37: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/drivers/infiniband/hw/qib/qib_wc_x86_64.c:150:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:250: drivers/infiniband/hw/qib/qib_wc_x86_64.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/infiniband/hw/qib] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/infiniband/hw] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/infiniband] Error 2 make[3]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/x86/um/asm/processor.h:41:0, from /kisskb/src/include/linux/mutex.h:19, from /kisskb/src/include/linux/kernfs.h:11, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:35, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:26: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function 'kfd_cpumask_to_apic_id': /kisskb/src/arch/um/include/asm/processor-generic.h:94:18: error: called object is not a function or function pointer #define cpu_data (&boot_cpu_data) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1930:9: note: in expansion of macro 'cpu_data' return cpu_data(first_cpu_of_numa_node).apicid; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1934:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:250: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[6]: *** Waiting for unfinished jobs.... make[5]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/gpu/drm/amd/amdgpu] Error 2 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/gpu/drm] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/gpu] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: drivers] Error 2 make[1]: *** [/kisskb/src/Makefile:1992: .] Error 2 make: *** [Makefile:231: __sub-make] Error 2 Command 'make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allyesconfig_um-x86_64 # Build took: 0:12:56.473423