mirror of https://lore.kernel.org/lkml/
 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 v2 4/7] x86/its: Use switch/case to apply mitigation
Date: Wed, 21 May 2025 19:45:08 -0700	[thread overview]
Message-ID: <20250521-eibrs-fix-v2-4-70e2598e932c@linux.intel.com> (raw)
In-Reply-To: <20250521-eibrs-fix-v2-0-70e2598e932c@linux.intel.com>

Prepare to apply stuffing mitigation in its_apply_mitigation(). This is
currently only done via retbleed mitigation. Also using switch/case makes
it evident that mitigation mode like VMEXIT_ONLY doesn't need any special
handling.

Signed-off-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
---
 arch/x86/kernel/cpu/bugs.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index a088302b320cf68344e28be7710b5a3582bba9ea..fbfc08f5f9f652beb677a1b5310e4322600082ac 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -1471,15 +1471,21 @@ static void __init its_update_mitigation(void)
 
 static void __init its_apply_mitigation(void)
 {
+	switch (its_mitigation) {
+	case ITS_MITIGATION_OFF:
+	case ITS_MITIGATION_AUTO:
+	case ITS_MITIGATION_VMEXIT_ONLY:
 	/* its=stuff forces retbleed stuffing and is enabled there. */
-	if (its_mitigation != ITS_MITIGATION_ALIGNED_THUNKS)
-		return;
-
-	if (!boot_cpu_has(X86_FEATURE_RETPOLINE))
-		setup_force_cpu_cap(X86_FEATURE_INDIRECT_THUNK_ITS);
+	case ITS_MITIGATION_RETPOLINE_STUFF:
+		break;
+	case ITS_MITIGATION_ALIGNED_THUNKS:
+		if (!boot_cpu_has(X86_FEATURE_RETPOLINE))
+			setup_force_cpu_cap(X86_FEATURE_INDIRECT_THUNK_ITS);
 
-	setup_force_cpu_cap(X86_FEATURE_RETHUNK);
-	set_return_thunk(its_return_thunk);
+		setup_force_cpu_cap(X86_FEATURE_RETHUNK);
+		set_return_thunk(its_return_thunk);
+		break;
+	}
 }
 
 #undef pr_fmt

-- 
2.34.1



  parent reply	other threads:[~2025-05-22  2:45 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-22  2:44 [PATCH v2 0/7] eIBRS fixes Pawan Gupta
2025-05-22  2:44 ` [PATCH v2 1/7] x86/retbleed: Check for AUTO in all cases Pawan Gupta
2025-05-22  9:52   ` Nikolay Borisov
2025-05-22 11:27   ` Borislav Petkov
2025-05-22 17:42     ` Pawan Gupta
2025-05-22  2:44 ` [PATCH v2 2/7] x86/retbleed: Simplify the =stuff checks Pawan Gupta
2025-05-22 10:18   ` Nikolay Borisov
2025-05-22 11:42   ` Borislav Petkov
2025-05-22 18:02     ` Pawan Gupta
2025-05-22  2:44 ` [PATCH v2 3/7] x86/bugs: Exit early if return thunk is already set Pawan Gupta
2025-05-22 10:22   ` Nikolay Borisov
2025-05-22 10:26     ` Nikolay Borisov
2025-05-22 18:03       ` Pawan Gupta
2025-05-22  2:45 ` Pawan Gupta [this message]
2025-05-22 11:15   ` [PATCH v2 4/7] x86/its: Use switch/case to apply mitigation Nikolay Borisov
2025-05-22 18:04     ` Pawan Gupta
2025-05-22  2:45 ` [PATCH v2 5/7] x86/retbleed: Introduce cdt_possible() Pawan Gupta
2025-05-22  2:45 ` [PATCH v2 6/7] x86/its: Remove =stuff dependency on retbleed Pawan Gupta
2025-05-22  2:45 ` [PATCH v2 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=20250521-eibrs-fix-v2-4-70e2598e932c@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®