Skip to contentSkip to conversation

SMT: State SMT is disabled even with nosmt and without "=force"

PATCH New Borislav Petkov 2 participants 2 messages Oct 4, 2018 – Oct 5, 2018 CPU hotplug

lore
Share & tools
lore

Borislav Petkov

author
#0 lore raw

PATCH 1/1 SMT: State SMT is disabled even with nosmt and without "=force"

From: Borislav Petkov <[email protected]>

When booting with "nosmt=force" a message is issued into dmesg to confirm that SMT has been force-disabled but such a message is not issued when only "nosmt" is on the kernel command line.

Fix that.

Signed-off-by Borislav Petkov <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc [email protected]
---
 kernel/cpu.c | 1 +
 1 file changed, 1 insertion(+)
kernel/cpu.c +1 -0
index 668c8553e171..3c7f3b4c453c 100644
@@ -383,6 +383,7 @@ void __init cpu_smt_disable(bool force)
 		pr_info("SMT: Force disabled\n");
 		cpu_smt_control = CPU_SMT_FORCE_DISABLED;
 	} else {
+		pr_info("SMT: disabled\n");
 		cpu_smt_control = CPU_SMT_DISABLED;
 	}
 }
Signature · 1 line
2.19.0.271.gfe8321ec057f
merge bot
#1 lore raw

[tip:sched/core] cpu/SMT: State SMT is disabled even with nosmt and without "=force"

cpu/SMT: State SMT is disabled even with nosmt and without "=force"
Commit-ID:  d0e7d14455d41163126afecd0fcce935463cc512
Gitweb:     https://git.kernel.org/tip/d0e7d14455d41163126afecd0fcce935463cc512
Author:     Borislav Petkov <[email protected]>
AuthorDate: Thu, 4 Oct 2018 19:22:27 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 5 Oct 2018 10:20:31 +0200

cpu/SMT: State SMT is disabled even with nosmt and without "=force"

When booting with "nosmt=force" a message is issued into dmesg to confirm that SMT has been force-disabled but such a message is not issued when only "nosmt" is on the kernel command line.

Fix that.

Signed-off-by Borislav Petkov <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
---
 kernel/cpu.c | 1 +
 1 file changed, 1 insertion(+)
kernel/cpu.c +1 -0
index 0097acec1c71..f1338452d998 100644
@@ -362,6 +362,7 @@ void __init cpu_smt_disable(bool force)
 		pr_info("SMT: Force disabled\n");
 		cpu_smt_control = CPU_SMT_FORCE_DISABLED;
 	} else {
+		pr_info("SMT: disabled\n");
 		cpu_smt_control = CPU_SMT_DISABLED;
 	}
 }