From: Neeraj Upadhyay <neeraju@codeaurora.org>
To: tglx@linutronix.de, josh@joshtriplett.org, peterz@infradead.org,
mingo@kernel.org, jiangshanlai@gmail.com, dzickus@redhat.com,
brendan.jackman@arm.com, malat@debian.org
Cc: linux-kernel@vger.kernel.org, sramana@codeaurora.org,
linux-arm-msm@vger.kernel.org,
Neeraj Upadhyay <neeraju@codeaurora.org>
Subject: [PATCH] cpu/hotplug: Fix rollback during error-out in takedown_cpu()
Date: Tue, 4 Sep 2018 12:03:23 +0530 [thread overview]
Message-ID: <1536042803-6152-1-git-send-email-neeraju@codeaurora.org> (raw)
If takedown_cpu() fails during _cpu_down(), st->state is reset,
by calling cpuhp_reset_state(). This results in an additional
increment of st->state, which results in CPUHP_AP_SMPBOOT_THREADS
state being skipped during rollback. Fix this by not calling
cpuhp_reset_state() and doing the state reset directly in
_cpu_down().
Fixes: 4dddfb5faa61 ("smp/hotplug: Rewrite AP state machine core")
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
---
kernel/cpu.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/kernel/cpu.c b/kernel/cpu.c
index aa7fe85..9f49edb 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -970,7 +970,14 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
*/
ret = cpuhp_down_callbacks(cpu, st, target);
if (ret && st->state > CPUHP_TEARDOWN_CPU && st->state < prev_state) {
- cpuhp_reset_state(st, prev_state);
+ /*
+ * As st->last is not set, cpuhp_reset_state() increments
+ * st->state, which results in CPUHP_AP_SMPBOOT_THREADS being
+ * skipped during rollback. So, don't use it here.
+ */
+ st->rollback = true;
+ st->target = prev_state;
+ st->bringup = !st->bringup;
__cpuhp_kick_ap(st);
}
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a
member of the Code Aurora Forum, hosted by The Linux Foundation
next reply other threads:[~2018-09-04 6:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-04 6:33 Neeraj Upadhyay [this message]
2018-09-04 12:12 ` [PATCH] cpu/hotplug: Fix rollback during error-out in takedown_cpu() Mukesh Ojha
2018-09-05 11:33 ` Thomas Gleixner
2018-09-05 12:09 ` Mukesh Ojha
2018-09-05 13:14 ` Thomas Gleixner
2018-09-05 12:23 ` Thomas Gleixner
2018-09-05 12:51 ` Neeraj Upadhyay
2018-09-05 13:17 ` Thomas Gleixner
2018-09-06 2:56 ` Neeraj Upadhyay
2018-09-06 8:18 ` Thomas Gleixner
2018-09-06 9:00 ` Neeraj Upadhyay
2018-09-05 14:53 ` Sudeep Holla
2018-09-05 15:19 ` Geert Uytterhoeven
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=1536042803-6152-1-git-send-email-neeraju@codeaurora.org \
--to=neeraju@codeaurora.org \
--cc=brendan.jackman@arm.com \
--cc=dzickus@redhat.com \
--cc=jiangshanlai@gmail.com \
--cc=josh@joshtriplett.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=malat@debian.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=sramana@codeaurora.org \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).