[tip: x86/percpu] x86/percpu: Return correct variable from current_top_of_stack()
From: tip-bot2 for Uros Bizjak
Date: Tue Oct 24 2023 - 12:41:14 EST
The following commit has been merged into the x86/percpu branch of tip:
Commit-ID: 0548eb067ed664b93043e033295ca71e3e706245
Gitweb: https://git.kernel.org/tip/0548eb067ed664b93043e033295ca71e3e706245
Author: Uros Bizjak <ubizjak@xxxxxxxxx>
AuthorDate: Tue, 24 Oct 2023 16:28:14 +02:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Tue, 24 Oct 2023 18:37:20 +02:00
x86/percpu: Return correct variable from current_top_of_stack()
current_top_of_stack() should return variable from _seg_gs
qualified named address space when CONFIG_USE_X86_SEG_SUPPORT=y
is enbled.
Fixes: ed2f752e0e0a ("x86/percpu: Introduce const-qualified const_pcpu_hot to micro-optimize code generation")
Signed-off-by: Uros Bizjak <ubizjak@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20231024142830.3226-1-ubizjak@xxxxxxxxx
Cc: Andy Lutomirski <luto@xxxxxxxxxx>
Cc: Brian Gerst <brgerst@xxxxxxxxx>
Cc: Denys Vlasenko <dvlasenk@xxxxxxxxxx>
Cc: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
Cc: Sean Christopherson <seanjc@xxxxxxxxxx>
---
arch/x86/include/asm/processor.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index b47a997..f20e876 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -519,7 +519,7 @@ static __always_inline unsigned long current_top_of_stack(void)
* entry trampoline.
*/
if (IS_ENABLED(CONFIG_USE_X86_SEG_SUPPORT))
- return pcpu_hot.top_of_stack;
+ return const_pcpu_hot.top_of_stack;
return this_cpu_read_stable(pcpu_hot.top_of_stack);
}