From: Sasha Levin Date: Mon, 20 Jan 2025 03:17:27 +0000 (-0500) Subject: Fixes for 6.6 X-Git-Tag: v6.6.73~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c232bb304906bfdb6df8c3d6a7ccca6f6ab7f191;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 6.6 Signed-off-by: Sasha Levin --- diff --git a/queue-6.6/series b/queue-6.6/series index 621072fa7f..e1c4cfae7d 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -34,3 +34,4 @@ iomap-avoid-avoid-truncating-64-bit-offset-to-32-bit.patch poll_wait-add-mb-to-fix-theoretical-race-between-wai.patch rdma-bnxt_re-fix-to-export-port-num-to-ib_query_qp.patch nvmet-propagate-npwg-topology.patch +x86-asm-make-serialize-always_inline.patch diff --git a/queue-6.6/x86-asm-make-serialize-always_inline.patch b/queue-6.6/x86-asm-make-serialize-always_inline.patch new file mode 100644 index 0000000000..55f268cdd0 --- /dev/null +++ b/queue-6.6/x86-asm-make-serialize-always_inline.patch @@ -0,0 +1,39 @@ +From 9b5e49567e2e6d801dfb14c50e1e679200f4f962 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 48f8dd47cf688..1c5513b04f038 100644 +--- a/arch/x86/include/asm/special_insns.h ++++ b/arch/x86/include/asm/special_insns.h +@@ -217,7 +217,7 @@ static inline int write_user_shstk_64(u64 __user *addr, u64 val) + + #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 +