# git rev-parse -q --verify b8481381d4e2549f06812eb6069198144696340c^{commit} b8481381d4e2549f06812eb6069198144696340c already have revision, skipping fetch # git checkout -q -f -B kisskb b8481381d4e2549f06812eb6069198144696340c # git clean -qxdf # < git log -1 # commit b8481381d4e2549f06812eb6069198144696340c # Merge: 637c2dfcd9f5 ca9680821dfe # Author: Linus Torvalds # Date: Sun Jun 9 09:04:51 2024 -0700 # # Merge tag 'perf-tools-fixes-for-v6.10-2-2024-06-09' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools # # Pull perf tools fixes from Arnaldo Carvalho de Melo: # # - Update copies of kernel headers, which resulted in support for the # new 'mseal' syscall, SUBVOL statx return mask bit, RISC-V and PPC # prctls, fcntl's DUPFD_QUERY, POSTED_MSI_NOTIFICATION IRQ vector, # 'map_shadow_stack' syscall for x86-32. # # - Revert perf.data record memory allocation optimization that ended up # causing a regression, work is being done to re-introduce it in the # next merge window. # # - Fix handling of minimal vmlinux.h file used with BPF's CO-RE when # interrupting the build. # # * tag 'perf-tools-fixes-for-v6.10-2-2024-06-09' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools: # perf bpf: Fix handling of minimal vmlinux.h file when interrupting the build # Revert "perf record: Reduce memory for recording PERF_RECORD_LOST_SAMPLES event" # tools headers arm64: Sync arm64's cputype.h with the kernel sources # tools headers uapi: Sync linux/stat.h with the kernel sources to pick STATX_SUBVOL # tools headers UAPI: Update i915_drm.h with the kernel sources # tools headers UAPI: Sync kvm headers with the kernel sources # tools arch x86: Sync the msr-index.h copy with the kernel sources # tools headers: Update the syscall tables and unistd.h, mostly to support the new 'mseal' syscall # perf trace beauty: Update the arch/x86/include/asm/irq_vectors.h copy with the kernel sources to pick POSTED_MSI_NOTIFICATION # perf beauty: Update copy of linux/socket.h with the kernel sources # tools headers UAPI: Sync fcntl.h with the kernel sources to pick F_DUPFD_QUERY # tools headers UAPI: Sync linux/prctl.h with the kernel sources # tools include UAPI: Sync linux/stat.h with the kernel sources # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 b8481381d4e2549f06812eb6069198144696340c # make -s -j 32 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # 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 # Added to kconfig CONFIG_SPI_STM32_QSPI=n # < make -s -j 32 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 32 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:14180:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY .config:14184:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:14186:warning: override: reassigning to symbol UML_NET_SLIP .config:14191:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 In file included from /kisskb/src/include/linux/bpf_verifier.h:9, from /kisskb/src/kernel/bpf/verifier.c:13: /kisskb/src/kernel/bpf/verifier.c: In function ‘do_misc_fixups’: /kisskb/src/kernel/bpf/verifier.c:20325:85: error: ‘pcpu_hot’ undeclared (first use in this function) 20325 | insn_buf[0] = BPF_MOV32_IMM(BPF_REG_0, (u32)(unsigned long)&pcpu_hot.cpu_number); | ^~~~~~~~ /kisskb/src/include/linux/filter.h:219:26: note: in definition of macro ‘BPF_MOV32_IMM’ 219 | .imm = IMM }) | ^~~ /kisskb/src/kernel/bpf/verifier.c:20325:85: note: each undeclared identifier is reported only once for each function it appears in 20325 | insn_buf[0] = BPF_MOV32_IMM(BPF_REG_0, (u32)(unsigned long)&pcpu_hot.cpu_number); | ^~~~~~~~ /kisskb/src/include/linux/filter.h:219:26: note: in definition of macro ‘BPF_MOV32_IMM’ 219 | .imm = IMM }) | ^~~ make[5]: *** [/kisskb/src/scripts/Makefile.build:244: kernel/bpf/verifier.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:485: kernel/bpf] Error 2 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/lib/iomap.c:156:5: error: no previous prototype for ‘ioread64_lo_hi’ [-Werror=missing-prototypes] 156 | u64 ioread64_lo_hi(const void __iomem *addr) | ^~~~~~~~~~~~~~ /kisskb/src/lib/iomap.c:163:5: error: no previous prototype for ‘ioread64_hi_lo’ [-Werror=missing-prototypes] 163 | u64 ioread64_hi_lo(const void __iomem *addr) | ^~~~~~~~~~~~~~ /kisskb/src/lib/iomap.c:170:5: error: no previous prototype for ‘ioread64be_lo_hi’ [-Werror=missing-prototypes] 170 | u64 ioread64be_lo_hi(const void __iomem *addr) | ^~~~~~~~~~~~~~~~ /kisskb/src/lib/iomap.c:178:5: error: no previous prototype for ‘ioread64be_hi_lo’ [-Werror=missing-prototypes] 178 | u64 ioread64be_hi_lo(const void __iomem *addr) | ^~~~~~~~~~~~~~~~ /kisskb/src/lib/iomap.c:264:6: error: no previous prototype for ‘iowrite64_lo_hi’ [-Werror=missing-prototypes] 264 | void iowrite64_lo_hi(u64 val, void __iomem *addr) | ^~~~~~~~~~~~~~~ /kisskb/src/lib/iomap.c:272:6: error: no previous prototype for ‘iowrite64_hi_lo’ [-Werror=missing-prototypes] 272 | void iowrite64_hi_lo(u64 val, void __iomem *addr) | ^~~~~~~~~~~~~~~ /kisskb/src/lib/iomap.c:280:6: error: no previous prototype for ‘iowrite64be_lo_hi’ [-Werror=missing-prototypes] 280 | void iowrite64be_lo_hi(u64 val, void __iomem *addr) | ^~~~~~~~~~~~~~~~~ /kisskb/src/lib/iomap.c:288:6: error: no previous prototype for ‘iowrite64be_hi_lo’ [-Werror=missing-prototypes] 288 | void iowrite64be_hi_lo(u64 val, void __iomem *addr) | ^~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:244: lib/iomap.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:485: lib] Error 2 make[3]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:485: kernel] Error 2 make[2]: *** [/kisskb/src/Makefile:1934: .] Error 2 make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 32 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_um-x86_64-gcc12 # Build took: 0:18:23.330664