hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8JVJ3 CVE: NA ------------------------------------------------------------------------- The following configs depends on GCC environment, so ignore them when update openeuler_defconfig: CONFIG_GCC_PLUGINS CONFIG_PAHOLE_HAS_LANG_EXCLUDE CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> --- scripts/kconfig/makeconfig.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/kconfig/makeconfig.sh b/scripts/kconfig/makeconfig.sh index c54f4d84ae9b..5b53f1c6cc78 100644 --- a/scripts/kconfig/makeconfig.sh +++ b/scripts/kconfig/makeconfig.sh @@ -9,6 +9,7 @@ fi sed -e '/CONFIG_CC_VERSION_TEXT/d' \ -e '/CONFIG_CC_IS_GCC/d' \ -e '/CONFIG_GCC_VERSION/d' \ + -e '/CONFIG_GCC_PLUGINS/d' \ -e '/CONFIG_LD_VERSION/d' \ -e '/CONFIG_LD_IS/d' \ -e '/CONFIG_CLANG_VERSION/d' \ @@ -19,6 +20,8 @@ sed -e '/CONFIG_CC_VERSION_TEXT/d' \ -e '/CONFIG_AS_HAS/d' \ -e '/CONFIG_AS_IS/d' \ -e '/CONFIG_PAHOLE_VERSION/d' \ + -e '/CONFIG_PAHOLE_HAS_LANG_EXCLUDE/d' \ + -e '/CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC/d' \ -i .config cp .config arch/$1/configs/openeuler_defconfig -- 2.34.1

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8JVJ3 CVE: NA ------------------------------------------------------------------------- No one currently uses IPL32, close it to simplify the code logic of TASK_SIZE_MAX, thereby improving benchmark performance. For example, all test items of libMicro can be improved by 4.89% on average. Since commit 7f6675f0e994 ("arm64: rename COMPAT to AARCH32_EL0"), CONFIG_COMPAT has been renamed to CONFIG_AARCH32_EL0, so open CONFIG_AARCH32_EL0 as what CONFIG_COMPAT used to be. And CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC depends on the GCC or CLANG version, so it depends on the compilation environment. Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> Reviewed-by: Cheng Jian <cj.chengjian@huawei.com> Reviewed-by: Liu Chao (CR) <liuchao173@huawei.com> Reviewed-by: Xiongfeng Wang <wangxiongfeng2@huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com> Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> --- arch/arm64/configs/openeuler_defconfig | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 8f1a4db8d49b..126d39c0ba08 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -294,7 +294,6 @@ CONFIG_FIX_EARLYCON_MEM=y CONFIG_PGTABLE_LEVELS=4 CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_ARCH_PROC_KCORE_TEXT=y -CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y # # Platform selection @@ -446,9 +445,10 @@ CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y # CONFIG_RODATA_FULL_DEFAULT_ENABLED is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set CONFIG_ARM64_TAGGED_ADDR_ABI=y -CONFIG_COMPAT=y +CONFIG_AARCH32_EL0=y # CONFIG_KUSER_HELPERS is not set # CONFIG_COMPAT_ALIGNMENT_FIXUPS is not set +# CONFIG_COMPAT_TASK_SIZE is not set CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y @@ -523,6 +523,8 @@ CONFIG_EFI=y CONFIG_DMI=y # end of Boot options +CONFIG_COMPAT=y + # # Power management options # @@ -801,6 +803,7 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling CONFIG_HAVE_GCC_PLUGINS=y +# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FUNCTION_ALIGNMENT_8B=y CONFIG_FUNCTION_ALIGNMENT=8 @@ -7132,6 +7135,10 @@ CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,appar # Memory initialization # CONFIG_INIT_STACK_NONE=y +# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set +# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set +# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set +# CONFIG_GCC_PLUGIN_STACKLEAK is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # end of Memory initialization @@ -7144,6 +7151,8 @@ CONFIG_LIST_HARDENED=y # end of Hardening of kernel data structures CONFIG_RANDSTRUCT_NONE=y +# CONFIG_RANDSTRUCT_FULL is not set +# CONFIG_RANDSTRUCT_PERFORMANCE is not set # end of Kernel hardening options # end of Security options @@ -7728,7 +7737,6 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y CONFIG_HAVE_ARCH_KASAN_VMALLOC=y -# CONFIG_KASAN is not set CONFIG_HAVE_ARCH_KFENCE=y # CONFIG_KFENCE is not set # end of Memory Debugging -- 2.34.1