From: Michael Ellerman <mpe@ellerman.id.au>
To: <linux-kernel@vger.kernel.org>
Cc: <linuxppc-dev@lists.ozlabs.org>, <linux-arch@vger.kernel.org>,
<ldufour@linux.ibm.com>, <tglx@linutronix.de>,
bp@alien8.de, dave.hansen@linux.intel.com, mingo@redhat.com,
x86@kernel.org
Subject: [PATCH 6/9] cpu/SMT: Allow enabling partial SMT states via sysfs
Date: Thu, 25 May 2023 01:56:27 +1000 [thread overview]
Message-ID: <20230524155630.794584-6-mpe@ellerman.id.au> (raw)
In-Reply-To: <20230524155630.794584-1-mpe@ellerman.id.au>
Add support to the /sys/devices/system/cpu/smt/control interface for
enabling a specified number of SMT threads per core, including partial
SMT states where not all threads are brought online.
The current interface accepts "on" and "off", to enable either 1 or all
SMT threads per core.
This commit allows writing an integer, between 1 and the number of SMT
threads supported by the machine. Writing 1 is a synonym for "off", 2 or
more enables SMT with the specified number of threads.
When reading the file, if all threads are online "on" is returned, to
avoid changing behaviour for existing users. If some other number of
threads is online then the integer value is returned.
There is a hook which allows arch code to control how many threads per
core are supported. To retain the existing behaviour, the x86 hook only
supports 1 thread or all threads.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
.../ABI/testing/sysfs-devices-system-cpu | 1 +
kernel/cpu.c | 39 ++++++++++++++++---
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu
index f54867cadb0f..3c4cfb59d495 100644
--- a/Documentation/ABI/testing/sysfs-devices-system-cpu
+++ b/Documentation/ABI/testing/sysfs-devices-system-cpu
@@ -555,6 +555,7 @@ Description: Control Symmetric Multi Threading (SMT)
================ =========================================
"on" SMT is enabled
"off" SMT is disabled
+ "<N>" SMT is enabled with N threads per core.
"forceoff" SMT is force disabled. Cannot be changed.
"notsupported" SMT is not supported by the CPU
"notimplemented" SMT runtime toggling is not
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 72b9a03a4fef..aca23c7b4547 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -2497,7 +2497,7 @@ static ssize_t
__store_smt_control(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
- int ctrlval, ret;
+ int ctrlval, ret, num_threads, orig_threads;
if (cpu_smt_control == CPU_SMT_FORCE_DISABLED)
return -EPERM;
@@ -2505,20 +2505,38 @@ __store_smt_control(struct device *dev, struct device_attribute *attr,
if (cpu_smt_control == CPU_SMT_NOT_SUPPORTED)
return -ENODEV;
- if (sysfs_streq(buf, "on"))
+ if (sysfs_streq(buf, "on")) {
ctrlval = CPU_SMT_ENABLED;
- else if (sysfs_streq(buf, "off"))
+ num_threads = cpu_smt_max_threads;
+ } else if (sysfs_streq(buf, "off")) {
ctrlval = CPU_SMT_DISABLED;
- else if (sysfs_streq(buf, "forceoff"))
+ num_threads = 1;
+ } else if (sysfs_streq(buf, "forceoff")) {
ctrlval = CPU_SMT_FORCE_DISABLED;
- else
+ num_threads = 1;
+ } else if (kstrtoint(buf, 10, &num_threads) == 0) {
+ if (num_threads == 1)
+ ctrlval = CPU_SMT_DISABLED;
+ else if (num_threads > 1 && topology_smt_threads_supported(num_threads))
+ ctrlval = CPU_SMT_ENABLED;
+ else
+ return -EINVAL;
+ } else {
return -EINVAL;
+ }
ret = lock_device_hotplug_sysfs();
if (ret)
return ret;
- if (ctrlval != cpu_smt_control) {
+ orig_threads = cpu_smt_num_threads;
+ cpu_smt_num_threads = num_threads;
+
+ if (num_threads > orig_threads) {
+ ret = cpuhp_smt_enable();
+ } else if (num_threads < orig_threads) {
+ ret = cpuhp_smt_disable(ctrlval);
+ } else if (ctrlval != cpu_smt_control) {
switch (ctrlval) {
case CPU_SMT_ENABLED:
ret = cpuhp_smt_enable();
@@ -2556,6 +2574,15 @@ static ssize_t control_show(struct device *dev,
{
const char *state = smt_states[cpu_smt_control];
+ /*
+ * If SMT is enabled but not all threads are enabled then show the
+ * number of threads. If all threads are enabled show "on". Otherwise
+ * show the state name.
+ */
+ if (cpu_smt_control == CPU_SMT_ENABLED &&
+ cpu_smt_num_threads != cpu_smt_max_threads)
+ return sysfs_emit(buf, "%d\n", cpu_smt_num_threads);
+
return snprintf(buf, PAGE_SIZE - 2, "%s\n", state);
}
--
2.40.1
next prev parent reply other threads:[~2023-05-24 15:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-24 15:56 [PATCH 1/9] cpu/SMT: Move SMT prototypes into cpu_smt.h Michael Ellerman
2023-05-24 15:56 ` [PATCH 2/9] cpu/SMT: Move smt/control simple exit cases earlier Michael Ellerman
2023-05-24 15:56 ` [PATCH 3/9] cpu/SMT: Store the current/max number of threads Michael Ellerman
2023-06-10 21:26 ` Thomas Gleixner
2023-06-10 22:08 ` Thomas Gleixner
2023-06-13 17:16 ` Laurent Dufour
2023-06-13 18:53 ` Thomas Gleixner
2023-06-14 12:27 ` Laurent Dufour
2023-05-24 15:56 ` [PATCH 4/9] cpu/SMT: Create topology_smt_threads_supported() Michael Ellerman
2023-06-10 22:15 ` Thomas Gleixner
2023-05-24 15:56 ` [PATCH 5/9] cpu/SMT: Create topology_smt_thread_allowed() Michael Ellerman
2023-06-10 22:35 ` Thomas Gleixner
2023-05-24 15:56 ` Michael Ellerman [this message]
2023-06-10 20:09 ` [PATCH 6/9] cpu/SMT: Allow enabling partial SMT states via sysfs Thomas Gleixner
2023-06-10 20:13 ` Thomas Gleixner
2023-05-24 15:56 ` [PATCH 7/9] powerpc/pseries: Initialise CPU hotplug callbacks earlier Michael Ellerman
2023-05-24 15:56 ` [PATCH 8/9] powerpc: Add HOTPLUG_SMT support Michael Ellerman
2023-06-01 13:27 ` Laurent Dufour
2023-06-01 16:19 ` Laurent Dufour
2023-06-10 21:10 ` Thomas Gleixner
2023-06-12 15:20 ` Laurent Dufour
2023-06-12 16:34 ` Thomas Gleixner
2023-05-24 15:56 ` [PATCH 9/9] powerpc/pseries: Honour current SMT state when DLPAR onlining CPUs Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230524155630.794584-6-mpe@ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=ldufour@linux.ibm.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®