From: Peter Zijlstra <peterz@infradead.org>

Date: Tue, 26 Oct 2021 14:01:40 +0200

Subject: x86/retpoline: Move the retpoline thunk declarations to

 nospec-branch.h

Git-commit: 6fda8a38865607db739be3e567a2387376222dbd

Patch-mainline: v5.16-rc1

References: bsc#1190497

Because it makes no sense to split the retpoline gunk over multiple

headers.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>

Reviewed-by: Borislav Petkov <bp@suse.de>

Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>

Tested-by: Alexei Starovoitov <ast@kernel.org>

Link: https://lore.kernel.org/r/20211026120310.106290934@infradead.org

Acked-by: Borislav Petkov <bp@suse.de>

---

 arch/x86/include/asm/asm-prototypes.h | 8 --------

 arch/x86/include/asm/nospec-branch.h  | 7 +++++++

 arch/x86/net/bpf_jit_comp.c           | 1 -

 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/arch/x86/include/asm/asm-prototypes.h b/arch/x86/include/asm/asm-prototypes.h

index a2bed09d3c11..8f80de627c60 100644

--- a/arch/x86/include/asm/asm-prototypes.h

+++ b/arch/x86/include/asm/asm-prototypes.h

@@ -17,11 +17,3 @@

 extern void cmpxchg8b_emu(void);

 #endif

-#ifdef CONFIG_RETPOLINE

-

-#define GEN(reg) \

-	extern asmlinkage void __x86_indirect_thunk_ ## reg (void);

-#include <asm/GEN-for-each-reg.h>

-#undef GEN

-

-#endif /* CONFIG_RETPOLINE */

diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h

index ec2d5c8c6694..14053cd314b9 100644

--- a/arch/x86/include/asm/nospec-branch.h

+++ b/arch/x86/include/asm/nospec-branch.h

@@ -5,6 +5,7 @@

 #include <linux/static_key.h>

 #include <linux/objtool.h>

+#include <linux/linkage.h>

 #include <asm/alternative.h>

 #include <asm/cpufeatures.h>

@@ -118,6 +119,12 @@

 	".popsection\n\t"

 #ifdef CONFIG_RETPOLINE

+

+#define GEN(reg) \

+	extern asmlinkage void __x86_indirect_thunk_ ## reg (void);

+#include <asm/GEN-for-each-reg.h>

+#undef GEN

+

 #ifdef CONFIG_X86_64

 /*

diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c

index 9ea57389c554..7c03af65a7de 100644

--- a/arch/x86/net/bpf_jit_comp.c

+++ b/arch/x86/net/bpf_jit_comp.c

@@ -15,7 +15,6 @@

 #include <asm/set_memory.h>

 #include <asm/nospec-branch.h>

 #include <asm/text-patching.h>

-#include <asm/asm-prototypes.h>

 static u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)

 {