mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Josh Poimboeuf" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Josh Poimboeuf <jpoimboe@kernel.org>,
	Ingo Molnar <mingo@kernel.org>,
	"Borislav Petkov (AMD)" <bp@alien8.de>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/bugs] x86/calldepth: Rename __x86_return_skl() to call_depth_return_thunk()
Date: Fri, 20 Oct 2023 11:37:16 -0000	[thread overview]
Message-ID: <169780183655.3135.5210163814604862919.tip-bot2@tip-bot2> (raw)
In-Reply-To: <ae44e9f9976934e3b5b47a458d523ccb15867561.1693889988.git.jpoimboe@kernel.org>

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

Commit-ID:     99ee56c7657f939eecc4e8ac96e0aa0cd6ea7cbd
Gitweb:        https://git.kernel.org/tip/99ee56c7657f939eecc4e8ac96e0aa0cd6ea7cbd
Author:        Josh Poimboeuf <jpoimboe@kernel.org>
AuthorDate:    Mon, 04 Sep 2023 22:05:04 -07:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Fri, 20 Oct 2023 12:45:48 +02:00

x86/calldepth: Rename __x86_return_skl() to call_depth_return_thunk()

For consistency with the other return thunks, rename __x86_return_skl()
to call_depth_return_thunk().

Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Acked-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/ae44e9f9976934e3b5b47a458d523ccb15867561.1693889988.git.jpoimboe@kernel.org
---
 arch/x86/include/asm/nospec-branch.h | 13 ++++---------
 arch/x86/kernel/cpu/bugs.c           |  3 ++-
 arch/x86/lib/retpoline.S             |  4 ++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
index dcc7847..14cd3cd 100644
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -358,12 +358,7 @@ extern void entry_ibpb(void);
 extern void (*x86_return_thunk)(void);
 
 #ifdef CONFIG_CALL_DEPTH_TRACKING
-extern void __x86_return_skl(void);
-
-static inline void x86_set_skl_return_thunk(void)
-{
-	x86_return_thunk = &__x86_return_skl;
-}
+extern void call_depth_return_thunk(void);
 
 #define CALL_DEPTH_ACCOUNT					\
 	ALTERNATIVE("",						\
@@ -376,12 +371,12 @@ DECLARE_PER_CPU(u64, __x86_ret_count);
 DECLARE_PER_CPU(u64, __x86_stuffs_count);
 DECLARE_PER_CPU(u64, __x86_ctxsw_count);
 #endif
-#else
-static inline void x86_set_skl_return_thunk(void) {}
+#else /* !CONFIG_CALL_DEPTH_TRACKING */
 
+static inline void call_depth_return_thunk(void) {}
 #define CALL_DEPTH_ACCOUNT ""
 
-#endif
+#endif /* CONFIG_CALL_DEPTH_TRACKING */
 
 #ifdef CONFIG_RETPOLINE
 
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 9731e81..016a326 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -1059,7 +1059,8 @@ do_cmd_auto:
 	case RETBLEED_MITIGATION_STUFF:
 		setup_force_cpu_cap(X86_FEATURE_RETHUNK);
 		setup_force_cpu_cap(X86_FEATURE_CALL_DEPTH);
-		x86_set_skl_return_thunk();
+
+		x86_return_thunk = call_depth_return_thunk;
 		break;
 
 	default:
diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S
index 415521d..d410aba 100644
--- a/arch/x86/lib/retpoline.S
+++ b/arch/x86/lib/retpoline.S
@@ -323,7 +323,7 @@ __EXPORT_THUNK(entry_untrain_ret)
 #ifdef CONFIG_CALL_DEPTH_TRACKING
 
 	.align 64
-SYM_FUNC_START(__x86_return_skl)
+SYM_FUNC_START(call_depth_return_thunk)
 	ANNOTATE_NOENDBR
 	/*
 	 * Keep the hotpath in a 16byte I-fetch for the non-debug
@@ -350,7 +350,7 @@ SYM_FUNC_START(__x86_return_skl)
 	ANNOTATE_UNRET_SAFE
 	ret
 	int3
-SYM_FUNC_END(__x86_return_skl)
+SYM_FUNC_END(call_depth_return_thunk)
 
 #endif /* CONFIG_CALL_DEPTH_TRACKING */
 

  parent reply	other threads:[~2023-10-20 11:37 UTC|newest]

Thread overview: 93+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-05  5:04 [PATCH v3 00/20] SRSO fixes/cleanups Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 01/20] x86/srso: Fix srso_show_state() side effect Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:45   ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 02/20] x86/srso: Set CPUID feature bits independently of bug or mitigation status Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:45   ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 03/20] x86/srso: Don't probe microcode in a guest Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:45   ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 04/20] x86/srso: Fix SBPB enablement for spec_rstack_overflow=off Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:45   ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 05/20] x86/srso: Fix SBPB enablement for (possible) future fixed HW Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 06/20] x86/srso: Print actual mitigation if requested mitigation isn't possible Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 07/20] x86/srso: Print mitigation for retbleed IBPB case Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 08/20] x86/srso: Fix vulnerability reporting for missing microcode Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 09/20] x86/srso: Fix unret validation dependencies Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 10/20] x86/alternatives: Remove faulty optimization Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 11/20] x86/srso: Improve i-cache locality for alias mitigation Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 12/20] x86/srso: Unexport untraining functions Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 13/20] x86/srso: Remove 'pred_cmd' label Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 14/20] x86/bugs: Remove default case for fully switched enums Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 15/20] x86/srso: Move retbleed IBPB check into existing 'has_microcode' code block Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:05 ` [PATCH v3 16/20] x86/srso: Disentangle rethunk-dependent options Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:05 ` [PATCH v3 17/20] x86/rethunk: Use SYM_CODE_START[_LOCAL]_NOALIGN macros Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:05 ` [PATCH v3 18/20] x86/retpoline: Remove .text..__x86.return_thunk section Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:05 ` [PATCH v3 19/20] x86/nospec: Refactor UNTRAIN_RET[_*] Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:05 ` [PATCH v3 20/20] x86/calldepth: Rename __x86_return_skl() to call_depth_return_thunk() Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf [this message]
2023-09-05  6:35 ` [PATCH v3 00/20] SRSO fixes/cleanups Borislav Petkov
2023-09-05 10:02   ` Ingo Molnar
  -- strict thread matches above, loose matches on Subject: below --
2023-08-25  7:01 [PATCH 23/23] x86/calldepth: Rename __x86_return_skl() to call_depth_return_thunk() Josh Poimboeuf
2023-08-25 10:19 ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf

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=169780183655.3135.5210163814604862919.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=bp@alien8.de \
    --cc=jpoimboe@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@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®