Received-SPF: pass (google.com: domain of linux-kernel+bounces-104043-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Wei Yang <richard.weiyang@gmail.com>
To: tglx@linutronix.de,
	mingo@redhat.com,
	bp@alien8.de
Cc: x86@kernel.org,
	linux-kernel@vger.kernel.org,
	Wei Yang <richard.weiyang@gmail.com>,
	Joerg Roedel <jroedel@suse.de>,
	Michael Roth <michael.roth@amd.com>,
	Brian Gerst <brgerst@gmail.com>,
	Ard Biesheuvel <ardb@kernel.org>
Subject: [PATCH] x86/head_64: move parameter close to call function
Date: Fri, 15 Mar 2024 04:14:20 +0000
Message-Id: <20240315041420.12802-1-richard.weiyang@gmail.com>
Precedence: bulk

startup_64_setup_env is first introduced by 'commit 866b556efa12
("x86/head/64: Install startup GDT")'. Then 'commit 469693d8f622
("x86/head/64: Re-enable stack protection")' insert some code which
leverage %rdi, which is removed by 'commit 8f6be6d870e8 ("x86/smpboot:
Remove initial_gs")'.

This left the parameter of startup_64_setup_env a little far away from
where it is used. Let's move them together for better understanding.

Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
CC: Joerg Roedel <jroedel@suse.de>
CC: Michael Roth <michael.roth@amd.com>
CC: Brian Gerst <brgerst@gmail.com>
CC: Ard Biesheuvel <ardb@kernel.org>
---
 arch/x86/kernel/head_64.S | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index 3dbd05f93859..5fb8bb7cdabe 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -69,8 +69,6 @@ SYM_CODE_START_NOALIGN(startup_64)
 	/* Set up the stack for verify_cpu() */
 	leaq	(__end_init_task - TOP_OF_KERNEL_STACK_PADDING - PTREGS_SIZE)(%rip), %rsp
 
-	leaq	_text(%rip), %rdi
-
 	/* Setup GSBASE to allow stack canary access for C code */
 	movl	$MSR_GS_BASE, %ecx
 	leaq	INIT_PER_CPU_VAR(fixed_percpu_data)(%rip), %rdx
@@ -78,6 +76,7 @@ SYM_CODE_START_NOALIGN(startup_64)
 	shrq	$32,  %rdx
 	wrmsr
 
+	leaq	_text(%rip), %rdi
 	call	startup_64_setup_env
 
 	/* Now switch to __KERNEL_CS so IRET works reliably */
-- 
2.34.1