* Reference to non-existing CONFIG_X86_FEATURE_CALL_DEPTH
@ 2022-10-31 9:14 Lukas Bulwahn
2022-10-31 10:10 ` Peter Zijlstra
0 siblings, 1 reply; 3+ messages in thread
From: Lukas Bulwahn @ 2022-10-31 9:14 UTC (permalink / raw)
To: Thomas Gleixner, Peter Zijlstra, Ingo Molnar, Borislav Petkov, X86 ML
Cc: Dave Hansen, H. Peter Anvin, kernel-janitors, Linux Kernel Mailing List
Dear Thomas, dear Peter,
in your work on call depth tracking mitigation, commit 5d8213864ade
("x86/retbleed: Add SKL return thunk") on linux-next references the
configuration symbol CONFIG_X86_FEATURE_CALL_DEPTH, which is not
introduced in any Kconfig file.
Is this just some left-over from some previous iteration of this
feature or is there still a patch to come that will introduce that
configuration symbol in some Kconfig file?
This issue was identified with ./scripts/checkkconfigsymbols.py.
Best regards,
Lukas
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Reference to non-existing CONFIG_X86_FEATURE_CALL_DEPTH
2022-10-31 9:14 Reference to non-existing CONFIG_X86_FEATURE_CALL_DEPTH Lukas Bulwahn
@ 2022-10-31 10:10 ` Peter Zijlstra
2022-11-02 9:20 ` [tip: x86/core] x86: Unconfuse CONFIG_ and X86_FEATURE_ namespaces tip-bot2 for Peter Zijlstra
0 siblings, 1 reply; 3+ messages in thread
From: Peter Zijlstra @ 2022-10-31 10:10 UTC (permalink / raw)
To: Lukas Bulwahn
Cc: Thomas Gleixner, Ingo Molnar, Borislav Petkov, X86 ML,
Dave Hansen, H. Peter Anvin, kernel-janitors,
Linux Kernel Mailing List
On Mon, Oct 31, 2022 at 10:14:03AM +0100, Lukas Bulwahn wrote:
> Dear Thomas, dear Peter,
>
> in your work on call depth tracking mitigation, commit 5d8213864ade
> ("x86/retbleed: Add SKL return thunk") on linux-next references the
> configuration symbol CONFIG_X86_FEATURE_CALL_DEPTH, which is not
> introduced in any Kconfig file.
>
> Is this just some left-over from some previous iteration of this
> feature or is there still a patch to come that will introduce that
> configuration symbol in some Kconfig file?
>
> This issue was identified with ./scripts/checkkconfigsymbols.py.
Thanks!
---
Subject: x86: Unconfuse CONFIG_ and X86_FEATURE_ namespaces
From: Peter Zijlstra <peterz@infradead.org>
Lukas reported someone fat fingered the CONFIG_ symbol; fix er up.
Fixes: 5d8213864ade ("x86/retbleed: Add SKL return thunk")
Reported-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
index 82580adbca4b..3ab90f23e7f7 100644
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -285,7 +285,7 @@
*/
.macro UNTRAIN_RET
#if defined(CONFIG_CPU_UNRET_ENTRY) || defined(CONFIG_CPU_IBPB_ENTRY) || \
- defined(CONFIG_X86_FEATURE_CALL_DEPTH)
+ defined(CONFIG_CALL_DEPTH_TRACKING)
ANNOTATE_UNRET_END
ALTERNATIVE_3 "", \
CALL_ZEN_UNTRAIN_RET, X86_FEATURE_UNRET, \
@@ -296,7 +296,7 @@
.macro UNTRAIN_RET_FROM_CALL
#if defined(CONFIG_CPU_UNRET_ENTRY) || defined(CONFIG_CPU_IBPB_ENTRY) || \
- defined(CONFIG_X86_FEATURE_CALL_DEPTH)
+ defined(CONFIG_CALL_DEPTH_TRACKING)
ANNOTATE_UNRET_END
ALTERNATIVE_3 "", \
CALL_ZEN_UNTRAIN_RET, X86_FEATURE_UNRET, \
^ permalink raw reply [flat|nested] 3+ messages in thread* [tip: x86/core] x86: Unconfuse CONFIG_ and X86_FEATURE_ namespaces
2022-10-31 10:10 ` Peter Zijlstra
@ 2022-11-02 9:20 ` tip-bot2 for Peter Zijlstra
0 siblings, 0 replies; 3+ messages in thread
From: tip-bot2 for Peter Zijlstra @ 2022-11-02 9:20 UTC (permalink / raw)
To: linux-tip-commits
Cc: Lukas Bulwahn, Peter Zijlstra (Intel), x86, linux-kernel
The following commit has been merged into the x86/core branch of tip:
Commit-ID: b1f37ef655cf372f96015bf54abdb76a91aff27e
Gitweb: https://git.kernel.org/tip/b1f37ef655cf372f96015bf54abdb76a91aff27e
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Mon, 31 Oct 2022 11:10:56 +01:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Tue, 01 Nov 2022 13:44:07 +01:00
x86: Unconfuse CONFIG_ and X86_FEATURE_ namespaces
Lukas reported someone fat fingered the CONFIG_ symbol; fix er up.
Fixes: 5d8213864ade ("x86/retbleed: Add SKL return thunk")
Reported-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/Y1+fL4qQEIGZEEKB@hirez.programming.kicks-ass.net
---
arch/x86/include/asm/nospec-branch.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
index 82580ad..3ab90f2 100644
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -285,7 +285,7 @@
*/
.macro UNTRAIN_RET
#if defined(CONFIG_CPU_UNRET_ENTRY) || defined(CONFIG_CPU_IBPB_ENTRY) || \
- defined(CONFIG_X86_FEATURE_CALL_DEPTH)
+ defined(CONFIG_CALL_DEPTH_TRACKING)
ANNOTATE_UNRET_END
ALTERNATIVE_3 "", \
CALL_ZEN_UNTRAIN_RET, X86_FEATURE_UNRET, \
@@ -296,7 +296,7 @@
.macro UNTRAIN_RET_FROM_CALL
#if defined(CONFIG_CPU_UNRET_ENTRY) || defined(CONFIG_CPU_IBPB_ENTRY) || \
- defined(CONFIG_X86_FEATURE_CALL_DEPTH)
+ defined(CONFIG_CALL_DEPTH_TRACKING)
ANNOTATE_UNRET_END
ALTERNATIVE_3 "", \
CALL_ZEN_UNTRAIN_RET, X86_FEATURE_UNRET, \
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-02 9:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-31 9:14 Reference to non-existing CONFIG_X86_FEATURE_CALL_DEPTH Lukas Bulwahn
2022-10-31 10:10 ` Peter Zijlstra
2022-11-02 9:20 ` [tip: x86/core] x86: Unconfuse CONFIG_ and X86_FEATURE_ namespaces tip-bot2 for Peter Zijlstra
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome