From: Sasha Levin Date: Mon, 20 Jan 2025 03:17:28 +0000 (-0500) Subject: Fixes for 6.1 X-Git-Tag: v6.6.73~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30b4dc47f84b00b5a21fa65f45ca118b52ab6d54;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 6.1 Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/series b/queue-6.1/series index b01a508ffc..500bd2dbe7 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -43,3 +43,4 @@ selftests-tc-testing-reduce-rshift-value.patch acpi-resource-acpi_dev_irq_override-check-dmi-match-.patch iomap-avoid-avoid-truncating-64-bit-offset-to-32-bit.patch poll_wait-add-mb-to-fix-theoretical-race-between-wai.patch +x86-asm-make-serialize-always_inline.patch diff --git a/queue-6.1/x86-asm-make-serialize-always_inline.patch b/queue-6.1/x86-asm-make-serialize-always_inline.patch new file mode 100644 index 0000000000..9435a03881 --- /dev/null +++ b/queue-6.1/x86-asm-make-serialize-always_inline.patch @@ -0,0 +1,39 @@ +From 2a44b1a6b16a02066e516982308ca506722a31d4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 18 Dec 2024 11:09:18 +0100 +Subject: x86/asm: Make serialize() always_inline + +From: Juergen Gross + +[ Upstream commit ae02ae16b76160f0aeeae2c5fb9b15226d00a4ef ] + +In order to allow serialize() to be used from noinstr code, make it +__always_inline. + +Fixes: 0ef8047b737d ("x86/static-call: provide a way to do very early static-call updates") +Closes: https://lore.kernel.org/oe-kbuild-all/202412181756.aJvzih2K-lkp@intel.com/ +Reported-by: kernel test robot +Signed-off-by: Juergen Gross +Signed-off-by: Borislav Petkov (AMD) +Link: https://lore.kernel.org/r/20241218100918.22167-1-jgross@suse.com +Signed-off-by: Sasha Levin +--- + arch/x86/include/asm/special_insns.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/include/asm/special_insns.h b/arch/x86/include/asm/special_insns.h +index c2e322189f853..373aed0f14220 100644 +--- a/arch/x86/include/asm/special_insns.h ++++ b/arch/x86/include/asm/special_insns.h +@@ -225,7 +225,7 @@ static inline void clwb(volatile void *__p) + + #define nop() asm volatile ("nop") + +-static inline void serialize(void) ++static __always_inline void serialize(void) + { + /* Instruction opcode for SERIALIZE; supported in binutils >= 2.35. */ + asm volatile(".byte 0xf, 0x1, 0xe8" ::: "memory"); +-- +2.39.5 +