From: David Woodhouse <dwmw2@infradead.org>
To: Thomas Gleixner <tglx@linutronix.de>,
Usama Arif <usama.arif@bytedance.com>,
kim.phillips@amd.com, brgerst@gmail.com
Cc: piotrgorski@cachyos.org, oleksandr@natalenko.name,
arjan@linux.intel.com, mingo@redhat.com, bp@alien8.de,
dave.hansen@linux.intel.com, hpa@zytor.com, x86@kernel.org,
pbonzini@redhat.com, paulmck@kernel.org,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
rcu@vger.kernel.org, mimoja@mimoja.de, hewenliang4@huawei.com,
thomas.lendacky@amd.com, seanjc@google.com,
pmenzel@molgen.mpg.de, fam.zheng@bytedance.com,
punit.agrawal@bytedance.com, simon.evans@bytedance.com,
liangma@liangbit.com,
"Guilherme G . Piccoli" <gpiccoli@igalia.com>
Subject: Re: [PATCH v14 05/12] x86/smpboot: Split up native_cpu_up into separate phases and document them
Date: Sat, 11 Mar 2023 10:21:12 +0000 [thread overview]
Message-ID: <07fd3a6cea0abfa794483fa40feb0bfec0410efe.camel@infradead.org> (raw)
In-Reply-To: <87ttyrabn5.ffs@tglx>
[-- Attachment #1: Type: text/plain, Size: 2066 bytes --]
On Sat, 2023-03-11 at 11:19 +0200, Thomas Gleixner wrote:
> On Wed, Mar 08 2023 at 17:13, Usama Arif wrote:
> >
> > +int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
> > +{
> > + int ret;
> > +
> > + ret = do_cpu_up(cpu, tidle);
> > + if (ret)
> > + return ret;
>
> In case of error this leaves the warm reset vector dangling.
>
> > + ret = do_wait_cpu_initialized(cpu);
> > + if (ret)
> > + return ret;
> > +
> > + ret = do_wait_cpu_callin(cpu);
> > + if (ret)
> > + return ret;
>
> Same for these two error returns.
>
> Thanks,
>
> tglx
On top of the idle_thread_get() one. Pushed to
https://git.infradead.org/users/dwmw2/linux.git/shortlog/refs/heads/parallel-6.2-v15
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 980cc2c4a84f..895395787afc 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1347,25 +1347,23 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
if (!do_parallel_bringup) {
ret = do_cpu_up(cpu, tidle);
if (ret)
- return ret;
+ goto out;
}
ret = do_wait_cpu_initialized(cpu);
if (ret)
- return ret;
+ goto out;
ret = do_wait_cpu_callin(cpu);
if (ret)
- return ret;
+ goto out;
ret = do_wait_cpu_online(cpu);
- if (x86_platform.legacy.warm_reset) {
- /*
- * Cleanup possible dangling ends...
- */
+ out:
+ /* Cleanup possible dangling ends... */
+ if (x86_platform.legacy.warm_reset)
smpboot_restore_warm_reset_vector();
- }
return ret;
}
@@ -1373,7 +1371,7 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
/* Bringup step one: Send INIT/SIPI to the target AP */
static int native_cpu_kick(unsigned int cpu)
{
- return do_cpu_up(cpu, idle_thread_get(cpu));
+ return do_cpu_up(cpu, idle_thread_get(cpu, true));
}
/**
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 5965 bytes --]
next prev parent reply other threads:[~2023-03-11 10:21 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-08 17:13 [PATCH v14 00/12] Parallel CPU bringup for x86_64 Usama Arif
2023-03-08 17:13 ` [PATCH v14 01/12] x86/apic/x2apic: Allow CPU cluster_mask to be populated in parallel Usama Arif
2023-03-08 17:13 ` [PATCH v14 02/12] cpu/hotplug: Move idle_thread_get() to <linux/smpboot.h> Usama Arif
2023-03-08 17:13 ` [PATCH v14 03/12] cpu/hotplug: Add dynamic parallel bringup states before CPUHP_BRINGUP_CPU Usama Arif
2023-03-08 17:13 ` [PATCH v14 04/12] x86/smpboot: Reference count on smpboot_setup_warm_reset_vector() Usama Arif
2023-03-08 17:13 ` [PATCH v14 05/12] x86/smpboot: Split up native_cpu_up into separate phases and document them Usama Arif
2023-03-11 9:19 ` Thomas Gleixner
2023-03-11 10:21 ` David Woodhouse [this message]
2023-03-08 17:13 ` [PATCH v14 06/12] x86/smpboot: Remove initial_stack on 64-bit Usama Arif
2023-03-08 17:13 ` [PATCH v14 07/12] x86/smpboot: Remove early_gdt_descr " Usama Arif
2023-03-08 17:13 ` [PATCH v14 08/12] x86/smpboot: Remove initial_gs Usama Arif
2023-03-08 17:13 ` [PATCH v14 09/12] x86/smpboot: Support parallel startup of secondary CPUs Usama Arif
2023-03-13 22:21 ` Brian Gerst
2023-03-08 17:13 ` [PATCH v14 10/12] x86/smpboot: Send INIT/SIPI/SIPI to secondary CPUs in parallel Usama Arif
2023-03-11 8:54 ` Thomas Gleixner
2023-03-11 9:55 ` David Woodhouse
2023-03-11 14:14 ` Thomas Gleixner
2023-03-11 14:25 ` David Woodhouse
2023-03-11 10:17 ` David Woodhouse
2023-03-08 17:13 ` [PATCH v14 11/12] x86/smpboot: Serialize topology updates for secondary bringup Usama Arif
2023-03-08 17:13 ` [PATCH v14 12/12] x86/smpboot: Allow parallel bringup for SEV-ES Usama Arif
2023-03-10 19:20 ` [PATCH v14 00/12] Parallel CPU bringup for x86_64 Tor Vic
2023-03-10 20:18 ` Paul Menzel
2023-03-11 19:23 ` Tor Vic
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=07fd3a6cea0abfa794483fa40feb0bfec0410efe.camel@infradead.org \
--to=dwmw2@infradead.org \
--cc=arjan@linux.intel.com \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=dave.hansen@linux.intel.com \
--cc=fam.zheng@bytedance.com \
--cc=gpiccoli@igalia.com \
--cc=hewenliang4@huawei.com \
--cc=hpa@zytor.com \
--cc=kim.phillips@amd.com \
--cc=kvm@vger.kernel.org \
--cc=liangma@liangbit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mimoja@mimoja.de \
--cc=mingo@redhat.com \
--cc=oleksandr@natalenko.name \
--cc=paulmck@kernel.org \
--cc=pbonzini@redhat.com \
--cc=piotrgorski@cachyos.org \
--cc=pmenzel@molgen.mpg.de \
--cc=punit.agrawal@bytedance.com \
--cc=rcu@vger.kernel.org \
--cc=seanjc@google.com \
--cc=simon.evans@bytedance.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=usama.arif@bytedance.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;
as well as URLs for NNTP newsgroup(s).