From: "tip-bot2 for Michael Ellerman" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Michael Ellerman <mpe@ellerman.id.au>,
Thomas Gleixner <tglx@linutronix.de>,
Zhang Rui <rui.zhang@intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: smp/core] cpu/SMT: Move smt/control simple exit cases earlier
Date: Fri, 28 Jul 2023 07:57:54 -0000 [thread overview]
Message-ID: <169053107483.28540.2683617765976319627.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20230705145143.40545-4-ldufour@linux.ibm.com>
The following commit has been merged into the smp/core branch of tip:
Commit-ID: c53361ce7d8771129c517dca529d2f2dc5bf04d1
Gitweb: https://git.kernel.org/tip/c53361ce7d8771129c517dca529d2f2dc5bf04d1
Author: Michael Ellerman <mpe@ellerman.id.au>
AuthorDate: Wed, 05 Jul 2023 16:51:36 +02:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Fri, 28 Jul 2023 09:53:36 +02:00
cpu/SMT: Move smt/control simple exit cases earlier
Move the simple exit cases, i.e. those which don't depend on the value
written, earlier in the function. That makes it clearer that regardless of
the input those states cannot be transitioned out of.
That does have a user-visible effect, in that the error returned will
now always be EPERM/ENODEV for those states, regardless of the value
written. Previously writing an invalid value would return EINVAL even
when in those states.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Zhang Rui <rui.zhang@intel.com>
Link: https://lore.kernel.org/r/20230705145143.40545-4-ldufour@linux.ibm.com
---
kernel/cpu.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/kernel/cpu.c b/kernel/cpu.c
index e02204c..b6fe170 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -2841,6 +2841,12 @@ __store_smt_control(struct device *dev, struct device_attribute *attr,
{
int ctrlval, ret;
+ if (cpu_smt_control == CPU_SMT_FORCE_DISABLED)
+ return -EPERM;
+
+ if (cpu_smt_control == CPU_SMT_NOT_SUPPORTED)
+ return -ENODEV;
+
if (sysfs_streq(buf, "on"))
ctrlval = CPU_SMT_ENABLED;
else if (sysfs_streq(buf, "off"))
@@ -2850,12 +2856,6 @@ __store_smt_control(struct device *dev, struct device_attribute *attr,
else
return -EINVAL;
- if (cpu_smt_control == CPU_SMT_FORCE_DISABLED)
- return -EPERM;
-
- if (cpu_smt_control == CPU_SMT_NOT_SUPPORTED)
- return -ENODEV;
-
ret = lock_device_hotplug_sysfs();
if (ret)
return ret;
next prev parent reply other threads:[~2023-07-28 7:58 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-05 14:51 [PATCH v4 00/10] Introduce SMT level and add PowerPC support Laurent Dufour
2023-07-05 14:51 ` [PATCH v4 01/10] cpu/hotplug: remove dependancy against cpu_primary_thread_mask Laurent Dufour
2023-07-28 7:57 ` [tip: smp/core] cpu/hotplug: Remove " tip-bot2 for Laurent Dufour
2023-07-05 14:51 ` [PATCH v4 02/10] cpu/SMT: Move SMT prototypes into cpu_smt.h Laurent Dufour
2023-07-28 7:57 ` [tip: smp/core] " tip-bot2 for Michael Ellerman
2023-07-05 14:51 ` [PATCH v4 03/10] cpu/SMT: Move smt/control simple exit cases earlier Laurent Dufour
2023-07-28 7:57 ` tip-bot2 for Michael Ellerman [this message]
2023-07-05 14:51 ` [PATCH v4 04/10] cpu/SMT: Store the current/max number of threads Laurent Dufour
2023-07-28 7:57 ` [tip: smp/core] " tip-bot2 for Michael Ellerman
2023-07-05 14:51 ` [PATCH v4 05/10] cpu/SMT: Remove topology_smt_supported() Laurent Dufour
2023-07-28 7:57 ` [tip: smp/core] " tip-bot2 for Laurent Dufour
2023-07-05 14:51 ` [PATCH v4 06/10] cpu/SMT: Create topology_smt_thread_allowed() Laurent Dufour
2023-07-28 7:57 ` [tip: smp/core] " tip-bot2 for Michael Ellerman
2023-07-05 14:51 ` [PATCH v4 07/10] cpu/SMT: Allow enabling partial SMT states via sysfs Laurent Dufour
2023-07-28 7:57 ` [tip: smp/core] " tip-bot2 for Michael Ellerman
2024-04-08 14:13 ` [PATCH v4 07/10] " Michal Suchánek
2023-07-05 14:51 ` [PATCH v4 08/10] powerpc/pseries: Initialise CPU hotplug callbacks earlier Laurent Dufour
2023-08-14 10:51 ` Srikar Dronamraju
2023-07-05 14:51 ` [PATCH v4 09/10] powerpc: Add HOTPLUG_SMT support Laurent Dufour
2023-08-14 10:52 ` Srikar Dronamraju
2023-07-05 14:51 ` [PATCH v4 10/10] powerpc/pseries: Honour current SMT state when DLPAR onlining CPUs Laurent Dufour
2023-08-14 10:53 ` Srikar Dronamraju
2023-07-09 15:25 ` [PATCH v4 00/10] Introduce SMT level and add PowerPC support Zhang, Rui
2023-07-10 9:08 ` Laurent Dufour
2023-07-28 7:40 ` Thomas Gleixner
2023-07-28 14:23 ` Zhang, Rui
2023-07-28 14:51 ` Thomas Gleixner
2023-07-28 7:58 ` Thomas Gleixner
2023-07-31 11:55 ` Laurent Dufour
2023-08-10 6:23 ` Michael Ellerman
2023-08-10 8:51 ` Laurent Dufour
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=169053107483.28540.2683617765976319627.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mpe@ellerman.id.au \
--cc=rui.zhang@intel.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®