From: Michael Ellerman <mpe@ellerman.id.au>
To: greg@kroah.com
Cc: stable@vger.kernel.org, tglx@linutronix.de, linuxppc-dev@ozlabs.org
Subject: [PATCH stable 4.16 07/14] powerpc/64s: Enhance the information in cpu_show_meltdown()
Date: Wed, 23 May 2018 00:41:18 +1000 [thread overview]
Message-ID: <20180522144125.10345-8-mpe@ellerman.id.au> (raw)
In-Reply-To: <20180522144125.10345-1-mpe@ellerman.id.au>
commit ff348355e9c72493947be337bb4fae4fc1a41eba upstream.
Now that we have the security feature flags we can make the
information displayed in the "meltdown" file more informative.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
arch/powerpc/include/asm/security_features.h | 1 +
arch/powerpc/kernel/security.c | 30 ++++++++++++++++++++++++++--
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/include/asm/security_features.h b/arch/powerpc/include/asm/security_features.h
index db00ad2c72c2..400a9050e035 100644
--- a/arch/powerpc/include/asm/security_features.h
+++ b/arch/powerpc/include/asm/security_features.h
@@ -10,6 +10,7 @@
extern unsigned long powerpc_security_features;
+extern bool rfi_flush;
static inline void security_ftr_set(unsigned long feature)
{
diff --git a/arch/powerpc/kernel/security.c b/arch/powerpc/kernel/security.c
index 564e7f182a16..865db6f8bcca 100644
--- a/arch/powerpc/kernel/security.c
+++ b/arch/powerpc/kernel/security.c
@@ -6,6 +6,7 @@
#include <linux/kernel.h>
#include <linux/device.h>
+#include <linux/seq_buf.h>
#include <asm/security_features.h>
@@ -19,8 +20,33 @@ unsigned long powerpc_security_features __read_mostly = \
ssize_t cpu_show_meltdown(struct device *dev, struct device_attribute *attr, char *buf)
{
- if (rfi_flush)
- return sprintf(buf, "Mitigation: RFI Flush\n");
+ bool thread_priv;
+
+ thread_priv = security_ftr_enabled(SEC_FTR_L1D_THREAD_PRIV);
+
+ if (rfi_flush || thread_priv) {
+ struct seq_buf s;
+ seq_buf_init(&s, buf, PAGE_SIZE - 1);
+
+ seq_buf_printf(&s, "Mitigation: ");
+
+ if (rfi_flush)
+ seq_buf_printf(&s, "RFI Flush");
+
+ if (rfi_flush && thread_priv)
+ seq_buf_printf(&s, ", ");
+
+ if (thread_priv)
+ seq_buf_printf(&s, "L1D private per thread");
+
+ seq_buf_printf(&s, "\n");
+
+ return s.len;
+ }
+
+ if (!security_ftr_enabled(SEC_FTR_L1D_FLUSH_HV) &&
+ !security_ftr_enabled(SEC_FTR_L1D_FLUSH_PR))
+ return sprintf(buf, "Not affected\n");
return sprintf(buf, "Vulnerable\n");
}
--
2.14.1
next prev parent reply other threads:[~2018-05-22 14:42 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-22 14:41 [PATCH stable 4.16 00/14] powerpc backports for 4.16 Michael Ellerman
2018-05-22 14:41 ` [PATCH stable 4.16 01/14] powerpc/rfi-flush: Always enable fallback flush on pseries Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/rfi-flush: Always enable fallback flush on pseries" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 02/14] powerpc: Add security feature flags for Spectre/Meltdown Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc: Add security feature flags for Spectre/Meltdown" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 03/14] powerpc/pseries: Add new H_GET_CPU_CHARACTERISTICS flags Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/pseries: Add new H_GET_CPU_CHARACTERISTICS flags" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 04/14] powerpc/pseries: Set or clear security feature flags Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/pseries: Set or clear security feature flags" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 05/14] powerpc/powernv: Set or clear security feature flags Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/powernv: Set or clear security feature flags" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 06/14] powerpc/64s: Move cpu_show_meltdown() Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/64s: Move cpu_show_meltdown()" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` Michael Ellerman [this message]
2018-05-23 17:23 ` Patch "powerpc/64s: Enhance the information in " gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 08/14] powerpc/powernv: Use the security flags in pnv_setup_rfi_flush() Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/powernv: Use the security flags in pnv_setup_rfi_flush()" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 09/14] powerpc/pseries: Use the security flags in pseries_setup_rfi_flush() Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/pseries: Use the security flags in pseries_setup_rfi_flush()" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 10/14] powerpc/64s: Wire up cpu_show_spectre_v1() Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/64s: Wire up cpu_show_spectre_v1()" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 11/14] powerpc/64s: Wire up cpu_show_spectre_v2() Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/64s: Wire up cpu_show_spectre_v2()" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 12/14] powerpc/pseries: Fix clearing of security feature flags Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/pseries: Fix clearing of security feature flags" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 13/14] powerpc: Move default security feature flags Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc: Move default security feature flags" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 14/14] powerpc/64s: Add support for a store forwarding barrier at kernel entry/exit Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/64s: Add support for a store forwarding barrier at kernel entry/exit" has been added to the 4.16-stable tree gregkh
2018-05-23 17:21 ` [PATCH stable 4.16 00/14] powerpc backports for 4.16 Greg KH
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=20180522144125.10345-8-mpe@ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=greg@kroah.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.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;
as well as URLs for NNTP newsgroup(s).