From: "tip-bot2 for Brian Gerst" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Brian Gerst <brgerst@gmail.com>,
David Woodhouse <dwmw@amazon.co.uk>,
Usama Arif <usama.arif@bytedance.com>,
Thomas Gleixner <tglx@linutronix.de>,
"Guilherme G. Piccoli" <gpiccoli@igalia.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/apic] x86/smpboot: Remove early_gdt_descr on 64-bit
Date: Tue, 21 Mar 2023 14:14:15 -0000 [thread overview]
Message-ID: <167940805578.5837.1678729048718748115.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20230316222109.1940300-8-usama.arif@bytedance.com>
The following commit has been merged into the x86/apic branch of tip:
Commit-ID: c253b64020c7a7c7a1f6adf8922456614be0f665
Gitweb: https://git.kernel.org/tip/c253b64020c7a7c7a1f6adf8922456614be0f665
Author: Brian Gerst <brgerst@gmail.com>
AuthorDate: Thu, 16 Mar 2023 22:21:04
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 21 Mar 2023 13:35:53 +01:00
x86/smpboot: Remove early_gdt_descr on 64-bit
Build the GDT descriptor on the stack instead.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Usama Arif <usama.arif@bytedance.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Usama Arif <usama.arif@bytedance.com>
Tested-by: Guilherme G. Piccoli <gpiccoli@igalia.com>
Reviewed-by: David Woodhouse <dwmw@amazon.co.uk>
Link: https://lore.kernel.org/r/20230316222109.1940300-8-usama.arif@bytedance.com
---
arch/x86/kernel/acpi/sleep.c | 2 --
arch/x86/kernel/head_64.S | 11 ++++++-----
arch/x86/kernel/smpboot.c | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index 1b4c43d..de89bb4 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -127,8 +127,6 @@ int x86_acpi_suspend_lowlevel(void)
* value is in the actual %rsp register.
*/
current->thread.sp = (unsigned long)temp_stack + sizeof(temp_stack);
- early_gdt_descr.address =
- (unsigned long)get_cpu_gdt_rw(smp_processor_id());
initial_gs = per_cpu_offset(smp_processor_id());
smpboot_control = smp_processor_id();
#endif
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index cc1b145..a5b46c2 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -265,7 +265,12 @@ SYM_INNER_LABEL(secondary_startup_64_no_verify, SYM_L_GLOBAL)
* addresses where we're currently running on. We have to do that here
* because in 32bit we couldn't load a 64bit linear address.
*/
- lgdt early_gdt_descr(%rip)
+ subq $16, %rsp
+ movw $(GDT_SIZE-1), (%rsp)
+ leaq gdt_page(%rdx), %rax
+ movq %rax, 2(%rsp)
+ lgdt (%rsp)
+ addq $16, %rsp
/* set up data segments */
xorl %eax,%eax
@@ -667,10 +672,6 @@ SYM_DATA_END(level1_fixmap_pgt)
.data
.align 16
-SYM_DATA(early_gdt_descr, .word GDT_ENTRIES*8-1)
-SYM_DATA_LOCAL(early_gdt_descr_base, .quad INIT_PER_CPU_VAR(gdt_page))
-
- .align 16
SYM_DATA(smpboot_control, .long 0)
.align 16
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index a1531cc..94e6c54 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1086,10 +1086,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle,
start_ip = real_mode_header->trampoline_start64;
#endif
idle->thread.sp = (unsigned long)task_pt_regs(idle);
- early_gdt_descr.address = (unsigned long)get_cpu_gdt_rw(cpu);
initial_code = (unsigned long)start_secondary;
if (IS_ENABLED(CONFIG_X86_32)) {
+ early_gdt_descr.address = (unsigned long)get_cpu_gdt_rw(cpu);
initial_stack = idle->thread.sp;
} else {
smpboot_control = cpu;
next prev parent reply other threads:[~2023-03-21 14:14 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-16 22:20 [PATCH v15 00/12] Parallel CPU bringup for x86_64 Usama Arif
2023-03-16 22:20 ` [PATCH v15 01/12] x86/apic/x2apic: Allow CPU cluster_mask to be populated in parallel Usama Arif
2023-03-21 14:14 ` [tip: x86/apic] " tip-bot2 for David Woodhouse
2023-03-16 22:20 ` [PATCH v15 02/12] cpu/hotplug: Move idle_thread_get() to <linux/smpboot.h> Usama Arif
2023-03-19 16:34 ` Borislav Petkov
2023-03-20 8:17 ` David Woodhouse
2023-03-21 19:20 ` David Woodhouse
2023-03-16 22:21 ` [PATCH v15 03/12] cpu/hotplug: Add dynamic parallel bringup states before CPUHP_BRINGUP_CPU Usama Arif
2023-03-20 14:30 ` Thomas Gleixner
2023-03-21 19:14 ` David Woodhouse
2023-03-16 22:21 ` [PATCH v15 04/12] x86/smpboot: Reference count on smpboot_setup_warm_reset_vector() Usama Arif
2023-03-21 11:41 ` Borislav Petkov
2023-03-21 11:43 ` David Woodhouse
2023-03-21 14:14 ` [tip: x86/apic] " tip-bot2 for David Woodhouse
2023-03-16 22:21 ` [PATCH v15 05/12] x86/smpboot: Split up native_cpu_up into separate phases and document them Usama Arif
2023-03-16 22:21 ` [PATCH v15 06/12] x86/smpboot: Remove initial_stack on 64-bit Usama Arif
2023-03-21 14:14 ` [tip: x86/apic] " tip-bot2 for Brian Gerst
2023-03-16 22:21 ` [PATCH v15 07/12] x86/smpboot: Remove early_gdt_descr " Usama Arif
2023-03-21 14:14 ` tip-bot2 for Brian Gerst [this message]
2023-03-16 22:21 ` [PATCH v15 08/12] x86/smpboot: Remove initial_gs Usama Arif
2023-03-21 14:14 ` [tip: x86/apic] " tip-bot2 for Brian Gerst
2023-03-16 22:21 ` [PATCH v15 09/12] x86/smpboot: Support parallel startup of secondary CPUs Usama Arif
2023-03-21 18:28 ` Brian Gerst
2023-03-21 19:12 ` David Woodhouse
2023-03-21 21:02 ` Brian Gerst
2023-03-16 22:21 ` [PATCH v15 10/12] x86/smpboot: Send INIT/SIPI/SIPI to secondary CPUs in parallel Usama Arif
2023-03-16 22:21 ` [PATCH v15 11/12] x86/smpboot: Serialize topology updates for secondary bringup Usama Arif
2023-03-16 22:21 ` [PATCH v15 12/12] x86/smpboot: Allow parallel bringup for SEV-ES Usama Arif
2023-03-17 16:04 ` Tom Lendacky
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=167940805578.5837.1678729048718748115.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=brgerst@gmail.com \
--cc=dwmw@amazon.co.uk \
--cc=gpiccoli@igalia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tglx@linutronix.de \
--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).