From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) (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 48114403142 for ; Wed, 8 Jul 2026 08:25:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783499153; cv=none; b=kmm/C4hD5jIOckoxHes6O2xH4sYfi6vUo7Azv1CPZGNOL/NEpKyYW1dovjAmo747az1wdKhSzqlBR/6oEumAlRjcy68skYCbrgy6HtQOhmSqXHGNRsmn4W0A9gzMsil8hKiV6e0v2UcZZCBq3uWeVyzycf5GTsTBEmoSIq03YA8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783499153; c=relaxed/simple; bh=jsGopDHOfXXkIl6WT5aY2aPVGfW1NHdrHUQMy1rh4mU=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o04YGNmqVatbk/HrKjeoNYiGVneWPkO7EimssijJAACC9kUrWST1hvVG99yTOuBLVTnvJBdZ52GAmiux5tl2PvNJ5DQd/CvwZHXv7gnJ95gVVx5HxM6n8jWCU1cbHJipqbFGEVsKuottPv4/Y6iqjEF+r7fvS+WpEe3wS7KmS9k= 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=hRFtGt0U; arc=none smtp.client-ip=209.85.215.170 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="hRFtGt0U" Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-c9e30214d8fso268225a12.3 for ; Wed, 08 Jul 2026 01:25:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783499148; x=1784103948; 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:content-type; bh=IU8cHdVeDTqUeczB1eq13oLH6Kg182LaK9ECFYg1DHk=; b=hRFtGt0URm7InsYy5UpHnSWEEAMsX2zmnwMJMcgyNUy12UNXwuCcebFSoVlSOcnPju CwCKR6MHdi7K1Mvfd9KjRjiMvIWW+hPuEbT83+pNRgcWED0XhRxZ4prXdwIafUGyBaWp KjlzoenuFBXE6cANAN+M2uh4apFfS/JbnSWcpxUzhwS5eCJD73o/doKi/957uAXN9eKl wSS4Xu+Dlbo1YqggZmMPyKEy6f3NZxNTiNWFalY2HMBTL9Ivu9+19c9hpYg8azQK5JVw /1e8rNcOMzZSvG0X8lEIJtPBf8SnQiw/cdctiRuoHcrPbmE5JcHLVssjAm22J7WaoyS2 TtEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783499148; x=1784103948; 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:content-type; bh=IU8cHdVeDTqUeczB1eq13oLH6Kg182LaK9ECFYg1DHk=; b=SZ5Tm1GdqCtV8sdeYnuYnQjlcPAORU6a9nqsmstNy30RSPGJhyRDg4mn//s5Z54KmZ pWmGNiEb+ZxE2fo3leHBAOXZzFK/0xcdbyXmX8CunQXRUeji39uRNfjk4zTkqnu9nqmm P5oNMc8nixqfUZyk6++c4YEnpTymf3Zb8oiPGG3QREvpqFkve1x97AmUXHFNrMRmvmWs cC/MgCvru2NrvdKY+W1R99+Z+MJrdlTiOx0DGG52ZEvFcVVhKZ3tJD/GAvsEtHnQ5nSl s9YOP2jY3KQw6X0uOsGWtTSdeHhGmx4gNiEQESj0SoOOKA+WceqQ4h6HzOOmGy4N8eIj 1JxQ== X-Forwarded-Encrypted: i=1; AHgh+Rr2t5GcuWFyzdiANWxfTL78iOWlAU6q6K0T/ae6hDOGGh56/mIM/4G4F4mKZHbk/OrTGLwhY7lID3wChes=@vger.kernel.org X-Gm-Message-State: AOJu0YxdoHA58Ws/fA5nbOaQLMDkdsVpNmPpKQXGXPCeaCvo58ZaDxph 4Oq72gkvr57lVVbYaVrrX1FPr2Nnvu36AaN8GaJa7RiugnbUp7ACjeXk X-Gm-Gg: AfdE7clXRuWRq4XukNhmY52A393P5APvcnjqu3/UawrFJybSwPZo2CUyxI/2xRedSTp JqQZW8FtaD+SLt5ATfy2oW42xiuKJO5lAIsYFD8HCJNiAd/zTGpWUMypFrvCqKJRbTAjRW/ZQAc BVIy9cmQHAHlTqlrpXDoPyDOSMPqg/tBAinEZBYvXO7HAp9Q9HwrMZUTjFCyzu3UFM5g17nupaq UIWwTVGbkWA2nvA/0kzBhh6QAzfPkW5sCa6DjQHO8G4yCNDuruSq9SqLduoIZuFpKjlkKCHy982 wVKas+Lt/0WnD28SM3qC0f0UL7vfQ8sBvuBGCeTREZLxJmOJtHeVWhXUvznlWyWNuxim1yIlDo5 0M/hutjvwbvOKKCfiAfqLZwJTWfeHg5XQi5VvBbydTdLfBRwEreI3p7cYGQ1roB7aFCs62X+t+5 0GOdq6QYWKBsiyayt3XSBEHEqTJ8gFD+wriO3bICZymAsQ2XAdDqCXjx+KNFyEs37ZZX6xDl4wT tsA X-Received: by 2002:a05:6a20:4308:b0:3c0:9c19:65c3 with SMTP id adf61e73a8af0-3c0bcd26715mr1623869637.75.1783499147997; Wed, 08 Jul 2026 01:25:47 -0700 (PDT) Received: from li-1a3e774c-28e4-11b2-a85c-acc9f2883e29.ibm.com.com ([106.51.160.236]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3117462f5c7sm19975117eec.0.2026.07.08.01.25.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 01:25:47 -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, daniel.almeida@collabora.com, tamird@kernel.org, acourbot@nvidia.com, work@onurozkan.dev, nathan@kernel.org, ndesaulniers@google.com, morbo@google.com, justinstitt@google.com, fujita.tomonori@gmail.com, joelagnelf@nvidia.com, gregkh@linuxfoundation.org, prafulrai522@gmail.com, nsc@kernel.org, japo@linux.ibm.com, mkchauras@gmail.com, lina+kernel@asahilina.net, j@jannau.net, 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 V17 3/7] powerpc/jump_label: adjust inline asm to be consistent Date: Wed, 8 Jul 2026 13:54:50 +0530 Message-ID: <20260708082454.1254320-4-mkchauras@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260708082454.1254320-1-mkchauras@gmail.com> References: <20260708082454.1254320-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.55.0