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 3/7] x86/bugs: Exit early if return thunk is already set
Date: Wed, 21 May 2025 19:44:53 -0700 [thread overview]
Message-ID: <20250521-eibrs-fix-v2-3-70e2598e932c@linux.intel.com> (raw)
In-Reply-To: <20250521-eibrs-fix-v2-0-70e2598e932c@linux.intel.com>
ITS and retbleed can both set CDT return thunk. If the exact same return
thunk is already set, avoid the warning and exit early.
Signed-off-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
---
arch/x86/kernel/cpu/bugs.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 20d7d14b08298d4f610f2ebc7f13a490ee3d957a..a088302b320cf68344e28be7710b5a3582bba9ea 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -113,6 +113,9 @@ void (*x86_return_thunk)(void) __ro_after_init = __x86_return_thunk;
static void __init set_return_thunk(void *thunk)
{
+ if (thunk == x86_return_thunk)
+ return;
+
if (x86_return_thunk != __x86_return_thunk)
pr_warn("x86/bugs: return thunk changed\n");
--
2.34.1
next prev parent reply other threads:[~2025-05-22 2:44 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 ` Pawan Gupta [this message]
2025-05-22 10:22 ` [PATCH v2 3/7] x86/bugs: Exit early if return thunk is already set Nikolay Borisov
2025-05-22 10:26 ` Nikolay Borisov
2025-05-22 18:03 ` Pawan Gupta
2025-05-22 2:45 ` [PATCH v2 4/7] x86/its: Use switch/case to apply mitigation Pawan Gupta
2025-05-22 11:15 ` 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-3-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®