From: Sasha Levin Date: Mon, 20 Jan 2025 03:17:29 +0000 (-0500) Subject: Fixes for 5.10 X-Git-Tag: v6.6.73~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f21fdcab28165b111cc7f9245f38eea30713e2d;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.10 Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/series b/queue-5.10/series index bbe87a5f5d..28990d99b9 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -100,3 +100,4 @@ kheaders-ignore-silly-rename-files.patch poll_wait-add-mb-to-fix-theoretical-race-between-wai.patch nvmet-propagate-npwg-topology.patch zram-fix-potential-uaf-of-zram-table.patch +x86-asm-make-serialize-always_inline.patch diff --git a/queue-5.10/x86-asm-make-serialize-always_inline.patch b/queue-5.10/x86-asm-make-serialize-always_inline.patch new file mode 100644 index 0000000000..883bb03464 --- /dev/null +++ b/queue-5.10/x86-asm-make-serialize-always_inline.patch @@ -0,0 +1,39 @@ +From f3e8d5d9703406118aba379cb612c28ef29c8eb1 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 415693f5d909d..ad828c6742d4e 100644 +--- a/arch/x86/include/asm/special_insns.h ++++ b/arch/x86/include/asm/special_insns.h +@@ -236,7 +236,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 +