From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9EC001BD9EA; Wed, 30 Oct 2024 23:13:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730330001; cv=none; b=SlvOvUu2KIBoR84w3mWm3Fn+mtho7x2KYLxLbTMRsYjVjOvBgez1xfnLw63XmVgwCQ/WvSm/J0z1PvNA75ylg+NDP2Q8hThd8F8R80a7Fh41ISJIMVwmUbQVzBEfZmrrr3GUwgNKIwBp9oAV31qYZ2gjOdTieZmTBwOGodjvZ2M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730330001; c=relaxed/simple; bh=zxSs+rSGb0r81Z2kGNDUOIkCOzHErKH7r5YrALj04Nk=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=H5cCmaEXaVlWrytRlmxVZreZvOnkgfIfSpvUEmUJX1vFopERk1U3bxz8g30g/TIF1Z+51k/ccpg4R2Hzf+KqW3QfA6xh4YVoeM2eFwjDrzqh8pxa1aN6aUh2wjY1iJ/Uqb1WsU5XTDOoiTFUo4zgWQu0grevc5/S5aH39tOBeNo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD931C4CECE; Wed, 30 Oct 2024 23:13:17 +0000 (UTC) Date: Wed, 30 Oct 2024 19:13:16 -0400 From: Steven Rostedt To: Alice Ryhl , Russell King Cc: Masami Hiramatsu , Mathieu Desnoyers , Peter Zijlstra , Josh Poimboeuf , Jason Baron , Ard Biesheuvel , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?B?Qmo=?= =?UTF-8?B?w7Zybg==?= Roy Baron" , Benno Lossin , Andreas Hindborg , linux-trace-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , linux-arch@vger.kernel.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Sean Christopherson , Uros Bizjak , Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , Mark Rutland , Ryan Roberts , Fuad Tabba , linux-arm-kernel@lists.infradead.org, Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Andrew Jones , Alexandre Ghiti , Conor Dooley , Samuel Holland , linux-riscv@lists.infradead.org, Huacai Chen , WANG Xuerui , Bibo Mao , Tiezhu Yang , Andrew Morton , Tianrui Zhao , loongarch@lists.linux.dev, Palmer Dabbelt Subject: Re: [PATCH v12 4/5] jump_label: adjust inline asm to be consistent Message-ID: <20241030191316.2a27ff1b@rorschach.local.home> In-Reply-To: <20241030-tracepoint-v12-4-eec7f0f8ad22@google.com> References: <20241030-tracepoint-v12-0-eec7f0f8ad22@google.com> <20241030-tracepoint-v12-4-eec7f0f8ad22@google.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Precedence: bulk X-Mailing-List: linux-arch@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Wed, 30 Oct 2024 16:04:27 +0000 Alice Ryhl wrote: > To avoid duplication of inline asm between C and Rust, we need to > import the inline asm from the relevant `jump_label.h` header into Rust. > To make that easier, this patch updates the header files to expose the > inline asm via a new ARCH_STATIC_BRANCH_ASM macro. > > The header files are all updated to define a ARCH_STATIC_BRANCH_ASM that > takes the same arguments in a consistent order so that Rust can use the > same logic for every architecture. > > Suggested-by: Peter Zijlstra (Intel) > Co-developed-by: Miguel Ojeda > Signed-off-by: Miguel Ojeda > Acked-by: Peter Zijlstra (Intel) > Acked-by: Catalin Marinas > Acked-by: Palmer Dabbelt # RISC-V Still missing an ack from the ARM maintainer (32 bit, just added) and loongarch. I'll wait till Monday, if I don't hear anything against these patches I'll pull them in. -- Steve > Signed-off-by: Alice Ryhl > --- > arch/arm/include/asm/jump_label.h | 14 +++++---- > arch/arm64/include/asm/jump_label.h | 20 ++++++++----- > arch/loongarch/include/asm/jump_label.h | 16 +++++++---- > arch/riscv/include/asm/jump_label.h | 50 ++++++++++++++++++--------------- > arch/x86/include/asm/jump_label.h | 35 +++++++++-------------- > 5 files changed, 73 insertions(+), 62 deletions(-) > > diff --git a/arch/arm/include/asm/jump_label.h b/arch/arm/include/asm/jump_label.h > index e4eb54f6cd9f..a35aba7f548c 100644 > --- a/arch/arm/include/asm/jump_label.h > +++ b/arch/arm/include/asm/jump_label.h > @@ -9,13 +9,17 @@ > > #define JUMP_LABEL_NOP_SIZE 4 > > +/* This macro is also expanded on the Rust side. */ > +#define ARCH_STATIC_BRANCH_ASM(key, label) \ > + "1:\n\t" \ > + WASM(nop) "\n\t" \ > + ".pushsection __jump_table, \"aw\"\n\t" \ > + ".word 1b, " label ", " key "\n\t" \ > + ".popsection\n\t" \ > + > static __always_inline bool arch_static_branch(struct static_key *key, bool branch) > { > - asm goto("1:\n\t" > - WASM(nop) "\n\t" > - ".pushsection __jump_table, \"aw\"\n\t" > - ".word 1b, %l[l_yes], %c0\n\t" > - ".popsection\n\t" > + asm goto(ARCH_STATIC_BRANCH_ASM("%c0", "%l[l_yes]") > : : "i" (&((char *)key)[branch]) : : l_yes); > > return false; > diff --git a/arch/arm64/include/asm/jump_label.h b/arch/arm64/include/asm/jump_label.h > index a0a5bbae7229..424ed421cd97 100644 > --- a/arch/arm64/include/asm/jump_label.h > +++ b/arch/arm64/include/asm/jump_label.h > @@ -19,10 +19,14 @@ > #define JUMP_TABLE_ENTRY(key, label) \ > ".pushsection __jump_table, \"aw\"\n\t" \ > ".align 3\n\t" \ > - ".long 1b - ., %l["#label"] - .\n\t" \ > - ".quad %c0 - .\n\t" \ > - ".popsection\n\t" \ > - : : "i"(key) : : label > + ".long 1b - ., " label " - .\n\t" \ > + ".quad " key " - .\n\t" \ > + ".popsection\n\t" > + > +/* This macro is also expanded on the Rust side. */ > +#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 * const key, > const bool branch) > @@ -30,8 +34,8 @@ static __always_inline bool arch_static_branch(struct static_key * const key, > char *k = &((char *)key)[branch]; > > asm goto( > - "1: nop \n\t" > - JUMP_TABLE_ENTRY(k, l_yes) > + ARCH_STATIC_BRANCH_ASM("%c0", "%l[l_yes]") > + : : "i"(k) : : l_yes > ); > > return false; > @@ -43,9 +47,11 @@ static __always_inline bool arch_static_branch_jump(struct static_key * const ke > const bool branch) > { > char *k = &((char *)key)[branch]; > + > asm goto( > "1: b %l[l_yes] \n\t" > - JUMP_TABLE_ENTRY(k, l_yes) > + JUMP_TABLE_ENTRY("%c0", "%l[l_yes]") > + : : "i"(k) : : l_yes > ); > return false; > l_yes: > diff --git a/arch/loongarch/include/asm/jump_label.h b/arch/loongarch/include/asm/jump_label.h > index 29acfe3de3fa..8a924bd69d19 100644 > --- a/arch/loongarch/include/asm/jump_label.h > +++ b/arch/loongarch/include/asm/jump_label.h > @@ -13,18 +13,22 @@ > > #define JUMP_LABEL_NOP_SIZE 4 > > -#define JUMP_TABLE_ENTRY \ > +/* This macro is also expanded on the Rust side. */ > +#define JUMP_TABLE_ENTRY(key, label) \ > ".pushsection __jump_table, \"aw\" \n\t" \ > ".align 3 \n\t" \ > - ".long 1b - ., %l[l_yes] - . \n\t" \ > - ".quad %0 - . \n\t" \ > + ".long 1b - ., " label " - . \n\t" \ > + ".quad " 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 * const key, const bool branch) > { > asm goto( > - "1: nop \n\t" > - JUMP_TABLE_ENTRY > + ARCH_STATIC_BRANCH_ASM("%0", "%l[l_yes]") > : : "i"(&((char *)key)[branch]) : : l_yes); > > return false; > @@ -37,7 +41,7 @@ static __always_inline bool arch_static_branch_jump(struct static_key * const ke > { > asm goto( > "1: b %l[l_yes] \n\t" > - JUMP_TABLE_ENTRY > + JUMP_TABLE_ENTRY("%0", "%l[l_yes]") > : : "i"(&((char *)key)[branch]) : : l_yes); > > return false; > diff --git a/arch/riscv/include/asm/jump_label.h b/arch/riscv/include/asm/jump_label.h > index 1c768d02bd0c..87a71cc6d146 100644 > --- a/arch/riscv/include/asm/jump_label.h > +++ b/arch/riscv/include/asm/jump_label.h > @@ -16,21 +16,28 @@ > > #define JUMP_LABEL_NOP_SIZE 4 > > +#define JUMP_TABLE_ENTRY(key, label) \ > + ".pushsection __jump_table, \"aw\" \n\t" \ > + ".align " RISCV_LGPTR " \n\t" \ > + ".long 1b - ., " label " - . \n\t" \ > + "" RISCV_PTR " " key " - . \n\t" \ > + ".popsection \n\t" > + > +/* This macro is also expanded on the Rust side. */ > +#define ARCH_STATIC_BRANCH_ASM(key, label) \ > + " .align 2 \n\t" \ > + " .option push \n\t" \ > + " .option norelax \n\t" \ > + " .option norvc \n\t" \ > + "1: nop \n\t" \ > + " .option pop \n\t" \ > + JUMP_TABLE_ENTRY(key, label) > + > static __always_inline bool arch_static_branch(struct static_key * const key, > const bool branch) > { > asm goto( > - " .align 2 \n\t" > - " .option push \n\t" > - " .option norelax \n\t" > - " .option norvc \n\t" > - "1: nop \n\t" > - " .option pop \n\t" > - " .pushsection __jump_table, \"aw\" \n\t" > - " .align " RISCV_LGPTR " \n\t" > - " .long 1b - ., %l[label] - . \n\t" > - " " RISCV_PTR " %0 - . \n\t" > - " .popsection \n\t" > + ARCH_STATIC_BRANCH_ASM("%0", "%l[label]") > : : "i"(&((char *)key)[branch]) : : label); > > return false; > @@ -38,21 +45,20 @@ static __always_inline bool arch_static_branch(struct static_key * const key, > return true; > } > > +#define ARCH_STATIC_BRANCH_JUMP_ASM(key, label) \ > + " .align 2 \n\t" \ > + " .option push \n\t" \ > + " .option norelax \n\t" \ > + " .option norvc \n\t" \ > + "1: j " label " \n\t" \ > + " .option pop \n\t" \ > + JUMP_TABLE_ENTRY(key, label) > + > static __always_inline bool arch_static_branch_jump(struct static_key * const key, > const bool branch) > { > asm goto( > - " .align 2 \n\t" > - " .option push \n\t" > - " .option norelax \n\t" > - " .option norvc \n\t" > - "1: j %l[label] \n\t" > - " .option pop \n\t" > - " .pushsection __jump_table, \"aw\" \n\t" > - " .align " RISCV_LGPTR " \n\t" > - " .long 1b - ., %l[label] - . \n\t" > - " " RISCV_PTR " %0 - . \n\t" > - " .popsection \n\t" > + ARCH_STATIC_BRANCH_JUMP_ASM("%0", "%l[label]") > : : "i"(&((char *)key)[branch]) : : label); > > return false; > diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h > index cbbef32517f0..3f1c1d6c0da1 100644 > --- a/arch/x86/include/asm/jump_label.h > +++ b/arch/x86/include/asm/jump_label.h > @@ -12,35 +12,28 @@ > #include > #include > > -#define JUMP_TABLE_ENTRY \ > +#define JUMP_TABLE_ENTRY(key, label) \ > ".pushsection __jump_table, \"aw\" \n\t" \ > _ASM_ALIGN "\n\t" \ > ".long 1b - . \n\t" \ > - ".long %l[l_yes] - . \n\t" \ > - _ASM_PTR "%c0 + %c1 - .\n\t" \ > + ".long " label " - . \n\t" \ > + _ASM_PTR " " key " - . \n\t" \ > ".popsection \n\t" > > +/* This macro is also expanded on the Rust side. */ > #ifdef CONFIG_HAVE_JUMP_LABEL_HACK > - > -static __always_inline bool arch_static_branch(struct static_key *key, bool branch) > -{ > - asm goto("1:" > - "jmp %l[l_yes] # objtool NOPs this \n\t" > - JUMP_TABLE_ENTRY > - : : "i" (key), "i" (2 | branch) : : l_yes); > - > - return false; > -l_yes: > - return true; > -} > - > +#define ARCH_STATIC_BRANCH_ASM(key, label) \ > + "1: jmp " label " # objtool NOPs this \n\t" \ > + JUMP_TABLE_ENTRY(key " + 2", label) > #else /* !CONFIG_HAVE_JUMP_LABEL_HACK */ > +#define ARCH_STATIC_BRANCH_ASM(key, label) \ > + "1: .byte " __stringify(BYTES_NOP5) "\n\t" \ > + JUMP_TABLE_ENTRY(key, label) > +#endif /* CONFIG_HAVE_JUMP_LABEL_HACK */ > > static __always_inline bool arch_static_branch(struct static_key * const key, const bool branch) > { > - asm goto("1:" > - ".byte " __stringify(BYTES_NOP5) "\n\t" > - JUMP_TABLE_ENTRY > + asm goto(ARCH_STATIC_BRANCH_ASM("%c0 + %c1", "%l[l_yes]") > : : "i" (key), "i" (branch) : : l_yes); > > return false; > @@ -48,13 +41,11 @@ static __always_inline bool arch_static_branch(struct static_key * const key, co > return true; > } > > -#endif /* CONFIG_HAVE_JUMP_LABEL_HACK */ > - > static __always_inline bool arch_static_branch_jump(struct static_key * const key, const bool branch) > { > asm goto("1:" > "jmp %l[l_yes]\n\t" > - JUMP_TABLE_ENTRY > + JUMP_TABLE_ENTRY("%c0 + %c1", "%l[l_yes]") > : : "i" (key), "i" (branch) : : l_yes); > > return false; > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BDE8DD6B6DE for ; Wed, 30 Oct 2024 23:13:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tPkB7s1sRifmgpAq0tx5GBhs0HofUEdQXBGZPF2MhWY=; b=nKfRDy6QIebMII 7vOdG94vxO/uwU07KBQuql17lat8AnILm/KngKOIGrVMgV4lcsWoXce+ILEVlgBi7eBeScydEKqdg B2dRtT5eXppLoMkrZgrI4COapVGlXfUwr0RtguMxPZ+M3MV38ONpmq+WDv8+MBwbqQyodxC7sHXF+ PMJcGvFfK5uuQIkydlY5H9k4WfsAlzenQ2vDkoxiUrig4tgk1vD0oWPiWuNnFLcNPIbmq26jGxxVf FBHBpZC0hX6WzQsx376UJuYBk894KeFAZEs2ah0KS4Qqo0UVTKz1g0rEZaBuqyBaMGmeTZUOoNOz3 71LBwTU3gBtS3iFCgkCQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t6HsU-000000022IJ-33zF; Wed, 30 Oct 2024 23:13:26 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t6HsQ-000000022Gy-35M4; Wed, 30 Oct 2024 23:13:24 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 8A31F5C6B32; Wed, 30 Oct 2024 23:12:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD931C4CECE; Wed, 30 Oct 2024 23:13:17 +0000 (UTC) Date: Wed, 30 Oct 2024 19:13:16 -0400 From: Steven Rostedt To: Alice Ryhl , Russell King Cc: Masami Hiramatsu , Mathieu Desnoyers , Peter Zijlstra , Josh Poimboeuf , Jason Baron , Ard Biesheuvel , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?B?Qmo=?= =?UTF-8?B?w7Zybg==?= Roy Baron" , Benno Lossin , Andreas Hindborg , linux-trace-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , linux-arch@vger.kernel.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Sean Christopherson , Uros Bizjak , Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , Mark Rutland , Ryan Roberts , Fuad Tabba , linux-arm-kernel@lists.infradead.org, Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Andrew Jones , Alexandre Ghiti , Conor Dooley , Samuel Holland , linux-riscv@lists.infradead.org, Huacai Chen , WANG Xuerui , Bibo Mao , Tiezhu Yang , Andrew Morton , Tianrui Zhao , loongarch@lists.linux.dev, Palmer Dabbelt Subject: Re: [PATCH v12 4/5] jump_label: adjust inline asm to be consistent Message-ID: <20241030191316.2a27ff1b@rorschach.local.home> In-Reply-To: <20241030-tracepoint-v12-4-eec7f0f8ad22@google.com> References: <20241030-tracepoint-v12-0-eec7f0f8ad22@google.com> <20241030-tracepoint-v12-4-eec7f0f8ad22@google.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241030_161322_870585_CC4F062B X-CRM114-Status: GOOD ( 23.49 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org On Wed, 30 Oct 2024 16:04:27 +0000 Alice Ryhl wrote: > To avoid duplication of inline asm between C and Rust, we need to > import the inline asm from the relevant `jump_label.h` header into Rust. > To make that easier, this patch updates the header files to expose the > inline asm via a new ARCH_STATIC_BRANCH_ASM macro. > > The header files are all updated to define a ARCH_STATIC_BRANCH_ASM that > takes the same arguments in a consistent order so that Rust can use the > same logic for every architecture. > > Suggested-by: Peter Zijlstra (Intel) > Co-developed-by: Miguel Ojeda > Signed-off-by: Miguel Ojeda > Acked-by: Peter Zijlstra (Intel) > Acked-by: Catalin Marinas > Acked-by: Palmer Dabbelt # RISC-V Still missing an ack from the ARM maintainer (32 bit, just added) and loongarch. I'll wait till Monday, if I don't hear anything against these patches I'll pull them in. -- Steve > Signed-off-by: Alice Ryhl > --- > arch/arm/include/asm/jump_label.h | 14 +++++---- > arch/arm64/include/asm/jump_label.h | 20 ++++++++----- > arch/loongarch/include/asm/jump_label.h | 16 +++++++---- > arch/riscv/include/asm/jump_label.h | 50 ++++++++++++++++++--------------- > arch/x86/include/asm/jump_label.h | 35 +++++++++-------------- > 5 files changed, 73 insertions(+), 62 deletions(-) > > diff --git a/arch/arm/include/asm/jump_label.h b/arch/arm/include/asm/jump_label.h > index e4eb54f6cd9f..a35aba7f548c 100644 > --- a/arch/arm/include/asm/jump_label.h > +++ b/arch/arm/include/asm/jump_label.h > @@ -9,13 +9,17 @@ > > #define JUMP_LABEL_NOP_SIZE 4 > > +/* This macro is also expanded on the Rust side. */ > +#define ARCH_STATIC_BRANCH_ASM(key, label) \ > + "1:\n\t" \ > + WASM(nop) "\n\t" \ > + ".pushsection __jump_table, \"aw\"\n\t" \ > + ".word 1b, " label ", " key "\n\t" \ > + ".popsection\n\t" \ > + > static __always_inline bool arch_static_branch(struct static_key *key, bool branch) > { > - asm goto("1:\n\t" > - WASM(nop) "\n\t" > - ".pushsection __jump_table, \"aw\"\n\t" > - ".word 1b, %l[l_yes], %c0\n\t" > - ".popsection\n\t" > + asm goto(ARCH_STATIC_BRANCH_ASM("%c0", "%l[l_yes]") > : : "i" (&((char *)key)[branch]) : : l_yes); > > return false; > diff --git a/arch/arm64/include/asm/jump_label.h b/arch/arm64/include/asm/jump_label.h > index a0a5bbae7229..424ed421cd97 100644 > --- a/arch/arm64/include/asm/jump_label.h > +++ b/arch/arm64/include/asm/jump_label.h > @@ -19,10 +19,14 @@ > #define JUMP_TABLE_ENTRY(key, label) \ > ".pushsection __jump_table, \"aw\"\n\t" \ > ".align 3\n\t" \ > - ".long 1b - ., %l["#label"] - .\n\t" \ > - ".quad %c0 - .\n\t" \ > - ".popsection\n\t" \ > - : : "i"(key) : : label > + ".long 1b - ., " label " - .\n\t" \ > + ".quad " key " - .\n\t" \ > + ".popsection\n\t" > + > +/* This macro is also expanded on the Rust side. */ > +#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 * const key, > const bool branch) > @@ -30,8 +34,8 @@ static __always_inline bool arch_static_branch(struct static_key * const key, > char *k = &((char *)key)[branch]; > > asm goto( > - "1: nop \n\t" > - JUMP_TABLE_ENTRY(k, l_yes) > + ARCH_STATIC_BRANCH_ASM("%c0", "%l[l_yes]") > + : : "i"(k) : : l_yes > ); > > return false; > @@ -43,9 +47,11 @@ static __always_inline bool arch_static_branch_jump(struct static_key * const ke > const bool branch) > { > char *k = &((char *)key)[branch]; > + > asm goto( > "1: b %l[l_yes] \n\t" > - JUMP_TABLE_ENTRY(k, l_yes) > + JUMP_TABLE_ENTRY("%c0", "%l[l_yes]") > + : : "i"(k) : : l_yes > ); > return false; > l_yes: > diff --git a/arch/loongarch/include/asm/jump_label.h b/arch/loongarch/include/asm/jump_label.h > index 29acfe3de3fa..8a924bd69d19 100644 > --- a/arch/loongarch/include/asm/jump_label.h > +++ b/arch/loongarch/include/asm/jump_label.h > @@ -13,18 +13,22 @@ > > #define JUMP_LABEL_NOP_SIZE 4 > > -#define JUMP_TABLE_ENTRY \ > +/* This macro is also expanded on the Rust side. */ > +#define JUMP_TABLE_ENTRY(key, label) \ > ".pushsection __jump_table, \"aw\" \n\t" \ > ".align 3 \n\t" \ > - ".long 1b - ., %l[l_yes] - . \n\t" \ > - ".quad %0 - . \n\t" \ > + ".long 1b - ., " label " - . \n\t" \ > + ".quad " 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 * const key, const bool branch) > { > asm goto( > - "1: nop \n\t" > - JUMP_TABLE_ENTRY > + ARCH_STATIC_BRANCH_ASM("%0", "%l[l_yes]") > : : "i"(&((char *)key)[branch]) : : l_yes); > > return false; > @@ -37,7 +41,7 @@ static __always_inline bool arch_static_branch_jump(struct static_key * const ke > { > asm goto( > "1: b %l[l_yes] \n\t" > - JUMP_TABLE_ENTRY > + JUMP_TABLE_ENTRY("%0", "%l[l_yes]") > : : "i"(&((char *)key)[branch]) : : l_yes); > > return false; > diff --git a/arch/riscv/include/asm/jump_label.h b/arch/riscv/include/asm/jump_label.h > index 1c768d02bd0c..87a71cc6d146 100644 > --- a/arch/riscv/include/asm/jump_label.h > +++ b/arch/riscv/include/asm/jump_label.h > @@ -16,21 +16,28 @@ > > #define JUMP_LABEL_NOP_SIZE 4 > > +#define JUMP_TABLE_ENTRY(key, label) \ > + ".pushsection __jump_table, \"aw\" \n\t" \ > + ".align " RISCV_LGPTR " \n\t" \ > + ".long 1b - ., " label " - . \n\t" \ > + "" RISCV_PTR " " key " - . \n\t" \ > + ".popsection \n\t" > + > +/* This macro is also expanded on the Rust side. */ > +#define ARCH_STATIC_BRANCH_ASM(key, label) \ > + " .align 2 \n\t" \ > + " .option push \n\t" \ > + " .option norelax \n\t" \ > + " .option norvc \n\t" \ > + "1: nop \n\t" \ > + " .option pop \n\t" \ > + JUMP_TABLE_ENTRY(key, label) > + > static __always_inline bool arch_static_branch(struct static_key * const key, > const bool branch) > { > asm goto( > - " .align 2 \n\t" > - " .option push \n\t" > - " .option norelax \n\t" > - " .option norvc \n\t" > - "1: nop \n\t" > - " .option pop \n\t" > - " .pushsection __jump_table, \"aw\" \n\t" > - " .align " RISCV_LGPTR " \n\t" > - " .long 1b - ., %l[label] - . \n\t" > - " " RISCV_PTR " %0 - . \n\t" > - " .popsection \n\t" > + ARCH_STATIC_BRANCH_ASM("%0", "%l[label]") > : : "i"(&((char *)key)[branch]) : : label); > > return false; > @@ -38,21 +45,20 @@ static __always_inline bool arch_static_branch(struct static_key * const key, > return true; > } > > +#define ARCH_STATIC_BRANCH_JUMP_ASM(key, label) \ > + " .align 2 \n\t" \ > + " .option push \n\t" \ > + " .option norelax \n\t" \ > + " .option norvc \n\t" \ > + "1: j " label " \n\t" \ > + " .option pop \n\t" \ > + JUMP_TABLE_ENTRY(key, label) > + > static __always_inline bool arch_static_branch_jump(struct static_key * const key, > const bool branch) > { > asm goto( > - " .align 2 \n\t" > - " .option push \n\t" > - " .option norelax \n\t" > - " .option norvc \n\t" > - "1: j %l[label] \n\t" > - " .option pop \n\t" > - " .pushsection __jump_table, \"aw\" \n\t" > - " .align " RISCV_LGPTR " \n\t" > - " .long 1b - ., %l[label] - . \n\t" > - " " RISCV_PTR " %0 - . \n\t" > - " .popsection \n\t" > + ARCH_STATIC_BRANCH_JUMP_ASM("%0", "%l[label]") > : : "i"(&((char *)key)[branch]) : : label); > > return false; > diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h > index cbbef32517f0..3f1c1d6c0da1 100644 > --- a/arch/x86/include/asm/jump_label.h > +++ b/arch/x86/include/asm/jump_label.h > @@ -12,35 +12,28 @@ > #include > #include > > -#define JUMP_TABLE_ENTRY \ > +#define JUMP_TABLE_ENTRY(key, label) \ > ".pushsection __jump_table, \"aw\" \n\t" \ > _ASM_ALIGN "\n\t" \ > ".long 1b - . \n\t" \ > - ".long %l[l_yes] - . \n\t" \ > - _ASM_PTR "%c0 + %c1 - .\n\t" \ > + ".long " label " - . \n\t" \ > + _ASM_PTR " " key " - . \n\t" \ > ".popsection \n\t" > > +/* This macro is also expanded on the Rust side. */ > #ifdef CONFIG_HAVE_JUMP_LABEL_HACK > - > -static __always_inline bool arch_static_branch(struct static_key *key, bool branch) > -{ > - asm goto("1:" > - "jmp %l[l_yes] # objtool NOPs this \n\t" > - JUMP_TABLE_ENTRY > - : : "i" (key), "i" (2 | branch) : : l_yes); > - > - return false; > -l_yes: > - return true; > -} > - > +#define ARCH_STATIC_BRANCH_ASM(key, label) \ > + "1: jmp " label " # objtool NOPs this \n\t" \ > + JUMP_TABLE_ENTRY(key " + 2", label) > #else /* !CONFIG_HAVE_JUMP_LABEL_HACK */ > +#define ARCH_STATIC_BRANCH_ASM(key, label) \ > + "1: .byte " __stringify(BYTES_NOP5) "\n\t" \ > + JUMP_TABLE_ENTRY(key, label) > +#endif /* CONFIG_HAVE_JUMP_LABEL_HACK */ > > static __always_inline bool arch_static_branch(struct static_key * const key, const bool branch) > { > - asm goto("1:" > - ".byte " __stringify(BYTES_NOP5) "\n\t" > - JUMP_TABLE_ENTRY > + asm goto(ARCH_STATIC_BRANCH_ASM("%c0 + %c1", "%l[l_yes]") > : : "i" (key), "i" (branch) : : l_yes); > > return false; > @@ -48,13 +41,11 @@ static __always_inline bool arch_static_branch(struct static_key * const key, co > return true; > } > > -#endif /* CONFIG_HAVE_JUMP_LABEL_HACK */ > - > static __always_inline bool arch_static_branch_jump(struct static_key * const key, const bool branch) > { > asm goto("1:" > "jmp %l[l_yes]\n\t" > - JUMP_TABLE_ENTRY > + JUMP_TABLE_ENTRY("%c0 + %c1", "%l[l_yes]") > : : "i" (key), "i" (branch) : : l_yes); > > return false; > _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv