mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Pawan Gupta" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>,
	"Borislav Petkov (AMD)" <bp@alien8.de>,
	Nikolay Borisov <nik.borisov@suse.com>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/bugs] x86/bugs: Use switch/case in its_apply_mitigation()
Date: Tue, 24 Jun 2025 10:05:47 -0000	[thread overview]
Message-ID: <175075954773.406.6201068420364124322.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250611-eibrs-fix-v4-4-5ff86cac6c61@linux.intel.com>

The following commit has been merged into the x86/bugs branch of tip:

Commit-ID:     7e44909e0ea8346ba08b244ecc275fc3394e2b8e
Gitweb:        https://git.kernel.org/tip/7e44909e0ea8346ba08b244ecc275fc3394e2b8e
Author:        Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
AuthorDate:    Wed, 11 Jun 2025 10:29:47 -07:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Mon, 23 Jun 2025 12:22:44 +02:00

x86/bugs: Use switch/case in its_apply_mitigation()

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>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Nikolay Borisov <nik.borisov@suse.com>
Link: https://lore.kernel.org/20250611-eibrs-fix-v4-4-5ff86cac6c61@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 20696ab..e861e88 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -1468,15 +1468,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

  reply	other threads:[~2025-06-24 10:15 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-bot2 for Pawan Gupta [this message]
2025-06-11 17:30 ` [PATCH v4 5/7] x86/retbleed: Introduce cdt_possible() Pawan Gupta
2025-06-24 10:05   ` [tip: x86/bugs] x86/bugs: " 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=175075954773.406.6201068420364124322.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=bp@alien8.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=nik.borisov@suse.com \
    --cc=pawan.kumar.gupta@linux.intel.com \
    --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®