# git rev-parse -q --verify 27151f177827d478508e756c7657273261aaf8a9^{commit} 27151f177827d478508e756c7657273261aaf8a9 already have revision, skipping fetch # git checkout -q -f -B kisskb 27151f177827d478508e756c7657273261aaf8a9 # git clean -qxdf # < git log -1 # commit 27151f177827d478508e756c7657273261aaf8a9 # Merge: 58ca24158758 c7a3828d98db # Author: Linus Torvalds # Date: Sun Sep 5 11:56:18 2021 -0700 # # Merge tag 'perf-tools-for-v5.15-2021-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux # # Pull perf tool updates from Arnaldo Carvalho de Melo: # "New features: # # - Improvements for the flamegraph python script, including: # - Display perf.data header # - Display PIDs of user stacks # - Added option to change color scheme # - Default to blue/green color scheme to improve accessibility # - Correctly identify kernel stacks when debuginfo is available # # - Improvements for 'perf bench futex': # - Add --mlockall parameter # - Add --broadcast and --pi to the 'requeue' sub benchmark # # - Add support for PMU aliases. # # - Introduce an ARM Coresight ETE decoder. # # - Add a 'perf bench' entry for evlist open/close operations, to help # quantify improvements with multithreading 'perf record'. # # - Allow reporting the [un]throttle PERF_RECORD_ meta event in 'perf # script's python scripting. # # - Add a 'perf test' entry for PMU aliases. # # - Add a 'perf test' entry for 'perf record/perf report/perf script' # pipe mode. # # Fixes: # # - perf script dlfilter (API for filtering via dynamically loaded # shared object introduced in v5.14) fixes and a 'perf test' entry # for it. # # - Fix get_current_dir_name() compilation on Android. # # - Fix issues with asciidoc and double dashes uses. # # - Fix memory leaks in the BTF handling code. # # - Fix leftover problems in the Documentation from the infrastructure # originally lifted from the git codebase. # # - Fix *probe_vfs_getname.sh 'perf test' failures. # # - Handle fd gaps in 'perf test's test__dso_data_reopen(). # # - Make sure to show disasembly warnings for 'perf annotate --stdio'. # # - Fix output from pipe to file and vice-versa in 'perf # record/report/script'. # # - Correct 'perf data -h' output. # # - Fix wrong comm in system-wide mode with 'perf record --delay'. # # - Do not allow --for-each-cgroup without cpu in 'perf stat' # # - Make 'perf test --skip' work on shell tests. # # - Fix libperf's verbose printing. # # Misc improvements: # # - Preparatory patches for multithreading various 'perf record' phases # (synthesizing, opening, recording, etc). # # - Add sparse context/locking annotations in compiler-types.h, also to # help with the multithreading effort. # # - Optimize the generation of the arch specific erno tables used in # 'perf trace'. # # - Optimize libperf's perf_cpu_map__max(). # # - Improve ARM's CoreSight warnings. # # - Report collisions in AUX records. # # - Improve warnings for the LLVM 'perf test' entry. # # - Improve the PMU events 'perf test' codebase. # # - perf test: Do not compare overheads in the zstd comp test # # - Better support annotation on ARM. # # - Update 'perf trace's cmd string table to decode sys_bpf() first # arg. # # Vendor events: # # - Add JSON events and metrics for Intel's Ice Lake, Tiger Lake and # Elhart Lake. # # - Update JSON eventsand metrics for Intel's Cascade Lake and Sky Lake # servers. # # Hardware tracing: # # - Improvements for the ARM hardware tracing auxtrace support" # # * tag 'perf-tools-for-v5.15-2021-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: (130 commits) # perf tests: Add test for PMU aliases # perf pmu: Add PMU alias support # perf session: Report collisions in AUX records # perf script python: Allow reporting the [un]throttle PERF_RECORD_ meta event # perf build: Report failure for testing feature libopencsd # perf cs-etm: Show a warning for an unknown magic number # perf cs-etm: Print the decoder name # perf cs-etm: Create ETE decoder # perf cs-etm: Update OpenCSD decoder for ETE # perf cs-etm: Fix typo # perf cs-etm: Save TRCDEVARCH register # perf cs-etm: Refactor out ETMv4 header saving # perf cs-etm: Initialise architecture based on TRCIDR1 # perf cs-etm: Refactor initialisation of decoder params. # tools build: Fix feature detect clean for out of source builds # perf evlist: Add evlist__for_each_entry_from() macro # perf evsel: Handle precise_ip fallback in evsel__open_cpu() # perf evsel: Move bpf_counter__install_pe() to success path in evsel__open_cpu() # perf evsel: Move test_attr__open() to success path in evsel__open_cpu() # perf evsel: Move ignore_missing_thread() to fallback code # ... # < /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 27151f177827d478508e756c7657273261aaf8a9 # < make -s -j 48 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 48 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 48 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:11917:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:11920:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:11922:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:11924:warning: override: reassigning to symbol UML_NET_SLIP .config:11927:warning: override: reassigning to symbol UML_NET_MCAST .config:11929:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 48 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/x86/um/Makefile:44: FORCE prerequisite is missing /kisskb/src/kernel/trace/trace_osnoise.c: In function 'start_kthread': /kisskb/src/kernel/trace/trace_osnoise.c:1515:8: error: 'main' is usually a function [-Werror=main] void *main = osnoise_main; ^ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:277: kernel/trace/trace_osnoise.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:540: kernel/trace] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1872: kernel] Error 2 make[1]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/dma/ioat/dca.c: In function 'dca_enabled_in_bios': /kisskb/src/drivers/dma/ioat/dca.c:64:18: error: implicit declaration of function 'cpuid_eax' [-Werror=implicit-function-declaration] cpuid_level_9 = cpuid_eax(9); ^ /kisskb/src/drivers/dma/ioat/dca.c: In function 'system_has_dca_enabled': /kisskb/src/drivers/dma/ioat/dca.c:74:6: error: implicit declaration of function 'boot_cpu_has' [-Werror=implicit-function-declaration] if (boot_cpu_has(X86_FEATURE_DCA)) ^ /kisskb/src/drivers/dma/ioat/dca.c: In function 'ioat_dca_get_tag': /kisskb/src/drivers/dma/ioat/dca.c:17:31: error: implicit declaration of function 'cpuid_ebx' [-Werror=implicit-function-declaration] #define cpu_physical_id(cpu) (cpuid_ebx(1) >> 24) ^ /kisskb/src/drivers/dma/ioat/dca.c:185:12: note: in expansion of macro 'cpu_physical_id' apic_id = cpu_physical_id(cpu); ^ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/dma/ioat/dca.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/dma/ioat] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/dma] Error 2 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/video/fbdev/riva/fbdev.c: In function 'rivafb_probe': /kisskb/src/drivers/video/fbdev/riva/fbdev.c:2062:11: error: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Werror=discarded-qualifiers] iounmap(default_par->riva.PRAMIN); ^ In file included from /kisskb/src/arch/um/include/asm/io.h:7:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/um/include/asm/hardirq.h:5, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/trace_recursion.h:5, from /kisskb/src/include/linux/ftrace.h:10, from /kisskb/src/include/linux/kprobes.h:29, from /kisskb/src/include/linux/kgdb.h:19, from /kisskb/src/include/linux/fb.h:6, from /kisskb/src/drivers/video/fbdev/riva/fbdev.c:39: /kisskb/src/include/asm-generic/logic_io.h:36:17: note: expected 'void *' but argument is of type 'volatile U032 * {aka volatile unsigned int *}' #define iounmap iounmap ^ /kisskb/src/include/asm-generic/logic_io.h:37:6: note: in expansion of macro 'iounmap' void iounmap(void __iomem *addr); ^ /kisskb/src/drivers/video/fbdev/riva/fbdev.c: In function 'rivafb_remove': /kisskb/src/drivers/video/fbdev/riva/fbdev.c:2095:11: error: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Werror=discarded-qualifiers] iounmap(par->riva.PRAMIN); ^ In file included from /kisskb/src/arch/um/include/asm/io.h:7:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/um/include/asm/hardirq.h:5, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/trace_recursion.h:5, from /kisskb/src/include/linux/ftrace.h:10, from /kisskb/src/include/linux/kprobes.h:29, from /kisskb/src/include/linux/kgdb.h:19, from /kisskb/src/include/linux/fb.h:6, from /kisskb/src/drivers/video/fbdev/riva/fbdev.c:39: /kisskb/src/include/asm-generic/logic_io.h:36:17: note: expected 'void *' but argument is of type 'volatile U032 * {aka volatile unsigned int *}' #define iounmap iounmap ^ /kisskb/src/include/asm-generic/logic_io.h:37:6: note: in expansion of macro 'iounmap' void iounmap(void __iomem *addr); ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/video/fbdev/riva/fbdev.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/video/fbdev/riva] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/video/fbdev] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/video] Error 2 /kisskb/src/drivers/pci/controller/vmd.c:116:21: error: field 'sysdata' has incomplete type struct pci_sysdata sysdata; ^ /kisskb/src/drivers/pci/controller/vmd.c: In function 'vmd_compose_msi_msg': /kisskb/src/drivers/pci/controller/vmd.c:150:20: error: 'X86_MSI_BASE_ADDRESS_HIGH' undeclared (first use in this function) msg->address_hi = X86_MSI_BASE_ADDRESS_HIGH; ^ /kisskb/src/drivers/pci/controller/vmd.c:150:20: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/drivers/pci/controller/vmd.c:151:19: error: 'arch_msi_msg_addr_lo_t {aka struct arch_msi_msg_addr_lo}' has no member named 'base_address' msg->arch_addr_lo.base_address = X86_MSI_BASE_ADDRESS_LOW; ^ /kisskb/src/drivers/pci/controller/vmd.c:151:35: error: 'X86_MSI_BASE_ADDRESS_LOW' undeclared (first use in this function) msg->arch_addr_lo.base_address = X86_MSI_BASE_ADDRESS_LOW; ^ /kisskb/src/drivers/pci/controller/vmd.c:152:19: error: 'arch_msi_msg_addr_lo_t {aka struct arch_msi_msg_addr_lo}' has no member named 'destid_0_7' msg->arch_addr_lo.destid_0_7 = index_from_irqs(vmd, irq); ^ /kisskb/src/drivers/pci/controller/vmd.c: In function 'vmd_enable_domain': /kisskb/src/drivers/pci/controller/vmd.c:700:4: error: dereferencing pointer to incomplete type 'struct pci_sysdata' sd->vmd_dev = vmd->dev; ^ /kisskb/src/drivers/pci/controller/vmd.c: In function 'vmd_from_bus': /kisskb/src/drivers/pci/controller/vmd.c:127:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/pci/controller/vmd.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/pci/controller] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/pci] Error 2 make[1]: *** [/kisskb/src/Makefile:1872: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 48 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:04:40.757474