Commit 34d66caf authored Jan 17, 2019 by Zhenzhong Duan Committed by Thomas Gleixner Jan 29, 2019

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: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Signed-off-by: Thomas 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

parent 4aa9fc2a

kernel/cpu.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -2090,10 +2090,8 @@ static int cpuhp_smt_disable(enum cpuhp_smt_control ctrlval)
		*/
		cpuhp_offline_cpu_device(cpu);
		}
		if (!ret) {
		if (!ret)
		cpu_smt_control = ctrlval;
		arch_smt_update();
		}
		cpu_maps_update_done();
		return ret;
		}
		@@ -2104,7 +2102,6 @@ static int cpuhp_smt_enable(void)

		cpu_maps_update_begin();
		cpu_smt_control = CPU_SMT_ENABLED;
		arch_smt_update();
		for_each_present_cpu(cpu) {
		/* Skip online CPUs and CPUs on offline nodes */
		if (cpu_online(cpu) \|\| !node_online(cpu_to_node(cpu)))

Admin message