From: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
To: x86@kernel.org
Cc: David Kaplan <david.kaplan@amd.com>,
linux-kernel@vger.kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Josh Poimboeuf <jpoimboe@kernel.org>
Subject: [PATCH v4 5/7] x86/retbleed: Introduce cdt_possible()
Date: Wed, 11 Jun 2025 10:30:03 -0700 [thread overview]
Message-ID: <20250611-eibrs-fix-v4-5-5ff86cac6c61@linux.intel.com> (raw)
In-Reply-To: <20250611-eibrs-fix-v4-0-5ff86cac6c61@linux.intel.com>
In preparation to allow ITS to also enable stuffing a.k.a. Call Depth
Tracking(CDT) independently of retbleed, introduce a helper cdt_possible().
Signed-off-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
---
arch/x86/kernel/cpu/bugs.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index e861e8884d6b5e16f08d5bda0f47d5056d26c1f4..387610ad222d4dbd196bfb219145510a37979d73 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -1119,6 +1119,19 @@ early_param("nospectre_v1", nospectre_v1_cmdline);
enum spectre_v2_mitigation spectre_v2_enabled __ro_after_init = SPECTRE_V2_NONE;
+/* Depends on spectre_v2 mitigation selected already */
+static inline bool cdt_possible(enum spectre_v2_mitigation mode)
+{
+ if (!IS_ENABLED(CONFIG_MITIGATION_CALL_DEPTH_TRACKING) ||
+ !IS_ENABLED(CONFIG_MITIGATION_RETPOLINE))
+ return false;
+
+ if (mode == SPECTRE_V2_RETPOLINE)
+ return true;
+
+ return false;
+}
+
#undef pr_fmt
#define pr_fmt(fmt) "RETBleed: " fmt
@@ -1267,7 +1280,7 @@ static void __init retbleed_update_mitigation(void)
retbleed_mitigation = RETBLEED_MITIGATION_STUFF;
if (retbleed_mitigation == RETBLEED_MITIGATION_STUFF &&
- spectre_v2_enabled != SPECTRE_V2_RETPOLINE) {
+ !cdt_possible(spectre_v2_enabled)) {
pr_err("WARNING: retbleed=stuff depends on spectre_v2=retpoline\n");
retbleed_mitigation = RETBLEED_MITIGATION_NONE;
}
--
2.34.1
next prev parent reply other threads:[~2025-06-11 17:30 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-11 17:28 [PATCH v4 0/7] Retbleed fixes Pawan Gupta
2025-06-11 17:29 ` [PATCH v4 1/7] x86/retbleed: Avoid AUTO after the select step Pawan Gupta
2025-06-24 10:05 ` [tip: x86/bugs] x86/bugs: Avoid AUTO after the select step in the retbleed mitigation tip-bot2 for Pawan Gupta
2025-06-11 17:29 ` [PATCH v4 2/7] x86/retbleed: Simplify the =stuff checks Pawan Gupta
2025-06-24 10:05 ` [tip: x86/bugs] x86/bugs: Simplify the retbleed=stuff checks tip-bot2 for Pawan Gupta
2025-06-11 17:29 ` [PATCH v4 3/7] x86/bugs: Avoid warning when overriding return thunk Pawan Gupta
2025-06-24 10:05 ` [tip: x86/bugs] " tip-bot2 for Pawan Gupta
2025-06-11 17:29 ` [PATCH v4 4/7] x86/its: Use switch/case to apply mitigation Pawan Gupta
2025-06-24 10:05 ` [tip: x86/bugs] x86/bugs: Use switch/case in its_apply_mitigation() tip-bot2 for Pawan Gupta
2025-06-11 17:30 ` Pawan Gupta [this message]
2025-06-24 10:05 ` [tip: x86/bugs] x86/bugs: Introduce cdt_possible() tip-bot2 for Pawan Gupta
2025-06-11 17:30 ` [PATCH v4 6/7] x86/its: Remove =stuff dependency on retbleed Pawan Gupta
2025-06-24 10:05 ` [tip: x86/bugs] x86/bugs: Remove its=stuff " tip-bot2 for Pawan Gupta
2025-06-11 17:30 ` [PATCH v4 7/7] x86/its: Allow stuffing in eIBRS+retpoline mode also Pawan Gupta
2025-06-24 10:05 ` [tip: x86/bugs] x86/bugs: Allow ITS " tip-bot2 for Pawan Gupta
2025-06-24 12:23 ` tip-bot2 for Pawan Gupta
2025-06-22 16:01 ` [PATCH v4 0/7] Retbleed fixes Borislav Petkov
2025-06-23 18:35 ` Pawan Gupta
2025-06-24 14:53 ` Borislav Petkov
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=20250611-eibrs-fix-v4-5-5ff86cac6c61@linux.intel.com \
--to=pawan.kumar.gupta@linux.intel.com \
--cc=david.kaplan@amd.com \
--cc=hpa@zytor.com \
--cc=jpoimboe@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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
all inboxes | Powered by JetHome®