mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Nadav Amit <namit@vmware.com>
To: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Cc: Thomas Gleixner <tglx@linutronix.de>,
	LKML <linux-kernel@vger.kernel.org>, X86 ML <x86@kernel.org>,
	Borislav Petkov <bp@alien8.de>, Ingo Molnar <mingo@redhat.com>,
	Peter Zijlstra <peterz@infradead.org>,
	David Woodhouse <dwmw@amazon.co.uk>,
	Andy Lutomirski <luto@kernel.org>,
	Masahiro Yamada <yamada.masahiro@socionext.com>,
	"stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: Re: [PATCH] x86/retpoline: change RETPOLINE into CONFIG_RETPOLINE
Date: Wed, 2 Jan 2019 17:23:19 +0000	[thread overview]
Message-ID: <DE796CE1-11EB-42B7-904E-A20CA9AC3699@vmware.com> (raw)
In-Reply-To: <f09d61a6-21ff-1557-d3f7-209944a4308d@oracle.com>

> On Jan 1, 2019, at 5:17 PM, Zhenzhong Duan <zhenzhong.duan@oracle.com> wrote:
> 
> 
> On 2019/1/1 7:42, Nadav Amit wrote:
>> A recent enhancement intentionally fails the kernel build if the
>> compiler does not support retpolines and CONFIG_RETPOLINE is set.
>> 
>> However, the patch that introduced it did not change RETPOLINE macro
>> references into CONFIG_RETPOLINE ones. As a result, indirect branches
>> that are used by init functions are not kept (i.e., they use
>> retpolines), and modules that do not use retpolines are marked as
>> retpoline-safe.
>> 
>> Fix it be changing RETPOLINE into CONFIG_RETPOLINE.
>> 
>> Fixes: 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support")
>> Cc: Peter Zijlstra <peterz@infradead.org>
>> Cc: Zhenzhong Duan <zhenzhong.duan@oracle.com>
>> Cc: Thomas Gleixner <tglx@linutronix.de>
>> Cc: David Woodhouse <dwmw@amazon.co.uk>
>> Cc: Andy Lutomirski <luto@kernel.org>
>> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Nadav Amit <namit@vmware.com>
>> ---
>>  arch/x86/kernel/cpu/bugs.c   | 2 +-
>>  include/linux/compiler-gcc.h | 2 +-
>>  include/linux/module.h       | 2 +-
>>  3 files changed, 3 insertions(+), 3 deletions(-)
>> 
>> diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
>> index 8654b8b0c848..1de0f4170178 100644
>> --- a/arch/x86/kernel/cpu/bugs.c
>> +++ b/arch/x86/kernel/cpu/bugs.c
>> @@ -215,7 +215,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)
> 
> Someone sent a similar patch last month, see below link,  you missed the change in scripts/mod/modpost.c

Indeed. I missed this patch since it wasn’t on tip (and Google wasn’t
helpful either).

I wonder why it has still not been applied.


  reply	other threads:[~2019-01-02 17:24 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-31 23:42 Nadav Amit
2019-01-02  1:17 ` Zhenzhong Duan
2019-01-02 17:23   ` Nadav Amit [this message]
2019-01-03  2:07     ` Zhenzhong Duan

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=DE796CE1-11EB-42B7-904E-A20CA9AC3699@vmware.com \
    --to=namit@vmware.com \
    --cc=bp@alien8.de \
    --cc=dwmw@amazon.co.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=stable@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --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

all inboxes | Powered by JetHome®