# 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/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 4535e1a4174c4111d92c5a9a21e542d232e0fcaa # make -s -j 32 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig # < make -s -j 32 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 32 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:15009:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 32 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux- /kisskb/src/arch/mips/boot/dts/img/boston.dts:128.17-178.5: Warning (interrupt_provider): /pci@14000000/pci2_root@0,0: '#interrupt-cells' found, but node is not an interrupt provider /kisskb/src/arch/mips/boot/dts/img/boston.dts:136.23-177.6: Warning (interrupt_provider): /pci@14000000/pci2_root@0,0/eg20t_bridge@1,0,0: '#interrupt-cells' found, but node is not an interrupt provider arch/mips/boot/dts/img/boston.dtb: Warning (interrupt_map): Failed prerequisite 'interrupt_provider' /kisskb/src/drivers/gpu/drm/xe/xe_lrc.c:100: error: "END" redefined [-Werror] 100 | #define END 0 | In file included from /kisskb/src/arch/mips/include/asm/bitops.h:19, from /kisskb/src/include/linux/bitops.h:68, from /kisskb/src/include/linux/thread_info.h:27, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/mips/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:79, from /kisskb/src/include/linux/spinlock.h:56, from /kisskb/src/include/linux/wait.h:9, from /kisskb/src/include/linux/dma-fence.h:17, from /kisskb/src/drivers/gpu/drm/xe/xe_hw_fence_types.h:9, from /kisskb/src/drivers/gpu/drm/xe/xe_lrc_types.h:9, from /kisskb/src/drivers/gpu/drm/xe/xe_lrc.h:8, from /kisskb/src/drivers/gpu/drm/xe/xe_lrc.c:6: /kisskb/src/arch/mips/include/asm/asm.h:69: note: this is the location of the previous definition 69 | #define END(function) \ | cc1: all warnings being treated as errors make[7]: *** [/kisskb/src/scripts/Makefile.build:244: drivers/gpu/drm/xe/xe_lrc.o] Error 1 make[7]: *** Waiting for unfinished jobs.... make[6]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/gpu/drm/xe] Error 2 make[6]: *** Waiting for unfinished jobs.... make[5]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/gpu/drm] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/gpu] 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 32 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_mips-gcc13 # Build took: 0:20:45.291569