Received: by 10.223.176.46 with SMTP id f43csp795489wra; Fri, 26 Jan 2018 07:04:22 -0800 (PST) X-Google-Smtp-Source: AH8x2259+jSX481PdfV1CVaYsGkLRMX/+19m3Q2861p3Hd+67nqaE7hO+XcZBjv1C0AbrPJsHORl X-Received: by 10.99.125.13 with SMTP id y13mr15645054pgc.282.1516979062107; Fri, 26 Jan 2018 07:04:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516979062; cv=none; d=google.com; s=arc-20160816; b=dqfDBlvrIvhbNEWD3dL79HnGu3ebbvGfHGLtulhjVjH+yg5/wBMLRZRIw+z9dT1HiD aAnzPlkmWdM7fjWrvK/l1l3+TLaBYGTkrkMJkX4OGIxylIcghSZ4DwgbdOI5D669qNcL 28WkI/7AVCSeIKwLxXz6Fv/ousd9EbVSSRgLydzxgyXa+RWkEXToDrJHSEzt+PVwNiAs n8W/cLzIAGGkVRt1GVIPkWtdMr6CqO5hYYel04iUjEB+jFk+NHvBCUhXNVhV9jbZsdEX W6egu/SWtqJuSxNzGcF71qQld8vYkBeWYPxx3STryb7ruiMwY6T8xVIbvr4sYd4oYk69 ES/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-disposition :content-transfer-encoding:mime-version:robot-unsubscribe:robot-id :git-commit-id:subject:to:references:in-reply-to:reply-to:cc :message-id:from:date:arc-authentication-results; bh=5XCf6EZ3U0k4NZ2kvpTgqgwzUX7wEbZIo1IRhKKrPAU=; b=JlyCwESfAjOCpmMHPv7Q+RnTnMvvzN2ImV0MH3l3UBGS6O4oiNT2pkbeWDN9ui/GTf PK/I7jSEAlfAm5argN0fH9uz20hWIHo/ZcYElZsfYmEGTd2VyTAVsA08tfRWxJRkgemV UdyVjKnxljtlHms7UIGGpgT0LNzWSrt5YnkPxhIG8/CpFjGC2Z5vdAj0OrgdRb9FPja5 2x/PFcQoqsXf/Ays7tbhXKAwP5HLS22n/6xhCjldyX2HPq9bGzAdWK0gr+B74TaRSwr7 NNqMxaNNtbT0fqgDWuofOcQVrPxS/lzytnpwBkrhvGt0XatXYSm6Dc2EEBoDuAPdABDF UwkQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f61-v6si3812342plb.179.2018.01.26.07.04.07; Fri, 26 Jan 2018 07:04:22 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753486AbeAZPDf (ORCPT + 99 others); Fri, 26 Jan 2018 10:03:35 -0500 Received: from terminus.zytor.com ([65.50.211.136]:45849 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753253AbeAZPDa (ORCPT ); Fri, 26 Jan 2018 10:03:30 -0500 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTP id w0QF2Gf9031683; Fri, 26 Jan 2018 07:02:16 -0800 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id w0QF2Fek031666; Fri, 26 Jan 2018 07:02:15 -0800 Date: Fri, 26 Jan 2018 07:02:15 -0800 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for David Woodhouse Message-ID: Cc: linux-kernel@vger.kernel.org, karahmed@amazon.de, hpa@zytor.com, dwmw@amazon.co.uk, mingo@kernel.org, tglx@linutronix.de Reply-To: linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, dwmw@amazon.co.uk, karahmed@amazon.de In-Reply-To: <1516896855-7642-8-git-send-email-dwmw@amazon.co.uk> References: <1516896855-7642-8-git-send-email-dwmw@amazon.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/speculation: Add basic IBPB (Indirect Branch Prediction Barrier) support Git-Commit-ID: 20ffa1caecca4db8f79fe665acdeaa5af815a24d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on terminus.zytor.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 20ffa1caecca4db8f79fe665acdeaa5af815a24d Gitweb: https://git.kernel.org/tip/20ffa1caecca4db8f79fe665acdeaa5af815a24d Author: David Woodhouse AuthorDate: Thu, 25 Jan 2018 16:14:15 +0000 Committer: Thomas Gleixner CommitDate: Fri, 26 Jan 2018 15:53:18 +0100 x86/speculation: Add basic IBPB (Indirect Branch Prediction Barrier) support Expose indirect_branch_prediction_barrier() for use in subsequent patches. [ tglx: Add IBPB status to spectre_v2 sysfs file ] Co-developed-by: KarimAllah Ahmed Signed-off-by: KarimAllah Ahmed Signed-off-by: David Woodhouse Cc: gnomes@lxorguk.ukuu.org.uk Cc: ak@linux.intel.com Cc: ashok.raj@intel.com Cc: dave.hansen@intel.com Cc: arjan@linux.intel.com Cc: torvalds@linux-foundation.org Cc: peterz@infradead.org Cc: bp@alien8.de Cc: pbonzini@redhat.com Cc: tim.c.chen@linux.intel.com Cc: gregkh@linux-foundation.org Link: https://lkml.kernel.org/r/1516896855-7642-8-git-send-email-dwmw@amazon.co.uk --- arch/x86/include/asm/cpufeatures.h | 2 ++ arch/x86/include/asm/nospec-branch.h | 13 +++++++++++++ arch/x86/kernel/cpu/bugs.c | 10 +++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index ae3212f..07934b2 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -210,6 +210,8 @@ #define X86_FEATURE_MBA ( 7*32+18) /* Memory Bandwidth Allocation */ #define X86_FEATURE_RSB_CTXSW ( 7*32+19) /* Fill RSB on context switches */ +#define X86_FEATURE_IBPB ( 7*32+21) /* Indirect Branch Prediction Barrier enabled*/ + /* Virtualization flags: Linux defined, word 8 */ #define X86_FEATURE_TPR_SHADOW ( 8*32+ 0) /* Intel TPR Shadow */ #define X86_FEATURE_VNMI ( 8*32+ 1) /* Intel Virtual NMI */ diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index 4ad4108..34e384c 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -218,5 +218,18 @@ static inline void vmexit_fill_RSB(void) #endif } +static inline void indirect_branch_prediction_barrier(void) +{ + asm volatile(ALTERNATIVE("", + "movl %[msr], %%ecx\n\t" + "movl %[val], %%eax\n\t" + "movl $0, %%edx\n\t" + "wrmsr", + X86_FEATURE_IBPB) + : : [msr] "i" (MSR_IA32_PRED_CMD), + [val] "i" (PRED_CMD_IBPB) + : "eax", "ecx", "edx", "memory"); +} + #endif /* __ASSEMBLY__ */ #endif /* __NOSPEC_BRANCH_H__ */ diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 4a39d7b..bac7a35 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -263,6 +263,13 @@ retpoline_auto: setup_force_cpu_cap(X86_FEATURE_RSB_CTXSW); pr_info("Filling RSB on context switch\n"); } + + /* Initialize Indirect Branch Prediction Barrier if supported */ + if (boot_cpu_has(X86_FEATURE_SPEC_CTRL) || + boot_cpu_has(X86_FEATURE_AMD_PRED_CMD)) { + setup_force_cpu_cap(X86_FEATURE_IBPB); + pr_info("Enabling Indirect Branch Prediction Barrier\n"); + } } #undef pr_fmt @@ -292,7 +299,8 @@ ssize_t cpu_show_spectre_v2(struct device *dev, if (!boot_cpu_has_bug(X86_BUG_SPECTRE_V2)) return sprintf(buf, "Not affected\n"); - return sprintf(buf, "%s%s\n", spectre_v2_strings[spectre_v2_enabled], + return sprintf(buf, "%s%s%s\n", spectre_v2_strings[spectre_v2_enabled], + boot_cpu_has(X86_FEATURE_IBPB) ? ", IPBP" : "", spectre_v2_bad_module ? " - vulnerable module loaded" : ""); } #endif