mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Josh Poimboeuf <jpoimboe@kernel.org>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Borislav Petkov <bp@alien8.de>,
	Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH 6/8] x86/asm: Use unique code labels in __FILL_RETURN_BUFFER
Date: Sat,  6 Dec 2025 13:41:13 -0800	[thread overview]
Message-ID: <e0ae7370291faefffd406d63245274e7bc8566d2.1765044697.git.jpoimboe@kernel.org> (raw)
In-Reply-To: <cover.1765044697.git.jpoimboe@kernel.org>

In preparation for unifying the C and asm alternative implementations,
change the code labels in __FILL_RETURN_BUFFER to be unique.  The 771
and 772 labels are used by the C alternative implementation, which will
soon be extended for asm.

Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
 arch/x86/include/asm/nospec-branch.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
index a5d41d8cd70a..334c6058a1ec 100644
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -126,9 +126,9 @@
  */
 #define __FILL_RETURN_SLOT			\
 	ANNOTATE_INTRA_FUNCTION_CALL;		\
-	call	772f;				\
+	call	872f;				\
 	int3;					\
-772:
+872:
 
 /*
  * Stuff the entire RSB.
@@ -140,12 +140,12 @@
 #ifdef CONFIG_X86_64
 #define __FILL_RETURN_BUFFER(reg, nr)			\
 	mov	$(nr/2), reg;				\
-771:							\
+871:							\
 	__FILL_RETURN_SLOT				\
 	__FILL_RETURN_SLOT				\
 	add	$(BITS_PER_LONG/8) * 2, %_ASM_SP;	\
 	dec	reg;					\
-	jnz	771b;					\
+	jnz	871b;					\
 	/* barrier for jnz misprediction */		\
 	lfence;						\
 	CREDIT_CALL_DEPTH				\
-- 
2.52.0


  parent reply	other threads:[~2025-12-06 21:42 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-12-06 21:41 [PATCH 0/8] objtool, x86/alternative: Convert objtool annotations and x86 alternatives to assembler macros Josh Poimboeuf
2025-12-06 21:41 ` [PATCH 1/8] objtool: Rename ANNOTYPE_IGNORE_ALTS -> ANNOTYPE_IGNORE_ALTERNATIVE Josh Poimboeuf
2025-12-06 21:41 ` [PATCH 2/8] objtool: Make ANNOTYPE_DATA_SPECIAL unique across all annotations Josh Poimboeuf
2025-12-06 21:41 ` [PATCH 3/8] objtool: Rename C ANNOTATE_REACHABLE to ANNOTATE_REACHABLE_LABEL Josh Poimboeuf
2025-12-06 21:41 ` [PATCH 4/8] objtool: Rename asm ANNOTATE_NOCFI_SYM to ANNOTATE_NOCFI Josh Poimboeuf
2025-12-06 21:41 ` [PATCH 5/8] objtool: Convert annotations to assembler macros Josh Poimboeuf
2025-12-07 14:51   ` Josh Poimboeuf
2025-12-08  9:37   ` Peter Zijlstra
2025-12-06 21:41 ` Josh Poimboeuf [this message]
2025-12-06 21:41 ` [PATCH 7/8] x86/asm: Remove newlines in alternatives Josh Poimboeuf
2025-12-07 14:52   ` Josh Poimboeuf
2025-12-06 21:41 ` [PATCH 8/8] x86/alternative: Convert alternatives to assembler macros Josh Poimboeuf
2025-12-08  9:51   ` Peter Zijlstra
2025-12-08 22:46     ` Josh Poimboeuf
2025-12-09  9:24       ` Peter Zijlstra
2025-12-10  1:15         ` Josh Poimboeuf
2025-12-10  9:16           ` Peter Zijlstra
2025-12-11  5:20             ` Josh Poimboeuf
2025-12-11  1:06 ` [PATCH 0/8] objtool, x86/alternative: Convert objtool annotations and x86 " Borislav Petkov
2025-12-11  5:27   ` 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=e0ae7370291faefffd406d63245274e7bc8566d2.1765044697.git.jpoimboe@kernel.org \
    --to=jpoimboe@kernel.org \
    --cc=bp@alien8.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.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®