From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 18F232FFF99 for ; Sun, 26 Apr 2026 08:58:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777193901; cv=none; b=W1rX2I/1YBz830oSIpOLDidgh/HJOhIpDBtrbyxwIrYAk5O37BopfkQAwGW2XGwJfGSZg448LpOvHzNjg4EHvGAT8lXd7QMDaWSUUrtlLjpmrvRgV/gJCsQBNUdMVb6uV4z4Umq7TVT9v9D7IH+JdFaJU53s0E5EhJbE19naGCA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777193901; c=relaxed/simple; bh=8WQ7jEq8bJBsdnlHGUXrbWXnXrrr5Xxc2+zvN+1cF+Y=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FmIMbjbtQ732dohIaaVjGrwWY6S7Irujj4jsl8goUjyKb86ZKoJWt3ZvbhqpCB6bNboNthIarDvCA1Id6ZXeps+Rg/iPV5uXis6Z0/1hdbS1vCX03Yz+4/uMonTUqdZlYacMOYRi0aQodIuzckWVWbiPD2UBXSWs9GghPhdXoaM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=m+96q5zw; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="m+96q5zw" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-3567e2b4159so6231089a91.0 for ; Sun, 26 Apr 2026 01:58:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777193899; x=1777798699; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=SIf376OZyXcpY0mdrIrP1nTWV/VE0v5g8114Fjjgl84=; b=m+96q5zwnMQd+kcmnGOY0Ns9ZcThDEqrSTHZ7kIct2RuuFNoFhYsw9CxElJ7/XAszL aa9w33ZvMnKFwy08jsbPejuC6TIBSyKjjGc/QuRjue3PubOfnEgto0tMFOHQhjSvpH+i 2eGE+KSYu0+j4G4RN+jvCsOp5uSWXpcdpXVOopXpTLK2dSB/oNLP9LYiH6xcS/yMoFYs IvQb1BORHqHf1WutQGSjA5WSq8k1aIVGVfxAc5eI6dd40AVlBKq8RkSCVgASz9reyjN3 wghS6ikwiHJnTGGqAnLDQXOEDlyBIzPp9fXna1d0cXkiwLSY3Qj94M5NDqoM8MEl7aNK kKsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777193899; x=1777798699; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=SIf376OZyXcpY0mdrIrP1nTWV/VE0v5g8114Fjjgl84=; b=HE7OTVWrcbyyMhSEi8KcYxhNKotmzHFvbyBFQDdczD8kcdYodBXHwqF7wF0vM+wnJy qJr3lLG0xSciA2KyknHCvhYJfpKqZdsnwKVdja/03GtcXwOL4VKh/4JaSc28Aa5n/SQY cO+vYgucRrmDJ9vVtAz0pk3RblqyO5v8hLuvkp3zB9s4ZbUP9hl8flVcHvkpehkaVayq NA1oSYhDVRwShbfYwalhOHnMlOoB/bPnNoOmoh2xooENpZ7bouu0dLPWs849zL4lBO4I GVkZgKlPaWo0O2sbcQaL1X4o+eTxdmZ/8ZGDE0aJ+4uprdi/3BsPUrsGgzm0vw25OZiW wz1Q== X-Forwarded-Encrypted: i=1; AFNElJ+Z6WIRZKy75WQrjiuTlBNvnit1IBDT/aq6x7ibrBey+74BKUOFYdAldpyNRStXj3GUDBj0k2xu7JtHRjU=@vger.kernel.org X-Gm-Message-State: AOJu0YzjoaVBc+e0t34HHfWZj3DBkc5YPeylWbl7S0O3zNY2r9YxY4XP 3EKzMsregZGrgqx5fBMSvH9PhVeBqrZ+rvjd/WIQXYSp+Df1vNKsHeaM X-Gm-Gg: AeBDiesR1TX9ik5ZrYTRktQ0mk+wNqNqWK79sRl30Ia29l/QOqmnUD6JXq8KeL7xC9C ETJ060w4nHTHJsQJkrYabncNW6TyP82YwXrM+ljvp8tXatvaSnDpclxK9NSr0W0YPwIEqoz7HX1 bKz+PZ7tIpa+IJPqUUN5l0CD8Z3V8l0WAowhna6AFPkJ+0mluRewWnc7pKO/Zd9W7COkEdAOHM9 gV896qnqFFu5768WsLQOf/dqH583ykLTzgh20cJWNSVYaPOH2LR/YeQKy1ESbtWlV6oNg2m5yuF Za1fqiYGq43kPaJCMFXlpnIDt4JwrdpYMbG8o7yPGycGhUXxahXm7o192pFDqTMvIBRquF70jrV 0Pa5h1c2cTcFB9wN/kpxJRiyAuJu2INiWg3VyrEEDYveR1aOTDL3Eywpybr6WkgGBIlfng0mYHf kM99nvybFOL3IVVi2U+I0Y1Y7TQejJHPW5ZbbFnl5PIrziEEkgK0rtyvoDUoP3CtXa8DYZ4wjP1 jiZhb14Z1YdSUg= X-Received: by 2002:a17:90b:3f47:b0:35f:b1ad:fded with SMTP id 98e67ed59e1d1-36140474686mr40098125a91.18.1777193899315; Sun, 26 Apr 2026 01:58:19 -0700 (PDT) Received: from li-1a3e774c-28e4-11b2-a85c-acc9f2883e29.ibm.com.com ([106.51.164.157]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-36141868906sm27718937a91.3.2026.04.26.01.58.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2026 01:58:18 -0700 (PDT) From: "Mukesh Kumar Chaurasiya (IBM)" 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, fujita.tomonori@gmail.com, viresh.kumar@linaro.org, prafulrai522@gmail.com, gregkh@linuxfoundation.org, arnd@arndb.de, tamird@kernel.org, mkchauras@gmail.com, lyude@redhat.com, airlied@gmail.com, j@jannau.net, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH V14 3/7] powerpc/jump_label: adjust inline asm to be consistent Date: Sun, 26 Apr 2026 14:27:21 +0530 Message-ID: <20260426085725.2090827-4-mkchauras@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260426085725.2090827-1-mkchauras@gmail.com> References: <20260426085725.2090827-1-mkchauras@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Madhavan Srinivasan Reviewed-by: Alice Ryhl Reviewed-by: Christophe Leroy (CS GROUP) Reviewed-by: Gary Guo 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) --- 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.53.0