From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755608AbeAHKWf (ORCPT + 1 other); Mon, 8 Jan 2018 05:22:35 -0500 Received: from terminus.zytor.com ([65.50.211.136]:44531 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755163AbeAHKWe (ORCPT ); Mon, 8 Jan 2018 05:22:34 -0500 Date: Mon, 8 Jan 2018 02:17:01 -0800 From: tip-bot for Thomas Gleixner Message-ID: Cc: torvalds@linuxfoundation.org, dave.hansen@intel.com, peterz@infradead.org, gregkh@linuxfoundation.org, will.deacon@arm.com, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, konrad.wilk@oracle.com, dwmw@amazon.co.uk, hpa@zytor.com, bp@alien8.de Reply-To: gregkh@linuxfoundation.org, peterz@infradead.org, will.deacon@arm.com, mingo@kernel.org, dave.hansen@intel.com, torvalds@linuxfoundation.org, dwmw@amazon.co.uk, konrad.wilk@oracle.com, linux-kernel@vger.kernel.org, hpa@zytor.com, bp@alien8.de, tglx@linutronix.de In-Reply-To: <20180107214913.177414879@linutronix.de> References: <20180107214913.177414879@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/cpu: Implement CPU vulnerabilites sysfs functions Git-Commit-ID: 61dc0f555b5c761cdafb0ba5bd41ecf22d68a4c4 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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Commit-ID: 61dc0f555b5c761cdafb0ba5bd41ecf22d68a4c4 Gitweb: https://git.kernel.org/tip/61dc0f555b5c761cdafb0ba5bd41ecf22d68a4c4 Author: Thomas Gleixner AuthorDate: Sun, 7 Jan 2018 22:48:01 +0100 Committer: Thomas Gleixner CommitDate: Mon, 8 Jan 2018 11:10:40 +0100 x86/cpu: Implement CPU vulnerabilites sysfs functions Implement the CPU vulnerabilty show functions for meltdown, spectre_v1 and spectre_v2. Signed-off-by: Thomas Gleixner Reviewed-by: Greg Kroah-Hartman Reviewed-by: Konrad Rzeszutek Wilk Cc: Peter Zijlstra Cc: Will Deacon Cc: Dave Hansen Cc: Linus Torvalds Cc: Borislav Petkov Cc: David Woodhouse Link: https://lkml.kernel.org/r/20180107214913.177414879@linutronix.de --- arch/x86/Kconfig | 1 + arch/x86/kernel/cpu/bugs.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index cd5199d..e23d21a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -89,6 +89,7 @@ config X86 select GENERIC_CLOCKEVENTS_MIN_ADJUST select GENERIC_CMOS_UPDATE select GENERIC_CPU_AUTOPROBE + select GENERIC_CPU_VULNERABILITIES select GENERIC_EARLY_IOREMAP select GENERIC_FIND_FIRST_BIT select GENERIC_IOMAP diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index ba0b242..76ad6cb 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -10,6 +10,7 @@ */ #include #include +#include #include #include #include @@ -60,3 +61,31 @@ void __init check_bugs(void) set_memory_4k((unsigned long)__va(0), 1); #endif } + +#ifdef CONFIG_SYSFS +ssize_t cpu_show_meltdown(struct device *dev, + struct device_attribute *attr, char *buf) +{ + if (!boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN)) + return sprintf(buf, "Not affected\n"); + if (boot_cpu_has(X86_FEATURE_PTI)) + return sprintf(buf, "Mitigation: PTI\n"); + return sprintf(buf, "Vulnerable\n"); +} + +ssize_t cpu_show_spectre_v1(struct device *dev, + struct device_attribute *attr, char *buf) +{ + if (!boot_cpu_has_bug(X86_BUG_SPECTRE_V1)) + return sprintf(buf, "Not affected\n"); + return sprintf(buf, "Vulnerable\n"); +} + +ssize_t cpu_show_spectre_v2(struct device *dev, + struct device_attribute *attr, char *buf) +{ + if (!boot_cpu_has_bug(X86_BUG_SPECTRE_V2)) + return sprintf(buf, "Not affected\n"); + return sprintf(buf, "Vulnerable\n"); +} +#endif