summaryrefslogtreecommitdiff
path: root/arch/s390/kernel/nospec-sysfs.c
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2018-05-08 15:14:48 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2018-07-18 08:32:17 +0200
commitaeaf7002a76c8da60c0f503badcbddc07650678c (patch)
tree4a8bf8d1dd9ed365d8cdb4540062f81639833ba9 /arch/s390/kernel/nospec-sysfs.c
parentccaabeea02026e1fbf9274800e43d9135914cd72 (diff)
s390: detect etoken facility
Detect and report the etoken facility. With spectre_v2=auto or CONFIG_EXPOLINE_AUTO=y automatically disable expolines and use the full branch prediction mode for the kernel. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/nospec-sysfs.c')
-rw-r--r--arch/s390/kernel/nospec-sysfs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/nospec-sysfs.c b/arch/s390/kernel/nospec-sysfs.c
index 8affad5f18cb..e30e580ae362 100644
--- a/arch/s390/kernel/nospec-sysfs.c
+++ b/arch/s390/kernel/nospec-sysfs.c
@@ -13,6 +13,8 @@ ssize_t cpu_show_spectre_v1(struct device *dev,
ssize_t cpu_show_spectre_v2(struct device *dev,
struct device_attribute *attr, char *buf)
{
+ if (test_facility(156))
+ return sprintf(buf, "Mitigation: etokens\n");
if (IS_ENABLED(CC_USING_EXPOLINE) && !nospec_disable)
return sprintf(buf, "Mitigation: execute trampolines\n");
if (__test_facility(82, S390_lowcore.alt_stfle_fac_list))