# git rev-parse -q --verify 57fa2369ab17d67e6232f85b868652fbf4407206^{commit} 57fa2369ab17d67e6232f85b868652fbf4407206 already have revision, skipping fetch # git checkout -q -f -B kisskb 57fa2369ab17d67e6232f85b868652fbf4407206 # git clean -qxdf # < git log -1 # commit 57fa2369ab17d67e6232f85b868652fbf4407206 # Merge: 2fbc66c7838a 9186ad8e66ba # Author: Linus Torvalds # Date: Tue Apr 27 10:16:46 2021 -0700 # # Merge tag 'cfi-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux # # Pull CFI on arm64 support from Kees Cook: # "This builds on last cycle's LTO work, and allows the arm64 kernels to # be built with Clang's Control Flow Integrity feature. This feature has # happily lived in Android kernels for almost 3 years[1], so I'm excited # to have it ready for upstream. # # The wide diffstat is mainly due to the treewide fixing of mismatched # list_sort prototypes. Other things in core kernel are to address # various CFI corner cases. The largest code portion is the CFI runtime # implementation itself (which will be shared by all architectures # implementing support for CFI). The arm64 pieces are Acked by arm64 # maintainers rather than coming through the arm64 tree since carrying # this tree over there was going to be awkward. # # CFI support for x86 is still under development, but is pretty close. # There are a handful of corner cases on x86 that need some improvements # to Clang and objtool, but otherwise works well. # # Summary: # # - Clean up list_sort prototypes (Sami Tolvanen) # # - Introduce CONFIG_CFI_CLANG for arm64 (Sami Tolvanen)" # # * tag 'cfi-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: # arm64: allow CONFIG_CFI_CLANG to be selected # KVM: arm64: Disable CFI for nVHE # arm64: ftrace: use function_nocfi for ftrace_call # arm64: add __nocfi to __apply_alternatives # arm64: add __nocfi to functions that jump to a physical address # arm64: use function_nocfi with __pa_symbol # arm64: implement function_nocfi # psci: use function_nocfi for cpu_resume # lkdtm: use function_nocfi # treewide: Change list_sort to use const pointers # bpf: disable CFI in dispatcher functions # kallsyms: strip ThinLTO hashes from static functions # kthread: use WARN_ON_FUNCTION_MISMATCH # workqueue: use WARN_ON_FUNCTION_MISMATCH # module: ensure __cfi_check alignment # mm: add generic function_nocfi macro # cfi: add __cficanonical # add support for Clang CFI # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 57fa2369ab17d67e6232f85b868652fbf4407206 # < make -s -j 120 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_defconfig # < make -s -j 120 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 120 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 120 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/kernel.h:10:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:12, from /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:15: /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd': /kisskb/src/include/linux/err.h:22:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO) ^ /kisskb/src/include/linux/compiler.h:78:42: note: in definition of macro 'unlikely' # define unlikely(x) __builtin_expect(!!(x), 0) ^ /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:139:6: note: in expansion of macro 'IS_ERR_VALUE' if (IS_ERR_VALUE(fep->ring_mem_addr)) ^ /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8541cds.dts:330.3-21: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8555cds.dts:330.3-21: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) INFO: Uncompressed kernel (size 0xd62a4c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd62a4c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd62a4c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd62a4c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd62a4c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd62a4c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd62a4c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd62a4c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd62a4c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd62a4c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd62a4c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd62a4c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd62a4c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd62a4c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd62a4c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd52320) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) Image Name: Linux-5.12.0-g57fa2369ab17 Created: Wed Apr 28 04:43:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6503785 Bytes = 6351.35 KiB = 6.20 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.12.0-g57fa2369ab17 Created: Wed Apr 28 04:43:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6505806 Bytes = 6353.33 KiB = 6.20 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g57fa2369ab17 Created: Wed Apr 28 04:43:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6503755 Bytes = 6351.32 KiB = 6.20 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.12.0-g57fa2369ab17 Created: Wed Apr 28 04:43:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6472861 Bytes = 6321.15 KiB = 6.17 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.12.0-g57fa2369ab17 Created: Wed Apr 28 04:43:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6505302 Bytes = 6352.83 KiB = 6.20 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g57fa2369ab17 Created: Wed Apr 28 04:43:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6506190 Bytes = 6353.70 KiB = 6.20 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g57fa2369ab17 Created: Wed Apr 28 04:43:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6503941 Bytes = 6351.50 KiB = 6.20 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g57fa2369ab17 Created: Wed Apr 28 04:43:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6505314 Bytes = 6352.85 KiB = 6.20 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.12.0-g57fa2369ab17 Created: Wed Apr 28 04:43:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6504369 Bytes = 6351.92 KiB = 6.20 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.12.0-g57fa2369ab17 Created: Wed Apr 28 04:43:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6503655 Bytes = 6351.23 KiB = 6.20 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g57fa2369ab17 Created: Wed Apr 28 04:43:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6505596 Bytes = 6353.12 KiB = 6.20 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g57fa2369ab17 Created: Wed Apr 28 04:43:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6503754 Bytes = 6351.32 KiB = 6.20 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.12.0-g57fa2369ab17 Created: Wed Apr 28 04:43:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6503595 Bytes = 6351.17 KiB = 6.20 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g57fa2369ab17 Created: Wed Apr 28 04:43:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6506253 Bytes = 6353.76 KiB = 6.20 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g57fa2369ab17 Created: Wed Apr 28 04:43:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6503942 Bytes = 6351.51 KiB = 6.20 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.12.0-g57fa2369ab17 Created: Wed Apr 28 04:43:58 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6505385 Bytes = 6352.92 KiB = 6.20 MiB Load Address: 00e00000 Entry Point: 00e002a4 Completed OK # rm -rf /kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 # Build took: 0:01:23.190489