# 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/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ld --version # < git log --format=%s --max-count=1 57fa2369ab17d67e6232f85b868652fbf4407206 # < make -s -j 120 ARCH=arm O=/kisskb/build/linus_shmobile_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- shmobile_defconfig # < make -s -j 120 ARCH=arm O=/kisskb/build/linus_shmobile_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- help # make -s -j 120 ARCH=arm O=/kisskb/build/linus_shmobile_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- olddefconfig # make -s -j 120 ARCH=arm O=/kisskb/build/linus_shmobile_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- In file included from /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/../lib/gcc/arm-linux-gnueabi/4.9.4/plugin/include/tm.h:23, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:15, from /kisskb/src/scripts/gcc-plugins/arm_ssp_per_task_plugin.c:3: /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/../lib/gcc/arm-linux-gnueabi/4.9.4/plugin/include/config/elfos.h:102:21: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), "%s"HOST_WIDE_INT_PRINT_UNSIGNED"\n",\ ^ /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/../lib/gcc/arm-linux-gnueabi/4.9.4/plugin/include/config/elfos.h:170:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ In file included from /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/../lib/gcc/arm-linux-gnueabi/4.9.4/plugin/include/tm.h:44, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:15, from /kisskb/src/scripts/gcc-plugins/arm_ssp_per_task_plugin.c:3: /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/../lib/gcc/arm-linux-gnueabi/4.9.4/plugin/include/defaults.h:126:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ cc1plus: warning: unrecognized command line option '-Wno-format-diag' Completed OK # rm -rf /kisskb/build/linus_shmobile_defconfig_arm-gcc4.9 # Build took: 0:00:44.754616