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: <dd9fce0a-e7e8-427b-bd11-7ec65ddb2ea7@default>
Date:   Mon, 29 Oct 2018 23:55:06 -0700 (PDT)
From:   Zhenzhong Duan <zhenzhong.duan@oracle.com>
To:     Linux-Kernel <linux-kernel@vger.kernel.org>
Cc:     <mingo@redhat.com>, <konrad.wilk@oracle.com>, <dwmw@amazon.co.uk>,
        <tglx@linutronix.de>,
        Srinivas REDDY Eeda <srinivas.eeda@oracle.com>, <bp@suse.de>,
        <peterz@infradead.org>, <hpa@zytor.com>
Subject: [PATCH 2/3] retpolines: Remove the minimal stuff of retpoline support
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Now that CONFIG_RETPOLINE hard depends on compiler support, there is no
reason for minimal stuff to still exist.

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: 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>
---
 arch/x86/include/asm/nospec-branch.h |  2 --
 arch/x86/kernel/cpu/bugs.c           | 13 ++-----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/no=
spec-branch.h
index 8b09cbb..c202a64 100644
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -221,8 +221,6 @@
 /* The Spectre V2 mitigation variants */
 enum spectre_v2_mitigation {
 =09SPECTRE_V2_NONE,
-=09SPECTRE_V2_RETPOLINE_MINIMAL,
-=09SPECTRE_V2_RETPOLINE_MINIMAL_AMD,
 =09SPECTRE_V2_RETPOLINE_GENERIC,
 =09SPECTRE_V2_RETPOLINE_AMD,
 =09SPECTRE_V2_IBRS_ENHANCED,
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index d0108fb..7f6d815 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -135,8 +135,6 @@ enum spectre_v2_mitigation_cmd {
=20
 static const char *spectre_v2_strings[] =3D {
 =09[SPECTRE_V2_NONE]=09=09=09=3D "Vulnerable",
-=09[SPECTRE_V2_RETPOLINE_MINIMAL]=09=09=3D "Vulnerable: Minimal generic AS=
M retpoline",
-=09[SPECTRE_V2_RETPOLINE_MINIMAL_AMD]=09=3D "Vulnerable: Minimal AMD ASM r=
etpoline",
 =09[SPECTRE_V2_RETPOLINE_GENERIC]=09=09=3D "Mitigation: Full generic retpo=
line",
 =09[SPECTRE_V2_RETPOLINE_AMD]=09=09=3D "Mitigation: Full AMD retpoline",
 =09[SPECTRE_V2_IBRS_ENHANCED]=09=09=3D "Mitigation: Enhanced IBRS",
@@ -250,11 +248,6 @@ static void __init spec2_print_if_secure(const char *r=
eason)
 =09=09pr_info("%s selected on command line.\n", reason);
 }
=20
-static inline bool retp_compiler(void)
-{
-=09return __is_defined(CONFIG_RETPOLINE);
-}
-
 static inline bool match_option(const char *arg, int arglen, const char *o=
pt)
 {
 =09int len =3D strlen(opt);
@@ -417,14 +410,12 @@ static void __init spectre_v2_select_mitigation(void)
 =09=09=09pr_err("Spectre mitigation: LFENCE not serializing, switching to =
generic retpoline\n");
 =09=09=09goto retpoline_generic;
 =09=09}
-=09=09mode =3D retp_compiler() ? SPECTRE_V2_RETPOLINE_AMD :
-=09=09=09=09=09 SPECTRE_V2_RETPOLINE_MINIMAL_AMD;
+=09=09mode =3D SPECTRE_V2_RETPOLINE_AMD;
 =09=09setup_force_cpu_cap(X86_FEATURE_RETPOLINE_AMD);
 =09=09setup_force_cpu_cap(X86_FEATURE_RETPOLINE);
 =09} else {
 =09retpoline_generic:
-=09=09mode =3D retp_compiler() ? SPECTRE_V2_RETPOLINE_GENERIC :
-=09=09=09=09=09 SPECTRE_V2_RETPOLINE_MINIMAL;
+=09=09mode =3D SPECTRE_V2_RETPOLINE_GENERIC;
 =09=09setup_force_cpu_cap(X86_FEATURE_RETPOLINE);
 =09}
=20
--=20
1.8.3.1