# 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/sparc64-linux/bin/sparc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux-ld --version # < git log --format=%s --max-count=1 4535e1a4174c4111d92c5a9a21e542d232e0fcaa # make -s -j 160 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_HAVE_FTRACE_MCOUNT_RECORD=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MODULE_SIG=n # < make -s -j 160 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux- help # make -s -j 160 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux- olddefconfig # make -s -j 160 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux- :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sparc/prom/p1275.c:52:6: error: no previous prototype for 'prom_cif_init' [-Werror=missing-prototypes] 52 | void prom_cif_init(void *cif_handler, void *cif_stack) | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/prom/misc_64.c:165:5: error: no previous prototype for 'prom_get_mmu_ihandle' [-Werror=missing-prototypes] 165 | int prom_get_mmu_ihandle(void) | ^~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sparc/prom/p1275.o] Error 1 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/arch/sparc/vdso/vma.c:246:12: error: no previous prototype for 'init_vdso_image' [-Werror=missing-prototypes] 246 | int __init init_vdso_image(const struct vdso_image *image, | ^~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sparc/prom/misc_64.o] Error 1 /kisskb/src/arch/sparc/power/hibernate.c:22:5: error: no previous prototype for 'pfn_is_nosave' [-Werror=missing-prototypes] 22 | int pfn_is_nosave(unsigned long pfn) | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/power/hibernate.c:30:6: error: no previous prototype for 'save_processor_state' [-Werror=missing-prototypes] 30 | void save_processor_state(void) | ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/power/hibernate.c:35:6: error: no previous prototype for 'restore_processor_state' [-Werror=missing-prototypes] 35 | void restore_processor_state(void) | ^~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sparc/power/hibernate.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sparc/power] Error 2 make[3]: *** Waiting for unfinished jobs.... cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sparc/vdso/vma.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sparc/vdso] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sparc/prom] Error 2 /kisskb/src/arch/sparc/kernel/traps_64.c:253:6: error: no previous prototype for 'is_no_fault_exception' [-Werror=missing-prototypes] 253 | bool is_no_fault_exception(struct pt_regs *regs) | ^~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/traps_64.c:2035:6: error: no previous prototype for 'do_mcd_err' [-Werror=missing-prototypes] 2035 | void do_mcd_err(struct pt_regs *regs, struct sun4v_error_entry ent) | ^~~~~~~~~~ /kisskb/src/arch/sparc/kernel/traps_64.c:2153:6: error: no previous prototype for 'sun4v_nonresum_error_user_handled' [-Werror=missing-prototypes] 2153 | bool sun4v_nonresum_error_user_handled(struct pt_regs *regs, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/mm/init_64.c:2644:6: error: no previous prototype for 'vmemmap_free' [-Werror=missing-prototypes] 2644 | void vmemmap_free(unsigned long start, unsigned long end, | ^~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sparc/kernel/traps_64.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sparc/kernel] Error 2 cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sparc/mm/init_64.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sparc/mm] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sparc] Error 2 In file included from /kisskb/src/arch/sparc/include/asm/floppy.h:5, from /kisskb/src/drivers/block/floppy.c:250: /kisskb/src/arch/sparc/include/asm/floppy_64.h:200:13: error: no previous prototype for 'sparc_floppy_irq' [-Werror=missing-prototypes] 200 | irqreturn_t sparc_floppy_irq(int irq, void *dev_cookie) | ^~~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/include/asm/floppy_64.h:437:6: error: no previous prototype for 'sun_pci_fd_dma_callback' [-Werror=missing-prototypes] 437 | void sun_pci_fd_dma_callback(struct ebus_dma_info *p, int event, void *cookie) | ^~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:244: drivers/block/floppy.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/block] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:485: drivers] Error 2 make[2]: *** [/kisskb/src/Makefile:1919: .] Error 2 make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 160 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_sparc64-gcc13 # Build took: 0:09:02.894446