# git rev-parse -q --verify 4535e1a4174c4111d92c5a9a21e542d232e0fcaa^{commit} 4535e1a4174c4111d92c5a9a21e542d232e0fcaa already have revision, skipping fetch # git checkout -q -f -B kisskb 4535e1a4174c4111d92c5a9a21e542d232e0fcaa # git clean -qxdf # < git log -1 # commit 4535e1a4174c4111d92c5a9a21e542d232e0fcaa # Author: Borislav Petkov (AMD) # Date: Thu Mar 28 13:59:05 2024 +0100 # # x86/bugs: Fix the SRSO mitigation on Zen3/4 # # The original version of the mitigation would patch in the calls to the # untraining routines directly. That is, the alternative() in UNTRAIN_RET # will patch in the CALL to srso_alias_untrain_ret() directly. # # However, even if commit e7c25c441e9e ("x86/cpu: Cleanup the untrain # mess") meant well in trying to clean up the situation, due to micro- # architectural reasons, the untraining routine srso_alias_untrain_ret() # must be the target of a CALL instruction and not of a JMP instruction as # it is done now. # # Reshuffle the alternative macros to accomplish that. # # Fixes: e7c25c441e9e ("x86/cpu: Cleanup the untrain mess") # Signed-off-by: Borislav Petkov (AMD) # Reviewed-by: Ingo Molnar # Cc: stable@kernel.org # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 4535e1a4174c4111d92c5a9a21e542d232e0fcaa # make -s -j 160 ARCH=sh O=/kisskb/build/linus_se7750_defconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- se7750_defconfig # < make -s -j 160 ARCH=sh O=/kisskb/build/linus_se7750_defconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 160 ARCH=sh O=/kisskb/build/linus_se7750_defconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 160 ARCH=sh O=/kisskb/build/linus_se7750_defconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/mm/cache-sh4.c:384:13: warning: no previous prototype for 'sh4_cache_init' [-Wmissing-prototypes] 384 | void __init sh4_cache_init(void) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/init.c:99:29: warning: no previous prototype for 'l2_cache_init' [-Wmissing-prototypes] 99 | void __attribute__ ((weak)) l2_cache_init(void) | ^~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/flush-sh4.c:106:13: warning: no previous prototype for 'sh4__flush_region_init' [-Wmissing-prototypes] 106 | void __init sh4__flush_region_init(void) | ^~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh4/fpu.c:389:6: warning: no previous prototype for 'float_raise' [-Wmissing-prototypes] 389 | void float_raise(unsigned int flags) | ^~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh4/fpu.c:394:5: warning: no previous prototype for 'float_rounding_mode' [-Wmissing-prototypes] 394 | int float_rounding_mode(void) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/pgtable.c:10:6: warning: no previous prototype for 'pgd_ctor' [-Wmissing-prototypes] 10 | void pgd_ctor(void *x) | ^~~~~~~~ /kisskb/src/arch/sh/mm/pgtable.c:32:8: warning: no previous prototype for 'pgd_alloc' [-Wmissing-prototypes] 32 | pgd_t *pgd_alloc(struct mm_struct *mm) | ^~~~~~~~~ /kisskb/src/arch/sh/mm/pgtable.c:37:6: warning: no previous prototype for 'pgd_free' [-Wmissing-prototypes] 37 | void pgd_free(struct mm_struct *mm, pgd_t *pgd) | ^~~~~~~~ /kisskb/src/arch/sh/mm/tlbex_32.c:22:1: warning: no previous prototype for 'handle_tlbmiss' [-Wmissing-prototypes] 22 | handle_tlbmiss(struct pt_regs *regs, unsigned long error_code, | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/return_address.c:49:7: warning: no previous prototype for 'return_address' [-Wmissing-prototypes] 49 | void *return_address(unsigned int depth) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/sys_sh.c:58:16: warning: no previous prototype for 'sys_cacheflush' [-Wmissing-prototypes] 58 | asmlinkage int sys_cacheflush(unsigned long addr, unsigned long len, int op) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/traps_32.c:735:6: warning: no previous prototype for 'per_cpu_trap_init' [-Wmissing-prototypes] 735 | void per_cpu_trap_init(void) | ^~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/hw_breakpoint.c:135:5: warning: no previous prototype for 'arch_bp_generic_fields' [-Wmissing-prototypes] 135 | int arch_bp_generic_fields(int sh_len, int sh_type, | ^~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/boot/compressed/cache.c:2:5: warning: no previous prototype for 'cache_control' [-Wmissing-prototypes] 2 | int cache_control(unsigned int command) | ^~~~~~~~~~~~~ /kisskb/src/arch/sh/boot/compressed/misc.c:115:6: warning: no previous prototype for 'ftrace_stub' [-Wmissing-prototypes] 115 | void ftrace_stub(void) | ^~~~~~~~~~~ /kisskb/src/arch/sh/boot/compressed/misc.c:118:6: warning: no previous prototype for 'arch_ftrace_ops_list_func' [-Wmissing-prototypes] 118 | void arch_ftrace_ops_list_func(void) | ^~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/boot/compressed/misc.c:128:6: warning: no previous prototype for 'decompress_kernel' [-Wmissing-prototypes] 128 | void decompress_kernel(void) | ^~~~~~~~~~~~~~~~~ Kernel: arch/sh/boot/zImage is ready Completed OK # rm -rf /kisskb/build/linus_se7750_defconfig_sh4-gcc13 # Build took: 0:00:29.940722