UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Joe Mario <jmario@redhat.com>
Tested-by: Jiri Kosina <jkosina@suse.cz>
Fixes: f048c399e0 ("x86/topology: Provide topology_smt_supported()")
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
This commit is contained in:
Josh Poimboeuf 2018-07-24 18:17:40 +02:00 committed by Peter Zijlstra
parent 1949f9f497
commit 73d5e2b472
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/cpu.c
View File

@ -2125,6 +2125,15 @@ static const struct attribute_group cpuhp_smt_attr_group = {
static int __init cpu_smt_state_init(void) 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, return sysfs_create_group(&cpu_subsys.dev_root->kobj,
&cpuhp_smt_attr_group); &cpuhp_smt_attr_group);
} }