From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, WANG Chao <chao.wang@ucloud.cn>,
Borislav Petkov <bp@suse.de>,
Zhenzhong Duan <zhenzhong.duan@oracle.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
"H. Peter Anvin" <hpa@zytor.com>, Andi Kleen <ak@linux.intel.com>,
Andrew Morton <akpm@linux-foundation.org>,
Andy Lutomirski <luto@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
Daniel Borkmann <daniel@iogearbox.net>,
David Woodhouse <dwmw@amazon.co.uk>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Jessica Yu <jeyu@kernel.org>, Jiri Kosina <jkosina@suse.cz>,
Kees Cook <keescook@chromium.org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Luc Van Oostenryck <luc.vanoostenryck@gmail.com>,
Michal Marek <michal.lkml@markovi.net>,
Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
Tim Chen <tim.c.chen@linux.intel.com>,
Vasily Gorbik <gor@linux.ibm.com>,
linux-kbuild@vger.kernel.org, srinivas.eeda@oracle.com,
x86-ml <x86@kernel.org>, Ben Hutchings <ben@decadent.org.uk>
Subject: [PATCH 4.9 28/38] x86, modpost: Replace last remnants of RETPOLINE with CONFIG_RETPOLINE
Date: Thu, 10 Mar 2022 15:13:41 +0100 [thread overview]
Message-ID: <20220310140808.958165558@linuxfoundation.org> (raw)
In-Reply-To: <20220310140808.136149678@linuxfoundation.org>
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");
}
next prev parent reply other threads:[~2022-03-10 14:20 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-10 14:13 [PATCH 4.9 00/38] 4.9.306-rc2 review Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 01/38] x86/speculation: Add RETPOLINE_AMD support to the inline asm CALL_NOSPEC variant Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 02/38] x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 03/38] x86/retpoline: Remove minimal retpoline support Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 04/38] Documentation: Add section about CPU vulnerabilities for Spectre Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 05/38] Documentation: Add swapgs description to the Spectre v1 documentation Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 06/38] Documentation: refer to config RANDOMIZE_BASE for kernel address-space randomization Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 07/38] x86/speculation: Merge one test in spectre_v2_user_select_mitigation() Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 08/38] x86,bugs: Unconditionally allow spectre_v2=retpoline,amd Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 09/38] x86/speculation: Rename RETPOLINE_AMD to RETPOLINE_LFENCE Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 10/38] x86/speculation: Add eIBRS + Retpoline options Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 11/38] Documentation/hw-vuln: Update spectre doc Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 12/38] x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 13/38] x86/speculation: Use generic retpoline by default on AMD Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 14/38] x86/speculation: Update link to AMD speculation whitepaper Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 15/38] x86/speculation: Warn about Spectre v2 LFENCE mitigation Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 16/38] x86/speculation: Warn about eIBRS + LFENCE + Unprivileged eBPF + SMT Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 17/38] arm/arm64: Provide a wrapper for SMCCC 1.1 calls Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 18/38] arm/arm64: smccc/psci: add arm_smccc_1_1_get_conduit() Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 19/38] ARM: report Spectre v2 status through sysfs Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 20/38] ARM: early traps initialisation Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 21/38] ARM: use LOADADDR() to get load address of sections Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 22/38] ARM: Spectre-BHB workaround Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 23/38] ARM: include unprivileged BPF status in Spectre V2 reporting Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 24/38] ARM: fix build error when BPF_SYSCALL is disabled Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 25/38] ARM: fix co-processor register typo Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 26/38] ARM: Do not use NOCROSSREFS directive with ld.lld Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 27/38] x86/build: Fix compiler support check for CONFIG_RETPOLINE Greg Kroah-Hartman
2022-03-10 14:13 ` Greg Kroah-Hartman [this message]
2022-03-10 14:13 ` [PATCH 4.9 29/38] ARM: fix build warning in proc-v7-bugs.c Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 30/38] xen/xenbus: dont let xenbus_grant_ring() remove grants in error case Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 31/38] xen/grant-table: add gnttab_try_end_foreign_access() Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 32/38] xen/blkfront: dont use gnttab_query_foreign_access() for mapped status Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 33/38] xen/netfront: " Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 34/38] xen/scsifront: " Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 35/38] xen/gntalloc: dont use gnttab_query_foreign_access() Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 36/38] xen: remove gnttab_query_foreign_access() Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 37/38] xen/gnttab: fix gnttab_end_foreign_access() without page specified Greg Kroah-Hartman
2022-03-10 14:13 ` [PATCH 4.9 38/38] xen/netfront: react properly to failing gnttab_end_foreign_access_ref() Greg Kroah-Hartman
2022-03-10 18:00 ` [PATCH 4.9 00/38] 4.9.306-rc2 review Pavel Machek
2022-03-10 18:48 ` Jon Hunter
2022-03-10 19:35 ` Shuah Khan
2022-03-10 20:14 ` Florian Fainelli
2022-03-11 1:13 ` Guenter Roeck
2022-03-11 13:35 ` Naresh Kamboju
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220310140808.958165558@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=ben@decadent.org.uk \
--cc=bp@suse.de \
--cc=chao.wang@ucloud.cn \
--cc=daniel@iogearbox.net \
--cc=dwmw@amazon.co.uk \
--cc=geert@linux-m68k.org \
--cc=gor@linux.ibm.com \
--cc=hpa@zytor.com \
--cc=jeyu@kernel.org \
--cc=jkosina@suse.cz \
--cc=keescook@chromium.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luc.vanoostenryck@gmail.com \
--cc=luto@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=miguel.ojeda.sandonis@gmail.com \
--cc=peterz@infradead.org \
--cc=srinivas.eeda@oracle.com \
--cc=stable@vger.kernel.org \
--cc=tim.c.chen@linux.intel.com \
--cc=x86@kernel.org \
--cc=yamada.masahiro@socionext.com \
--cc=zhenzhong.duan@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).