From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 F1BCC35838F for ; Sun, 26 Apr 2026 11:00:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777201234; cv=none; b=jTCQJNVIsBh/1mCldZRKz7+pMHheSORoOSEHQdjmloMiV+qaBKyExlwJtwHSNwr+c8meYWbziXUShGPpC18L1Vb4hbVjWiIwax7YC66lK+7nAfqeyjYAg0rWjIiFnvGuRTvBue846MbLssi9rFX1CgFXVvi5ehQYbDtJGY5RnSI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777201234; c=relaxed/simple; bh=8WQ7jEq8bJBsdnlHGUXrbWXnXrrr5Xxc2+zvN+1cF+Y=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QHPf+6Y5/ug9PjgWjOlOVEdPes1PKj+Ovd+sqraYZ0VrBqhg1cjIEUMh//oocBdTz/GFiCVClojI/NxJWlQLsUeimUelfXgqMBkddXjggtvlKYmys63ZtmN7xw3pXKfYN8gFHKccfbOt5ms8NSVVn9PyOcXGl7U0vuulug4JzqA= 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=i551RcLq; arc=none smtp.client-ip=209.85.214.180 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="i551RcLq" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2b299b3c739so42653135ad.3 for ; Sun, 26 Apr 2026 04:00:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777201232; x=1777806032; 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=i551RcLqsnhytE+pss10bs8p5npLisQ5cMT4kPat6GSXlRr3bpMgayHI/uZPJUz+FM WLfJmzUehVHp9GfTjBpTTVQ4izl8feE/GpqJxRmzkHAxWMAOWepC7v8DWu0ZS1OGCIQc 4/9K/QV3Jrz4EPZuLC+r0rFGZm+po5yUowpx812P9RO+Y0khmisFWJB+o4x/GBRkJWc2 zVHBCbNntfw9vtzSevcDp/T5dOZURBufS3kKW7cwNQ+VaYW9YTninwNNuCobt4y5CsCA Z0S+/ScGr6Pp2x87RxjKGidJo+1i8PSJ3C3zpX9bekO/9v3171XKg+dGY4G0RSPmX6Ca 3Rqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777201232; x=1777806032; 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=MslvoygqsZjTsp8l+5MwmTpaIup2eJeiMSMJ2gNuZOCBsxxP7Ec0M1f8thryzbkWk7 S7MBGGS3FU0LrBdDw5u1nfSmRmtzoyz0lwVq/xRHevViuI9g1v7gkI0c8iYP/HX0qrXu JNjusmD+CROXOAABA6jSOpmDgQU3c44uuS8h4uXpSCh/AeNobFFF2i9tPZIYXDMo8fDQ Zlry7gk+ZJnZuFux7zYPGHgCDl9s6j8HTYC3ipPpLKPBd4e6tyjpAsB5y/kbI0wLuFwu Eff8b8qiBu2LB/gmQHX+xxDM/TLW/OdjdqpH/giKshrfHsaIbLW2msE7+gSy/Uwm+T5B m7aQ== X-Forwarded-Encrypted: i=1; AFNElJ/kh2M2IAjuBvnS++8v2urB4Azrac/67OtFmBcLyALsTN/9GFYlJVrlxLqsAiqqXQdYJG5kTFpT44S3r+8=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1IaPWY4Oqrpib8dNrMiso7tDGsLgG0sbENKpK+kdS/o305uaF BjqrMxgrLOrmEXReghVgULptO4y/cbhhBuhxbTkTywulMGHhUdFRQwaN X-Gm-Gg: AeBDies8C/SSKvgs1MGBIqNgUiusJuiAIwkrwcc2HSFlmhQ628xTwugy3BCH+uf+bc6 PTrbuNtkNinROOdidZ9U3a5dQtdjCiMnEyBaqEuvs1rqRtnH6u3Yjg3F6rmA6qnc0gXYtAhiyDn XzgDJcd2GzsUM8pUaLupD4sU5lScumOs5/93vimeJj75ermwxvXDxyvnCftYrFiaXnVtZm7vJKg GP5DF5qp8NjyBKQ6qDkTFh3ypYjiZgCHYMNOYGXs3OAX7HmSI4SkqShAVfGjoFbnu22ALsLaKYv irhjk6N2hmrC50DwpjaLL0tklS5bbBoCYVR2XOwN1ZeCL1bUMF5vl499sE3gs8KRDirDgS7Nr8W lomj3xP2vieJa8tXqf8THxBnLJkpnKoosY3fnIBK4OUV3K9jrjfaD99EMQHJBBqFfO9ijp8HORw YkDyfTlqmzMdWQaDpcRdQBBg8TZL3Jkw2MRmVZrbNOc7dxmLhEi95QFE+CMgYO+FOgZYzoSoKBu 24YjB2NXE9D8vVPzc96PkX15w== X-Received: by 2002:a17:902:8649:b0:2b4:65ab:57cd with SMTP id d9443c01a7336-2b5f9fbdd39mr296814685ad.36.1777201228981; Sun, 26 Apr 2026 04:00:28 -0700 (PDT) Received: from li-1a3e774c-28e4-11b2-a85c-acc9f2883e29.ibm.com.com ([106.51.164.157]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5faa2f129sm256667235ad.29.2026.04.26.04.00.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2026 04:00:26 -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, mark.rutland@arm.com, mkchauras@gmail.com, lyude@redhat.com, lina+kernel@asahilina.net, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH V15 3/7] powerpc/jump_label: adjust inline asm to be consistent Date: Sun, 26 Apr 2026 16:29:28 +0530 Message-ID: <20260426105932.2270364-4-mkchauras@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260426105932.2270364-1-mkchauras@gmail.com> References: <20260426105932.2270364-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