Commit 9541fd1b authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Stefan Bader

cpu/hotplug: detect SMT disabled by BIOS

If SMT is disabled in BIOS, the CPU code doesn't properly detect it.
The /sys/devices/system/cpu/smt/control file shows 'on', and the 'l1tf'
vulnerabilities file shows SMT as vulnerable.

Fix it by forcing 'cpu_smt_control' to CPU_SMT_NOT_SUPPORTED in such a
case.  Unfortunately the detection can only be done after bringing all
the CPUs online, so we have to overwrite any previous writes to the
variable.
Reported-by: default avatarJoe Mario <jmario@redhat.com>
Tested-by: default avatarJiri Kosina <jkosina@suse.cz>
Fixes: f048c399 ("x86/topology: Provide topology_smt_supported()")
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>

CVE-2018-3620
CVE-2018-3646
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent 3f1a1526
......@@ -944,6 +944,15 @@ static const struct attribute_group cpuhp_smt_attr_group = {
static int __init cpu_smt_state_init(void)
{
/*
* If SMT was disabled by BIOS, detect it here, after the CPUs have
* been brought online. This ensures the smt/l1tf sysfs entries are
* consistent with reality. Note this may overwrite cpu_smt_control's
* previous setting.
*/
if (topology_max_smt_threads() == 1)
cpu_smt_control = CPU_SMT_NOT_SUPPORTED;
return sysfs_create_group(&cpu_subsys.dev_root->kobj,
&cpuhp_smt_attr_group);
}
......
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