Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
Message-ID: <991cbe9b-1e31-4b12-b572-91fde5c79699@default>
Date:   Thu, 1 Nov 2018 02:31:44 -0700 (PDT)
From:   Zhenzhong Duan <zhenzhong.duan@oracle.com>
To:     <linux-kernel@vger.kernel.org>
Cc:     <mingo@redhat.com>, <konrad.wilk@oracle.com>, <luto@kernel.org>,
        <tglx@linutronix.de>, <dwmw@amazon.co.uk>, <bp@suse.de>,
        <srinivas.eeda@oracle.com>, <daniel@iogearbox.net>,
        <yamada.masahiro@socionext.com>, <michal.lkml@markovi.net>,
        <peterz@infradead.org>, <hpa@zytor.com>
Subject: [PATCH v2 1/2] retpolines: Only enable retpoline support when
 compiler support it
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Since retpoline capable compilers are widely available, make
CONFIG_RETPOLINE hard depend on it.

The check of RETPOLINE is changed to CONFIG_RETPOLINE.

This change is based on suggestion in https://lkml.org/lkml/2018/9/18/1016

Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@suse.de>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Michal Marek <michal.lkml@markovi.net>
---
 arch/x86/Kconfig                     |  6 ++----
 arch/x86/Makefile                    |  4 +---
 arch/x86/include/asm/nospec-branch.h | 10 ++++++----
 arch/x86/kernel/cpu/bugs.c           |  2 +-
 scripts/Makefile.build               |  2 --
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ffebfc3f..277e0df 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -436,6 +436,8 @@ config GOLDFISH
=20
 config RETPOLINE
 =09bool "Avoid speculative indirect branches in kernel"
+=09depends on $(cc-option,-mindirect-branch=3Dthunk-extern -mindirect-bran=
ch-register) || \
+                    $(cc-option,-mretpoline-external-thunk)
 =09default y
 =09select STACK_VALIDATION if HAVE_STACK_VALIDATION
 =09help
@@ -444,10 +446,6 @@ config RETPOLINE
 =09  branches. Requires a compiler with -mindirect-branch=3Dthunk-extern
 =09  support for full protection. The kernel may run slower.
=20
-=09  Without compiler support, at least indirect branches in assembler
-=09  code are eliminated. Since this includes the syscall entry path,
-=09  it is not entirely pointless.
-
 config INTEL_RDT
 =09bool "Intel Resource Director Technology support"
 =09depends on X86 && CPU_SUP_INTEL
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 5b562e4..30573dd 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -222,9 +222,7 @@ KBUILD_CFLAGS +=3D -fno-asynchronous-unwind-tables
=20
 # Avoid indirect branches in kernel to deal with Spectre
 ifdef CONFIG_RETPOLINE
-ifneq ($(RETPOLINE_CFLAGS),)
-  KBUILD_CFLAGS +=3D $(RETPOLINE_CFLAGS) -DRETPOLINE
-endif
+  KBUILD_CFLAGS +=3D $(RETPOLINE_CFLAGS)
 endif
=20
 archscripts: scripts_basic
diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/no=
spec-branch.h
index 80dc144..8b09cbb 100644
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -162,11 +162,12 @@
 =09_ASM_PTR " 999b\n\t"=09=09=09=09=09\
 =09".popsection\n\t"
=20
-#if defined(CONFIG_X86_64) && defined(RETPOLINE)
+#ifdef CONFIG_RETPOLINE
+#ifdef CONFIG_X86_64
=20
 /*
- * Since the inline asm uses the %V modifier which is only in newer GCC,
- * the 64-bit one is dependent on RETPOLINE not CONFIG_RETPOLINE.
+ * Inline asm uses the %V modifier which is only in newer GCC
+ * which is ensured when CONFIG_RETPOLINE is defined.
  */
 # define CALL_NOSPEC=09=09=09=09=09=09\
 =09ANNOTATE_NOSPEC_ALTERNATIVE=09=09=09=09\
@@ -181,7 +182,7 @@
 =09X86_FEATURE_RETPOLINE_AMD)
 # define THUNK_TARGET(addr) [thunk_target] "r" (addr)
=20
-#elif defined(CONFIG_X86_32) && defined(CONFIG_RETPOLINE)
+#else /* CONFIG_X86_32 */
 /*
  * For i386 we use the original ret-equivalent retpoline, because
  * otherwise we'll run out of registers. We don't care about CET
@@ -211,6 +212,7 @@
 =09X86_FEATURE_RETPOLINE_AMD)
=20
 # define THUNK_TARGET(addr) [thunk_target] "rm" (addr)
+#endif
 #else /* No retpoline for C / inline asm */
 # define CALL_NOSPEC "call *%[thunk_target]\n"
 # define THUNK_TARGET(addr) [thunk_target] "rm" (addr)
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index c37e66e..d0108fb 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -252,7 +252,7 @@ static void __init spec2_print_if_secure(const char *re=
ason)
=20
 static inline bool retp_compiler(void)
 {
-=09return __is_defined(RETPOLINE);
+=09return __is_defined(CONFIG_RETPOLINE);
 }
=20
 static inline bool match_option(const char *arg, int arglen, const char *o=
pt)
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index a8e7ba9..6a6be9f 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -236,10 +236,8 @@ ifdef CONFIG_GCOV_KERNEL
 objtool_args +=3D --no-unreachable
 endif
 ifdef CONFIG_RETPOLINE
-ifneq ($(RETPOLINE_CFLAGS),)
   objtool_args +=3D --retpoline
 endif
-endif
=20
=20
 ifdef CONFIG_MODVERSIONS
--=20
1.8.3.1