From: Usama Arif <usama.arif@bytedance.com>
To: Brian Gerst <brgerst@gmail.com>, dwmw2@infradead.org
Cc: tglx@linutronix.de, kim.phillips@amd.com, 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
Subject: Re: [External] Re: [PATCH v7 6/9] x86/smpboot: Support parallel startup of secondary CPUs
Date: Wed, 8 Feb 2023 12:54:00 +0000 [thread overview]
Message-ID: <86df2c79-3626-d476-54b4-82c225a6dbd9@bytedance.com> (raw)
In-Reply-To: <CAMzpN2iejCnBeBdC6+92fUL2k8ZdAq_jEgXX+RSoGMhRZ0UBSA@mail.gmail.com>
On 08/02/2023 05:09, Brian Gerst wrote:
> On Tue, Feb 7, 2023 at 6:10 PM Usama Arif <usama.arif@bytedance.com> wrote:
>>
>> From: Thomas Gleixner <tglx@linutronix.de>
>>
>> Rework the real-mode startup code to allow for APs to be brought up in
>> parallel. This is in two parts:
>>
>> 1. Introduce a bit-spinlock to prevent them from all using the real
>> mode stack at the same time.
>>
>> 2. Avoid the use of global variables for passing per-CPU information to
>> the APs.
>>
>> To achieve the latter, export the cpuid_to_apicid[] array so that each
>> AP can find its own per_cpu data (and thus initial_gs, initial_stack and
>> early_gdt_descr) by searching therein based on its APIC ID.
>>
>> Introduce a global variable 'smpboot_control' indicating to the AP how
>> it should find its APIC ID. For a serialized bringup, the APIC ID is
>> explicitly passed in the low bits of smpboot_control, while for parallel
>> mode there are flags directing the AP to find its APIC ID in CPUID leaf
>> 0x0b (for X2APIC mode) or CPUID leaf 0x01 where 8 bits are sufficient.
>
> For the serialized bringup case, it would be simpler to just put the
> cpu number in the lower bits instead of the APIC id, skipping the
> lookup.
>
> --
> Brian Gerst
I guess we could do something like below, it would save a few loops
through find_cpunr in serial case, but probably is as simple as just
using setup_AP and find_cpunr for all cases? Happy with either but if
there is a strong preference for below, can change in next revision?
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index 656e6018b9d4..30aa543a0114 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -265,7 +265,10 @@ SYM_INNER_LABEL(secondary_startup_64_no_verify,
SYM_L_GLOBAL)
testl $STARTUP_APICID_CPUID_01, %edx
jnz .Luse_cpuid_01
andl $0x0FFFFFFF, %edx
- jmp .Lsetup_AP
+ mov $8, %eax
+ mul %edx
+ movq %rax, %rcx
+ jmp .Linit_cpu_data
.Luse_cpuid_01:
mov $0x01, %eax
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 8ffec5de2e2e..73dd87bf2f29 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1141,7 +1141,7 @@ static int do_boot_cpu(int apicid, int cpu, struct
task_struct *idle,
early_gdt_descr.address = (unsigned
long)get_cpu_gdt_rw(cpu);
initial_stack = idle->thread.sp;
} else if (!do_parallel_bringup) {
- smpboot_control = STARTUP_SECONDARY | apicid;
+ smpboot_control = STARTUP_SECONDARY | cpu;
}
/* Enable the espfix hack for this CPU */
next prev parent reply other threads:[~2023-02-08 12:54 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-07 23:04 [PATCH v7 0/9] Parallel CPU bringup for x86_64 Usama Arif
2023-02-07 23:04 ` [PATCH v7 1/9] x86/apic/x2apic: Allow CPU cluster_mask to be populated in parallel Usama Arif
2023-02-07 23:04 ` [PATCH v7 2/9] cpu/hotplug: Move idle_thread_get() to <linux/smpboot.h> Usama Arif
2023-02-07 23:04 ` [PATCH v7 3/9] cpu/hotplug: Add dynamic parallel bringup states before CPUHP_BRINGUP_CPU Usama Arif
2023-02-07 23:04 ` [PATCH v7 4/9] x86/smpboot: Reference count on smpboot_setup_warm_reset_vector() Usama Arif
2023-02-07 23:04 ` [PATCH v7 5/9] x86/smpboot: Split up native_cpu_up into separate phases and document them Usama Arif
2023-02-08 10:03 ` Yuan Yao
2023-02-08 12:02 ` David Woodhouse
2023-02-09 3:06 ` Yuan Yao
2023-02-07 23:04 ` [PATCH v7 6/9] x86/smpboot: Support parallel startup of secondary CPUs Usama Arif
2023-02-08 5:09 ` Brian Gerst
2023-02-08 12:54 ` Usama Arif [this message]
2023-02-08 12:56 ` David Woodhouse
2023-02-08 13:13 ` Thomas Gleixner
2023-02-08 14:41 ` David Woodhouse
2023-02-07 23:04 ` [PATCH v7 7/9] x86/smpboot: Send INIT/SIPI/SIPI to secondary CPUs in parallel Usama Arif
2023-02-07 23:04 ` [PATCH v7 8/9] x86/mtrr: Avoid repeated save of MTRRs on boot-time CPU bringup Usama Arif
2023-02-07 23:04 ` [PATCH v7 9/9] x86/smpboot: Serialize topology updates for secondary bringup Usama Arif
2023-02-09 3:53 ` [PATCH v7 0/9] Parallel CPU bringup for x86_64 Paul E. McKenney
2023-02-09 9:49 ` [External] " Usama Arif
2023-02-09 10:06 ` David Woodhouse
2023-02-09 10:19 ` Usama Arif
2023-02-09 10:22 ` David Woodhouse
2023-02-09 11:03 ` David Woodhouse
2023-02-09 11:45 ` Usama Arif
2023-02-09 11:53 ` Thomas Gleixner
2023-02-09 12:10 ` David Woodhouse
2023-02-09 13:48 ` David Woodhouse
2023-02-09 14:01 ` Usama Arif
2023-02-09 15:48 ` Thomas Gleixner
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=86df2c79-3626-d476-54b4-82c225a6dbd9@bytedance.com \
--to=usama.arif@bytedance.com \
--cc=arjan@linux.intel.com \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=dave.hansen@linux.intel.com \
--cc=dwmw2@infradead.org \
--cc=fam.zheng@bytedance.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=paulmck@kernel.org \
--cc=pbonzini@redhat.com \
--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=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).