From: Tom Lendacky <thomas.lendacky@amd.com>
Subject: [PATCH v1 1/2] x86/retpoline: Add a function to clear the
 RETPOLINE_AMD feature
To: x86@kernel.org, linux-kernel@vger.kernel.org
Cc: Rik van Riel <riel@redhat.com>, Andi Kleen <ak@linux.intel.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Jiri Kosina <jikos@kernel.org>,
        Dan Williams <dan.j.williams@intel.com>,
        Dave Hansen <dave.hansen@intel.com>,
        Borislav Petkov <bp@alien8.de>,
        Andy Lutomirski <luto@kernel.org>,
        Kees Cook <keescook@google.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Tim Chen <tim.c.chen@linux.intel.com>,
        Greg Kroah-Hartman <gregkh@linux-foundation.org>,
        David Woodhouse <dwmw@amazon.co.uk>,
        Paul Turner <pjt@google.com>
Date: Tue, 09 Jan 2018 16:37:36 -0600
Message-ID: <20180109223736.29322.5436.stgit@tlendack-t1.amdoffice.net>
In-Reply-To: <20180109223723.29322.59126.stgit@tlendack-t1.amdoffice.net>
References: <20180109223723.29322.59126.stgit@tlendack-t1.amdoffice.net>
User-Agent: StGit/0.17.1-dirty
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jan 2018 22:37:39.3521 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 6b96a814-2397-4b43-f834-08d557b1974b
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1138
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Return-Path: <linux-kernel-owner@vger.kernel.org>

For AMD hardware, the RETPOLINE_AMD feature is dependent on LFENCE being
a serializing instruction.  Create a function to allow RETPOLINE_AMD to
be cleared if it cannot be determined that LFENCE is serializing. In
addition, update the spectre_v2_enabled variable so that sysfs output is
correct.

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
---
 arch/x86/include/asm/nospec-branch.h |    1 +
 arch/x86/kernel/cpu/bugs.c           |   10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
index 8ddf851..5785684 100644
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -153,6 +153,7 @@
 #endif
 
 void spectre_v2_check_boottime_disable(void);
+void retpoline_amd_disable(void);
 
 #endif /* __ASSEMBLY__ */
 #endif /* __NOSPEC_BRANCH_H__ */
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index b957f77..a4c594c 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -170,6 +170,16 @@ void __init spectre_v2_check_boottime_disable(void)
 	return;
 }
 
+void retpoline_amd_disable(void)
+{
+	if (!boot_cpu_has(X86_FEATURE_RETPOLINE_AMD))
+		return;
+
+	setup_clear_cpu_cap(X86_FEATURE_RETPOLINE_AMD);
+	spectre_v2_enabled = retp_compiler() ?
+		SPECTRE_V2_RETPOLINE_GENERIC : SPECTRE_V2_RETPOLINE_MINIMAL;
+}
+
 #ifdef CONFIG_SYSFS
 ssize_t cpu_show_meltdown(struct device *dev,
 			  struct device_attribute *attr, char *buf)