From: Jeremy Linton <jeremy.linton@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: catalin.marinas@arm.com, will.deacon@arm.com,
marc.zyngier@arm.com, suzuki.poulose@arm.com,
dave.martin@arm.com, shankerd@codeaurora.org,
linux-kernel@vger.kernel.org, ykaukab@suse.de,
julien.thierry@arm.com, mlangsdo@redhat.com,
steven.price@arm.com, stefan.wahren@i2se.com,
Jeremy Linton <jeremy.linton@arm.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Ingo Molnar <mingo@kernel.org>, Waiman Long <longman@redhat.com>,
Andi Kleen <ak@linux.intel.com>, Jiri Kosina <jkosina@suse.cz>
Subject: [PATCH v3 1/7] sysfs/cpu: Allow individual architectures to select vulnerabilities
Date: Wed, 9 Jan 2019 17:55:38 -0600 [thread overview]
Message-ID: <20190109235544.2992426-2-jeremy.linton@arm.com> (raw)
In-Reply-To: <20190109235544.2992426-1-jeremy.linton@arm.com>
As suggested on the list, https://lkml.org/lkml/2019/1/4/282, there are
a number of cases where its useful for a system to avoid exporting a
sysfs entry for a given vulnerability. This set adds an architecture
specific callback which returns the bitmap of vulnerabilities the
architecture would like to advertise.
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Rafael J. Wysocki <rafael@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Waiman Long <longman@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Kosina <jkosina@suse.cz>
---
drivers/base/cpu.c | 19 +++++++++++++++++++
include/linux/cpu.h | 7 +++++++
2 files changed, 26 insertions(+)
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index eb9443d5bae1..35f6dfb24cd6 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -561,6 +561,11 @@ static struct attribute *cpu_root_vulnerabilities_attrs[] = {
NULL
};
+uint __weak arch_supported_vuln_attr_fields(void)
+{
+ return VULN_MELTDOWN|VULN_SPECTREV1|VULN_SPECTREV2|VULN_SSB|VULN_L1TF;
+}
+
static const struct attribute_group cpu_root_vulnerabilities_group = {
.name = "vulnerabilities",
.attrs = cpu_root_vulnerabilities_attrs,
@@ -568,6 +573,20 @@ static const struct attribute_group cpu_root_vulnerabilities_group = {
static void __init cpu_register_vulnerabilities(void)
{
+ int fld;
+ int max_fields = ARRAY_SIZE(cpu_root_vulnerabilities_attrs) - 1;
+ struct attribute **hd = cpu_root_vulnerabilities_attrs;
+ uint enabled_fields = arch_supported_vuln_attr_fields();
+
+ /* only enable entries requested by the arch code */
+ for (fld = 0; fld < max_fields; fld++) {
+ if (enabled_fields & 1 << fld) {
+ *hd = cpu_root_vulnerabilities_attrs[fld];
+ hd++;
+ }
+ }
+ *hd = NULL;
+
if (sysfs_create_group(&cpu_subsys.dev_root->kobj,
&cpu_root_vulnerabilities_group))
pr_err("Unable to register CPU vulnerabilities\n");
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 218df7f4d3e1..5e45814bcc24 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -189,4 +189,11 @@ static inline void cpu_smt_check_topology_early(void) { }
static inline void cpu_smt_check_topology(void) { }
#endif
+/* generic cpu vulnerability attributes */
+#define VULN_MELTDOWN 0x01
+#define VULN_SPECTREV1 0x02
+#define VULN_SPECTREV2 0x04
+#define VULN_SSB 0x08
+#define VULN_L1TF 0x10
+
#endif /* _LINUX_CPU_H_ */
--
2.17.2
next prev parent reply other threads:[~2019-01-09 23:56 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-09 23:55 [PATCH v3 0/7] arm64: add system vulnerability sysfs entries Jeremy Linton
2019-01-09 23:55 ` Jeremy Linton [this message]
2019-01-14 10:02 ` [PATCH v3 1/7] sysfs/cpu: Allow individual architectures to select vulnerabilities Suzuki K Poulose
2019-01-18 15:46 ` Greg KH
2019-01-18 16:31 ` Jeremy Linton
2019-01-09 23:55 ` [PATCH v3 2/7] arm64: add sysfs vulnerability show for spectre v1 Jeremy Linton
2019-01-09 23:55 ` [PATCH v3 3/7] arm64: kpti: move check for non-vulnerable CPUs to a function Jeremy Linton
2019-01-12 10:41 ` Stefan Wahren
2019-01-14 11:32 ` Suzuki K Poulose
2019-01-18 16:35 ` Jeremy Linton
2019-01-09 23:55 ` [PATCH v3 4/7] arm64: add sysfs vulnerability show for meltdown Jeremy Linton
2019-01-10 9:23 ` Julien Thierry
2019-01-10 14:10 ` Jeremy Linton
2019-01-10 14:16 ` Julien Thierry
2019-01-09 23:55 ` [PATCH v3 5/7] arm64: add sysfs vulnerability show for spectre v2 Jeremy Linton
2019-01-09 23:55 ` [PATCH v3 6/7] arm64: add sysfs vulnerability show for speculative store bypass Jeremy Linton
2019-01-14 10:15 ` Marc Zyngier
2019-01-14 16:37 ` Jeremy Linton
2019-01-14 17:05 ` Marc Zyngier
2019-01-09 23:55 ` [PATCH v3 7/7] arm64: enable generic CPU vulnerabilites support Jeremy Linton
2019-01-15 19:50 ` [PATCH v3 0/7] arm64: add system vulnerability sysfs entries Stefan Wahren
2019-01-15 21:21 ` Jeremy Linton
2019-01-18 18:05 ` Stefan Wahren
2019-01-18 22:22 ` Jeremy Linton
2019-01-19 11:52 ` Stefan Wahren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190109235544.2992426-2-jeremy.linton@arm.com \
--to=jeremy.linton@arm.com \
--cc=ak@linux.intel.com \
--cc=catalin.marinas@arm.com \
--cc=dave.martin@arm.com \
--cc=gregkh@linuxfoundation.org \
--cc=jkosina@suse.cz \
--cc=jpoimboe@redhat.com \
--cc=julien.thierry@arm.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=longman@redhat.com \
--cc=marc.zyngier@arm.com \
--cc=mingo@kernel.org \
--cc=mlangsdo@redhat.com \
--cc=rafael@kernel.org \
--cc=shankerd@codeaurora.org \
--cc=stefan.wahren@i2se.com \
--cc=steven.price@arm.com \
--cc=suzuki.poulose@arm.com \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.com \
--cc=ykaukab@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®