public inbox for linuxppc-dev@ozlabs.org 
 help / color / mirror / Atom feed
From: "Mukesh Kumar Chaurasiya (IBM)" <mkchauras@gmail•com>
To: maddy@linux•ibm.com, mpe@ellerman•id.au, npiggin@gmail•com,
	chleroy@kernel•org, peterz@infradead•org, jpoimboe@kernel•org,
	jbaron@akamai•com, aliceryhl@google•com, rostedt@goodmis•org,
	ardb@kernel•org, ojeda@kernel•org, boqun@kernel•org,
	gary@garyguo•net, bjorn3_gh@protonmail•com, lossin@kernel•org,
	a.hindborg@kernel•org, tmgross@umich•edu, dakr@kernel•org,
	nathan@kernel•org, nick.desaulniers+lkml@gmail•com,
	morbo@google•com, justinstitt@google•com,
	daniel.almeida@collabora•com, acourbot@nvidia•com,
	fujita.tomonori@gmail•com, gregkh@linuxfoundation•org,
	prafulrai522@gmail•com, tamird@kernel•org, kees@kernel•org,
	mkchauras@gmail•com, lyude@redhat•com, airlied@gmail•com,
	linuxppc-dev@lists•ozlabs.org, linux-kernel@vger•kernel.org,
	rust-for-linux@vger•kernel.org, llvm@lists•linux.dev
Subject: [PATCH V16 3/7] powerpc/jump_label: adjust inline asm to be consistent
Date: Wed, 20 May 2026 12:16:25 +0530	[thread overview]
Message-ID: <20260520064630.1785283-4-mkchauras@gmail.com> (raw)
In-Reply-To: <20260520064630.1785283-1-mkchauras@gmail.com>

Added support for a new macro ARCH_STATIC_BRANCH_ASM in powerpc
to avoid duplication of inline asm between C and Rust. This is
inline with 'commit aecaf181651c ("jump_label: adjust inline asm to be consistent")'

Co-developed-by: Madhavan Srinivasan <maddy@linux•ibm.com>
Signed-off-by: Madhavan Srinivasan <maddy@linux•ibm.com>
Reviewed-by: Alice Ryhl <aliceryhl@google•com>
Reviewed-by: Christophe Leroy (CS GROUP) <chleroy@kernel•org>
Reviewed-by: Gary Guo <gary@garyguo•net>
Link: https://github.com/Rust-for-Linux/linux/issues/105
Link: https://github.com/linuxppc/issues/issues/451
Signed-off-by: Mukesh Kumar Chaurasiya (IBM) <mkchauras@gmail•com>
---
 arch/powerpc/include/asm/jump_label.h | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/arch/powerpc/include/asm/jump_label.h b/arch/powerpc/include/asm/jump_label.h
index d4eaba459a0e..3016e9c8d6bc 100644
--- a/arch/powerpc/include/asm/jump_label.h
+++ b/arch/powerpc/include/asm/jump_label.h
@@ -15,14 +15,20 @@
 #define JUMP_ENTRY_TYPE		stringify_in_c(FTR_ENTRY_LONG)
 #define JUMP_LABEL_NOP_SIZE	4
 
+#define JUMP_TABLE_ENTRY(key, label)			\
+	".pushsection __jump_table,  \"aw\"	\n\t"	\
+	".long 1b - ., " label " - .		\n\t"	\
+	JUMP_ENTRY_TYPE key " - .		\n\t"	\
+	".popsection 				\n\t"
+
+#define ARCH_STATIC_BRANCH_ASM(key, label)		\
+	"1:	nop				\n\t"	\
+	JUMP_TABLE_ENTRY(key, label)
+
 static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
 {
-	asm goto("1:\n\t"
-		 "nop # arch_static_branch\n\t"
-		 ".pushsection __jump_table,  \"aw\"\n\t"
-		 ".long 1b - ., %l[l_yes] - .\n\t"
-		 JUMP_ENTRY_TYPE "%c0 - .\n\t"
-		 ".popsection \n\t"
+	asm goto(
+		 ARCH_STATIC_BRANCH_ASM("%c0", "%l[l_yes]")
 		 : :  "i" (&((char *)key)[branch]) : : l_yes);
 
 	return false;
@@ -34,10 +40,7 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool
 {
 	asm goto("1:\n\t"
 		 "b %l[l_yes] # arch_static_branch_jump\n\t"
-		 ".pushsection __jump_table,  \"aw\"\n\t"
-		 ".long 1b - ., %l[l_yes] - .\n\t"
-		 JUMP_ENTRY_TYPE "%c0 - .\n\t"
-		 ".popsection \n\t"
+		 JUMP_TABLE_ENTRY("%c0", "%l[l_yes]")
 		 : :  "i" (&((char *)key)[branch]) : : l_yes);
 
 	return false;
-- 
2.54.0



  parent reply	other threads:[~2026-05-20  6:47 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-20  6:46 [PATCH V16 0/7] Rust Support for powerpc Mukesh Kumar Chaurasiya (IBM)
2026-05-20  6:46 ` [PATCH V16 1/7] rust: Fix "multiple candidates for rmeta dependency core" error Mukesh Kumar Chaurasiya (IBM)
2026-05-20  6:46 ` [PATCH V16 2/7] dma-resv: Fix undefined symbol when CONFIG_DMA_SHARED_BUFFER is disabled Mukesh Kumar Chaurasiya (IBM)
2026-05-20  6:46 ` Mukesh Kumar Chaurasiya (IBM) [this message]
2026-05-20  6:46 ` [PATCH V16 4/7] rust/powerpc: Set min rustc version for powerpc Mukesh Kumar Chaurasiya (IBM)
2026-05-25 18:16   ` Miguel Ojeda
2026-05-26  8:52     ` Mukesh Kumar Chaurasiya
2026-05-26 12:21       ` Miguel Ojeda
2026-05-27 11:15       ` Gary Guo
2026-06-02  7:15         ` Mukesh Kumar Chaurasiya
2026-05-20  6:46 ` [PATCH V16 5/7] rust: Make __udivdi3() and __umoddi3() panic Mukesh Kumar Chaurasiya (IBM)
2026-05-20  6:46 ` [PATCH V16 6/7] rust: Add PowerPC support Mukesh Kumar Chaurasiya (IBM)
2026-05-20  6:46 ` [PATCH V16 7/7] powerpc: Enable Rust for ppc64le Mukesh Kumar Chaurasiya (IBM)

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=20260520064630.1785283-4-mkchauras@gmail.com \
    --to=mkchauras@gmail$(echo .)com \
    --cc=a.hindborg@kernel$(echo .)org \
    --cc=acourbot@nvidia$(echo .)com \
    --cc=airlied@gmail$(echo .)com \
    --cc=aliceryhl@google$(echo .)com \
    --cc=ardb@kernel$(echo .)org \
    --cc=bjorn3_gh@protonmail$(echo .)com \
    --cc=boqun@kernel$(echo .)org \
    --cc=chleroy@kernel$(echo .)org \
    --cc=dakr@kernel$(echo .)org \
    --cc=daniel.almeida@collabora$(echo .)com \
    --cc=fujita.tomonori@gmail$(echo .)com \
    --cc=gary@garyguo$(echo .)net \
    --cc=gregkh@linuxfoundation$(echo .)org \
    --cc=jbaron@akamai$(echo .)com \
    --cc=jpoimboe@kernel$(echo .)org \
    --cc=justinstitt@google$(echo .)com \
    --cc=kees@kernel$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linuxppc-dev@lists$(echo .)ozlabs.org \
    --cc=llvm@lists$(echo .)linux.dev \
    --cc=lossin@kernel$(echo .)org \
    --cc=lyude@redhat$(echo .)com \
    --cc=maddy@linux$(echo .)ibm.com \
    --cc=morbo@google$(echo .)com \
    --cc=mpe@ellerman$(echo .)id.au \
    --cc=nathan@kernel$(echo .)org \
    --cc=nick.desaulniers+lkml@gmail$(echo .)com \
    --cc=npiggin@gmail$(echo .)com \
    --cc=ojeda@kernel$(echo .)org \
    --cc=peterz@infradead$(echo .)org \
    --cc=prafulrai522@gmail$(echo .)com \
    --cc=rostedt@goodmis$(echo .)org \
    --cc=rust-for-linux@vger$(echo .)kernel.org \
    --cc=tamird@kernel$(echo .)org \
    --cc=tmgross@umich$(echo .)edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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