| From foo@baz Wed Mar 9 11:38:31 PM CET 2022 |
| From: WANG Chao <chao.wang@ucloud.cn> |
| Date: Tue, 11 Dec 2018 00:37:25 +0800 |
| Subject: x86, modpost: Replace last remnants of RETPOLINE with CONFIG_RETPOLINE |
| |
| From: WANG Chao <chao.wang@ucloud.cn> |
| |
| commit e4f358916d528d479c3c12bd2fd03f2d5a576380 upstream. |
| |
| Commit |
| |
| 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support") |
| |
| replaced the RETPOLINE define with CONFIG_RETPOLINE checks. Remove the |
| remaining pieces. |
| |
| [ bp: Massage commit message. ] |
| |
| Fixes: 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support") |
| Signed-off-by: WANG Chao <chao.wang@ucloud.cn> |
| Signed-off-by: Borislav Petkov <bp@suse.de> |
| Reviewed-by: Zhenzhong Duan <zhenzhong.duan@oracle.com> |
| Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com> |
| Cc: "H. Peter Anvin" <hpa@zytor.com> |
| Cc: Andi Kleen <ak@linux.intel.com> |
| Cc: Andrew Morton <akpm@linux-foundation.org> |
| Cc: Andy Lutomirski <luto@kernel.org> |
| Cc: Arnd Bergmann <arnd@arndb.de> |
| Cc: Daniel Borkmann <daniel@iogearbox.net> |
| Cc: David Woodhouse <dwmw@amazon.co.uk> |
| Cc: Geert Uytterhoeven <geert@linux-m68k.org> |
| Cc: Jessica Yu <jeyu@kernel.org> |
| Cc: Jiri Kosina <jkosina@suse.cz> |
| Cc: Kees Cook <keescook@chromium.org> |
| Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> |
| Cc: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> |
| Cc: Michal Marek <michal.lkml@markovi.net> |
| Cc: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Tim Chen <tim.c.chen@linux.intel.com> |
| Cc: Vasily Gorbik <gor@linux.ibm.com> |
| Cc: linux-kbuild@vger.kernel.org |
| Cc: srinivas.eeda@oracle.com |
| Cc: stable <stable@vger.kernel.org> |
| Cc: x86-ml <x86@kernel.org> |
| Link: https://lkml.kernel.org/r/20181210163725.95977-1-chao.wang@ucloud.cn |
| [bwh: Backported to 4.9: adjust context] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/x86/kernel/cpu/bugs.c | 2 +- |
| include/linux/compiler-gcc.h | 2 +- |
| include/linux/module.h | 2 +- |
| scripts/mod/modpost.c | 2 +- |
| 4 files changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/arch/x86/kernel/cpu/bugs.c |
| +++ b/arch/x86/kernel/cpu/bugs.c |
| @@ -586,7 +586,7 @@ static enum spectre_v2_user_mitigation s |
| static enum spectre_v2_user_mitigation spectre_v2_user_ibpb __ro_after_init = |
| SPECTRE_V2_USER_NONE; |
| |
| -#ifdef RETPOLINE |
| +#ifdef CONFIG_RETPOLINE |
| static bool spectre_v2_bad_module; |
| |
| bool retpoline_module_ok(bool has_retpoline) |
| --- a/include/linux/compiler-gcc.h |
| +++ b/include/linux/compiler-gcc.h |
| @@ -107,7 +107,7 @@ |
| #define __weak __attribute__((weak)) |
| #define __alias(symbol) __attribute__((alias(#symbol))) |
| |
| -#ifdef RETPOLINE |
| +#ifdef CONFIG_RETPOLINE |
| #define __noretpoline __attribute__((indirect_branch("keep"))) |
| #endif |
| |
| --- a/include/linux/module.h |
| +++ b/include/linux/module.h |
| @@ -791,7 +791,7 @@ static inline void module_bug_finalize(c |
| static inline void module_bug_cleanup(struct module *mod) {} |
| #endif /* CONFIG_GENERIC_BUG */ |
| |
| -#ifdef RETPOLINE |
| +#ifdef CONFIG_RETPOLINE |
| extern bool retpoline_module_ok(bool has_retpoline); |
| #else |
| static inline bool retpoline_module_ok(bool has_retpoline) |
| --- a/scripts/mod/modpost.c |
| +++ b/scripts/mod/modpost.c |
| @@ -2147,7 +2147,7 @@ static void add_intree_flag(struct buffe |
| /* Cannot check for assembler */ |
| static void add_retpoline(struct buffer *b) |
| { |
| - buf_printf(b, "\n#ifdef RETPOLINE\n"); |
| + buf_printf(b, "\n#ifdef CONFIG_RETPOLINE\n"); |
| buf_printf(b, "MODULE_INFO(retpoline, \"Y\");\n"); |
| buf_printf(b, "#endif\n"); |
| } |