From: Zhenzhong Duan <zhenzhong.duan@oracle.com>
To: WANG Chao <chao.wang@ucloud.cn>, linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org, Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
David Woodhouse <dwmw@amazon.co.uk>, Borislav Petkov <bp@suse.de>,
Daniel Borkmann <daniel@iogearbox.net>,
"H . Peter Anvin" <hpa@zytor.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Andy Lutomirski <luto@kernel.org>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Michal Marek <michal.lkml@markovi.net>,
srinivas.eeda@oracle.com
Subject: Re: [PATCH] treewide: replace RETPOLINE with CONFIG_RETPOLINE
Date: Wed, 12 Dec 2018 16:14:05 +0800 [thread overview]
Message-ID: <aaa4267a-c113-222e-157e-309ca9aa7be5@oracle.com> (raw)
In-Reply-To: <20181210163725.95977-1-chao.wang@ucloud.cn>
On 2018/12/11 0:37, WANG Chao wrote:
> Since commit 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend
> on compiler support"), RETPOLINE has been replaced by CONFIG_RETPOLINE.
>
> Fixes: 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support")
> Signed-off-by: WANG Chao <chao.wang@ucloud.cn>
> ---
> 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(-)
>
> diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
> index 500278f5308e..e8abe3f6c10e 100644
> --- a/arch/x86/kernel/cpu/bugs.c
> +++ b/arch/x86/kernel/cpu/bugs.c
> @@ -213,7 +213,7 @@ static enum spectre_v2_mitigation spectre_v2_enabled __ro_after_init =
> static enum spectre_v2_user_mitigation spectre_v2_user __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)
> diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
> index 2010493e1040..977ddf2774f9 100644
> --- a/include/linux/compiler-gcc.h
> +++ b/include/linux/compiler-gcc.h
> @@ -68,7 +68,7 @@
> */
> #define uninitialized_var(x) x = x
>
> -#ifdef RETPOLINE
> +#ifdef CONFIG_RETPOLINE
> #define __noretpoline __attribute__((__indirect_branch__("keep")))
> #endif
>
> diff --git a/include/linux/module.h b/include/linux/module.h
> index fce6b4335e36..0c575f51fe57 100644
> --- a/include/linux/module.h
> +++ b/include/linux/module.h
> @@ -817,7 +817,7 @@ static inline void module_bug_finalize(const Elf_Ehdr *hdr,
> 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)
> diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
> index 0d998c54564d..5a5b3780456f 100644
> --- a/scripts/mod/modpost.c
> +++ b/scripts/mod/modpost.c
> @@ -2157,7 +2157,7 @@ static void add_intree_flag(struct buffer *b, int is_intree)
> /* 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");
> }
I have no idea why I have missed these chunks. Thank you for fixing.
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
next prev parent reply other threads:[~2018-12-12 8:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-10 16:37 WANG Chao
2018-12-12 8:14 ` Zhenzhong Duan [this message]
2018-12-12 13:10 ` Masahiro Yamada
2018-12-21 9:33 ` WANG Chao
2018-12-21 10:47 ` Borislav Petkov
2018-12-21 11:00 ` WANG Chao
2018-12-21 15:48 ` David Laight
2019-01-09 3:48 ` WANG Chao
2019-01-09 10:04 ` [tip:x86/urgent] x86, modpost: Replace last remnants of " tip-bot for WANG Chao
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=aaa4267a-c113-222e-157e-309ca9aa7be5@oracle.com \
--to=zhenzhong.duan@oracle.com \
--cc=bp@suse.de \
--cc=chao.wang@ucloud.cn \
--cc=daniel@iogearbox.net \
--cc=dwmw@amazon.co.uk \
--cc=hpa@zytor.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=peterz@infradead.org \
--cc=srinivas.eeda@oracle.com \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=yamada.masahiro@socionext.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
all inboxes | Powered by JetHome®