From: Brian Gerst <brgerst@gmail.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org
Cc: David Woodhouse <dwmw2@infradead.org>,
Usama Arif <usama.arif@bytedance.com>,
Thomas Gleixner <tglx@linutronix.de>,
Borislav Petkov <bp@alien8.de>, "H . Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Andy Lutomirski <luto@kernel.org>, Ingo Molnar <mingo@kernel.org>,
Brian Gerst <brgerst@gmail.com>
Subject: [PATCH 2/6] x86/smpboot: Use current_task to get idle thread
Date: Wed, 22 Feb 2023 17:12:57 -0500 [thread overview]
Message-ID: <20230222221301.245890-3-brgerst@gmail.com> (raw)
In-Reply-To: <20230222221301.245890-1-brgerst@gmail.com>
The idle_threads array is not populated during early boot. Use
current_task instead, which is initialized to init_task for the boot
CPU.
Also simplify start_cpu0(). Since the boot CPU never really goes
offline, the GSBASE is still set up and can be used for per-cpu
accesses.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
arch/x86/kernel/asm-offsets.c | 1 +
arch/x86/kernel/head_64.S | 7 ++-----
kernel/smpboot.c | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
index 8650f29387e0..445bce086717 100644
--- a/arch/x86/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets.c
@@ -114,6 +114,7 @@ static void __used common(void)
OFFSET(TSS_sp1, tss_struct, x86_tss.sp1);
OFFSET(TSS_sp2, tss_struct, x86_tss.sp2);
OFFSET(X86_top_of_stack, pcpu_hot, top_of_stack);
+ OFFSET(X86_current_task, pcpu_hot, current_task);
#ifdef CONFIG_CALL_DEPTH_TRACKING
OFFSET(X86_call_depth, pcpu_hot, call_depth);
#endif
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index c1253aa737ca..c32e5b06a9ce 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -315,7 +315,7 @@ SYM_INNER_LABEL(secondary_startup_64_no_verify, SYM_L_GLOBAL)
movq %rcx, early_gdt_descr_base(%rip)
/* Find the idle task stack */
- movq idle_threads(%rbx), %rcx
+ movq pcpu_hot + X86_current_task(%rbx), %rcx
movq TASK_threadsp(%rcx), %rcx
movq %rcx, initial_stack(%rip)
#endif /* CONFIG_SMP */
@@ -460,12 +460,9 @@ SYM_CODE_END(secondary_startup_64)
SYM_CODE_START(start_cpu0)
ANNOTATE_NOENDBR
UNWIND_HINT_EMPTY
- /* Load the per-cpu base for CPU#0 */
- leaq __per_cpu_offset(%rip), %rbx
- movq (%rbx), %rbx
/* Find the idle task stack */
- movq idle_threads(%rbx), %rcx
+ movq PER_CPU_VAR(pcpu_hot) + X86_current_task, %rcx
movq TASK_threadsp(%rcx), %rsp
jmp .Ljump_to_C_code
diff --git a/kernel/smpboot.c b/kernel/smpboot.c
index a18a21dff9bc..2c7396da470c 100644
--- a/kernel/smpboot.c
+++ b/kernel/smpboot.c
@@ -25,7 +25,7 @@
* For the hotplug case we keep the task structs around and reuse
* them.
*/
-DEFINE_PER_CPU(struct task_struct *, idle_threads);
+static DEFINE_PER_CPU(struct task_struct *, idle_threads);
struct task_struct *idle_thread_get(unsigned int cpu)
{
--
2.39.2
next prev parent reply other threads:[~2023-02-22 22:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-22 22:12 [PATCH 0/6] x86-64: Remove global variables from boot Brian Gerst
2023-02-22 22:12 ` [PATCH 1/6] x86/smpboot: Use CPU number instead of APIC ID for single CPU startup Brian Gerst
2023-02-22 22:12 ` Brian Gerst [this message]
2023-02-22 22:12 ` [PATCH 3/6] x86/smpboot: Remove initial_stack on 64-bit Brian Gerst
2023-02-23 8:05 ` David Woodhouse
2023-02-23 8:27 ` David Woodhouse
2023-02-22 22:12 ` [PATCH 4/6] x86/smpbppt: Remove early_gdt_descr " Brian Gerst
2023-02-23 6:49 ` H. Peter Anvin
2023-02-23 12:10 ` Brian Gerst
2023-02-22 22:13 ` [PATCH 5/6] x86/smpboot: Remove initial_gs Brian Gerst
2023-02-22 22:13 ` [PATCH 6/6] x86/smpboot: Simplify boot CPU setup Brian Gerst
2023-02-23 12:36 ` David Woodhouse
2023-02-23 13:44 ` [PATCH 0/6] x86-64: Remove global variables from boot David Woodhouse
2023-02-23 14:24 ` Brian Gerst
2023-02-23 19:14 ` [External] " Usama Arif
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=20230222221301.245890-3-brgerst@gmail.com \
--to=brgerst@gmail.com \
--cc=bp@alien8.de \
--cc=dwmw2@infradead.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.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