[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <169816566737.3135.2199759283838640174.tip-bot2@tip-bot2>
Date: Tue, 24 Oct 2023 16:41:07 -0000
From: "tip-bot2 for Uros Bizjak" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Uros Bizjak <ubizjak@...il.com>, Ingo Molnar <mingo@...nel.org>,
Andy Lutomirski <luto@...nel.org>,
Brian Gerst <brgerst@...il.com>,
Denys Vlasenko <dvlasenk@...hat.com>,
"H. Peter Anvin" <hpa@...or.com>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Josh Poimboeuf <jpoimboe@...hat.com>,
Sean Christopherson <seanjc@...gle.com>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: x86/percpu] x86/percpu: Return correct variable from
current_top_of_stack()
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@...il.com>
AuthorDate: Tue, 24 Oct 2023 16:28:14 +02:00
Committer: Ingo Molnar <mingo@...nel.org>
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@...il.com>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Link: https://lore.kernel.org/r/20231024142830.3226-1-ubizjak@gmail.com
Cc: Andy Lutomirski <luto@...nel.org>
Cc: Brian Gerst <brgerst@...il.com>
Cc: Denys Vlasenko <dvlasenk@...hat.com>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Josh Poimboeuf <jpoimboe@...hat.com>
Cc: Sean Christopherson <seanjc@...gle.com>
---
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);
}
Powered by blists - more mailing lists