Commit ccbcecf1 authored by Zhenzhong Duan's avatar Zhenzhong Duan Committed by Kleber Sacilotto de Souza

x86/speculation: Remove redundant arch_smt_update() invocation

With commit a74cfffb ("x86/speculation: Rework SMT state change"),
arch_smt_update() is invoked from each individual CPU hotplug function.

Therefore the extra arch_smt_update() call in the sysfs SMT control is
redundant.

Fixes: a74cfffb ("x86/speculation: Rework SMT state change")
Signed-off-by: default avatarZhenzhong Duan <zhenzhong.duan@oracle.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: <konrad.wilk@oracle.com>
Cc: <dwmw@amazon.co.uk>
Cc: <bp@suse.de>
Cc: <srinivas.eeda@oracle.com>
Cc: <peterz@infradead.org>
Cc: <hpa@zytor.com>
Link: https://lkml.kernel.org/r/e2e064f2-e8ef-42ca-bf4f-76b612964752@default

CVE-2018-12126
CVE-2018-12127
CVE-2018-12130

(cherry picked from commit 34d66caf)
Signed-off-by: default avatarJuerg Haefliger <juergh@canonical.com>
Acked-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
Acked-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 1ed3dab1
...@@ -896,10 +896,8 @@ static int cpuhp_smt_disable(enum cpuhp_smt_control ctrlval) ...@@ -896,10 +896,8 @@ static int cpuhp_smt_disable(enum cpuhp_smt_control ctrlval)
*/ */
cpuhp_offline_cpu_device(cpu); cpuhp_offline_cpu_device(cpu);
} }
if (!ret) { if (!ret)
cpu_smt_control = ctrlval; cpu_smt_control = ctrlval;
arch_smt_update();
}
cpu_maps_update_done(); cpu_maps_update_done();
return ret; return ret;
} }
...@@ -910,7 +908,6 @@ static int cpuhp_smt_enable(void) ...@@ -910,7 +908,6 @@ static int cpuhp_smt_enable(void)
cpu_maps_update_begin(); cpu_maps_update_begin();
cpu_smt_control = CPU_SMT_ENABLED; cpu_smt_control = CPU_SMT_ENABLED;
arch_smt_update();
for_each_present_cpu(cpu) { for_each_present_cpu(cpu) {
/* Skip online CPUs and CPUs on offline nodes */ /* Skip online CPUs and CPUs on offline nodes */
if (cpu_online(cpu) || !node_online(cpu_to_node(cpu))) if (cpu_online(cpu) || !node_online(cpu_to_node(cpu)))
......
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