Commit ff348355 authored by Michael Ellerman's avatar Michael Ellerman

powerpc/64s: Enhance the information in cpu_show_meltdown()

Now that we have the security feature flags we can make the
information displayed in the "meltdown" file more informative.
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 8ad33041
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
extern unsigned long powerpc_security_features; extern unsigned long powerpc_security_features;
extern bool rfi_flush;
static inline void security_ftr_set(unsigned long feature) static inline void security_ftr_set(unsigned long feature)
{ {
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/seq_buf.h>
#include <asm/security_features.h> #include <asm/security_features.h>
...@@ -19,8 +20,33 @@ unsigned long powerpc_security_features __read_mostly = \ ...@@ -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) ssize_t cpu_show_meltdown(struct device *dev, struct device_attribute *attr, char *buf)
{ {
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) if (rfi_flush)
return sprintf(buf, "Mitigation: RFI Flush\n"); 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"); return sprintf(buf, "Vulnerable\n");
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment