# 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-8.1.0-nolibc/s390-linux/bin/s390-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux-ld --version # < git log --format=%s --max-count=1 57fa2369ab17d67e6232f85b868652fbf4407206 # < make -s -j 48 ARCH=s390 O=/kisskb/build/linus_s390-allmodconfig_s390x-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 48 ARCH=s390 O=/kisskb/build/linus_s390-allmodconfig_s390x-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux- help # make -s -j 48 ARCH=s390 O=/kisskb/build/linus_s390-allmodconfig_s390x-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux- olddefconfig # make -s -j 48 ARCH=s390 O=/kisskb/build/linus_s390-allmodconfig_s390x-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/s390-linux/bin/s390-linux- /kisskb/src/drivers/input/joystick/analog.c:160:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^~~~~~~ /kisskb/src/lib/bitfield_kunit.c: In function 'test_bitfields_constants': /kisskb/src/lib/bitfield_kunit.c:93:1: warning: the frame size of 7424 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ In file included from /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c:42: /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c: In function 'mvpp2_setup_bm_pool': /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2.h:844:2: warning: overflow in conversion from 'long unsigned int' to 'int' changes value from '18446744073709551584' to '-32' [-Woverflow] ((total_size) - MVPP2_SKB_HEADROOM - MVPP2_SKB_SHINFO_SIZE) ^ /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2.h:948:33: note: in expansion of macro 'MVPP2_RX_MAX_PKT_SIZE' #define MVPP2_BM_SHORT_PKT_SIZE MVPP2_RX_MAX_PKT_SIZE(MVPP2_BM_SHORT_FRAME_SIZE) ^~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c:683:41: note: in expansion of macro 'MVPP2_BM_SHORT_PKT_SIZE' mvpp2_pools[MVPP2_BM_SHORT].pkt_size = MVPP2_BM_SHORT_PKT_SIZE; ^~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/gpu/drm/rockchip/cdn-dp-core.c:1124:12: warning: 'cdn_dp_resume' defined but not used [-Wunused-function] static int cdn_dp_resume(struct device *dev) ^~~~~~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_s390-allmodconfig_s390x-gcc8 # Build took: 0:21:10.022314