From: "tip-bot2 for Phil Auld" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Phil Auld <pauld@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Valentin Schneider <vschneid@redhat.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: smp/core] cpuhp: Make target_store() a nop when target == state
Date: Thu, 01 Dec 2022 11:41:24 -0000 [thread overview]
Message-ID: <166989488463.4906.8715334204096231628.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20221117162329.3164999-2-pauld@redhat.com>
The following commit has been merged into the smp/core branch of tip:
Commit-ID: 0fa5abb6b7d85bf5688b2e11113f50317fb0121c
Gitweb: https://git.kernel.org/tip/0fa5abb6b7d85bf5688b2e11113f50317fb0121c
Author: Phil Auld <pauld@redhat.com>
AuthorDate: Thu, 17 Nov 2022 11:23:28 -05:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 01 Dec 2022 12:35:08 +01:00
cpuhp: Make target_store() a nop when target == state
Writing the current state back in hotplug/target calls cpu_down()
which will set cpu dying even when it isn't and then nothing will
ever clear it. A stress test that reads values and writes them back
for all cpu device files in sysfs will trigger the BUG() in
select_fallback_rq once all cpus are marked as dying.
kernel/cpu.c::target_store()
...
if (st->state < target)
ret = cpu_up(dev->id, target);
else
ret = cpu_down(dev->id, target);
cpu_down() -> cpu_set_state()
bool bringup = st->state < target;
...
if (cpu_dying(cpu) != !bringup)
set_cpu_dying(cpu, !bringup);
Fix this by letting state==target fall through in the target_store()
conditional. Also make sure st->target == target in that case.
Fixes: 757c989b9994 ("cpu/hotplug: Make target state writeable")
Signed-off-by: Phil Auld <pauld@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Valentin Schneider <vschneid@redhat.com>
Link: https://lore.kernel.org/r/20221117162329.3164999-2-pauld@redhat.com
---
kernel/cpu.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/kernel/cpu.c b/kernel/cpu.c
index bbad5e3..979de99 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -2326,8 +2326,10 @@ static ssize_t target_store(struct device *dev, struct device_attribute *attr,
if (st->state < target)
ret = cpu_up(dev->id, target);
- else
+ else if (st->state > target)
ret = cpu_down(dev->id, target);
+ else if (WARN_ON(st->target != target))
+ st->target = target;
out:
unlock_device_hotplug();
return ret ? ret : count;
next prev parent reply other threads:[~2022-12-01 11:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-17 16:23 [PATCH v5 0/2] cpuhp: fix some st->target issues Phil Auld
2022-11-17 16:23 ` [PATCH v5 1/2] cpuhp: Make target_store() a nop when target == state Phil Auld
2022-12-01 11:41 ` tip-bot2 for Phil Auld [this message]
2022-12-02 11:51 ` [tip: smp/core] cpu/hotplug: " tip-bot2 for Phil Auld
2022-11-17 16:23 ` [PATCH v5 2/2] cpuhp: Set cpuhp target for boot cpu Phil Auld
2022-12-01 11:41 ` [tip: smp/core] " tip-bot2 for Phil Auld
2022-12-02 11:50 ` [tip: smp/core] cpu/hotplug: " tip-bot2 for Phil Auld
2022-12-01 12:26 ` [PATCH v5 0/2] cpuhp: fix some st->target issues Phil Auld
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=166989488463.4906.8715334204096231628.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=pauld@redhat.com \
--cc=tglx@linutronix.de \
--cc=vschneid@redhat.com \
--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®