All of lore.kernel.org
 help / color / mirror / Atom feed
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 v3 5/7] x86/retbleed: Introduce cdt_possible()
Date: Thu, 22 May 2025 18:21:33 -0700	[thread overview]
Message-ID: <20250522-eibrs-fix-v3-5-12704e291e1e@linux.intel.com> (raw)
In-Reply-To: <20250522-eibrs-fix-v3-0-12704e291e1e@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 aa51fa8d6e8c8f7b2f5020fdb2e44a274badc0e7..7cf2b6e42b70b665842de5a3a96e10a356d343c9 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -1123,6 +1123,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
 
@@ -1271,7 +1284,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



  parent reply	other threads:[~2025-05-23  1:21 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-23  1:20 [PATCH v3 0/7] eIBRS fixes Pawan Gupta
2025-05-23  1:20 ` [PATCH v3 1/7] x86/retbleed: Avoid AUTO after the select step Pawan Gupta
2025-05-24  9:29   ` Borislav Petkov
2025-05-23  1:20 ` [PATCH v3 2/7] x86/retbleed: Simplify the =stuff checks Pawan Gupta
2025-05-24 11:16   ` Borislav Petkov
2025-05-23  1:21 ` [PATCH v3 3/7] x86/bugs: Exit early if return thunk is already set Pawan Gupta
2025-05-23 10:28   ` Nikolay Borisov
2025-05-24 11:27   ` Borislav Petkov
2025-05-28 21:55     ` Pawan Gupta
2025-05-23  1:21 ` [PATCH v3 4/7] x86/its: Use switch/case to apply mitigation Pawan Gupta
2025-05-23  1:21 ` Pawan Gupta [this message]
2025-05-23  1:21 ` [PATCH v3 6/7] x86/its: Remove =stuff dependency on retbleed Pawan Gupta
2025-05-23  1:22 ` [PATCH v3 7/7] x86/its: Allow stuffing in eIBRS+retpoline mode also Pawan Gupta

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=20250522-eibrs-fix-v3-5-12704e291e1e@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.