# 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 24 ARCH=powerpc O=/kisskb/build/linus_ppc6xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc6xx_defconfig # < make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_ppc6xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_ppc6xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_ppc6xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/block/genhd.c: In function 'diskstats_show': /kisskb/src/block/genhd.c:1311:1: warning: the frame size of 1160 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ INFO: Uncompressed kernel (size 0xc921b4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc921b4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc921b4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc921b4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc921b4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc921b4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc921b4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc921b4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc921b4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc921b4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc81ba4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc81ba4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) Image Name: Linux-5.12.0+ Created: Wed Apr 28 05:06:47 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5493128 Bytes = 5364.38 KiB = 5.24 MiB Load Address: 00d00000 Entry Point: 00d00294 Image Name: Linux-5.12.0+ Created: Wed Apr 28 05:06:47 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5492151 Bytes = 5363.43 KiB = 5.24 MiB Load Address: 00d00000 Entry Point: 00d00294 Image Name: Linux-5.12.0+ Created: Wed Apr 28 05:06:48 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5493159 Bytes = 5364.41 KiB = 5.24 MiB Load Address: 00d00000 Entry Point: 00d00294 Image Name: Linux-5.12.0+ Created: Wed Apr 28 05:06:48 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5492316 Bytes = 5363.59 KiB = 5.24 MiB Load Address: 00d00000 Entry Point: 00d00894 Image Name: Linux-5.12.0+ Created: Wed Apr 28 05:06:48 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5492509 Bytes = 5363.78 KiB = 5.24 MiB Load Address: 00d00000 Entry Point: 00d00894 Image Name: Linux-5.12.0+ Created: Wed Apr 28 05:06:48 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5492881 Bytes = 5364.14 KiB = 5.24 MiB Load Address: 00d00000 Entry Point: 00d00294 Image Name: Linux-5.12.0+ Created: Wed Apr 28 05:06:48 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5493266 Bytes = 5364.52 KiB = 5.24 MiB Load Address: 00d00000 Entry Point: 00d00294 Image Name: Linux-5.12.0+ Created: Wed Apr 28 05:06:48 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5462053 Bytes = 5334.04 KiB = 5.21 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.12.0+ Created: Wed Apr 28 05:06:48 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5493134 Bytes = 5364.39 KiB = 5.24 MiB Load Address: 00d00000 Entry Point: 00d00294 Completed OK # rm -rf /kisskb/build/linus_ppc6xx_defconfig_powerpc-gcc4.9 # Build took: 0:04:26.082373