From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 88C1433F5A8 for ; Wed, 20 May 2026 06:47:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779259649; cv=none; b=s5mLC4dfEJQ4sh3BRkNiqTYu71toC0D+EyUgZJW37uBg21CIJUbYFtoHO4nirJLf+5C0Ht553tLy0Lqk/ARRvSqwgFjc11mT1APM6MiaBdyMCBWV7xZ5MGeTgR0+3ITEgQnOe0RBS5HtFZUHvA+YtE0kGPhDcnQLUlkHFvR/CvY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779259649; c=relaxed/simple; bh=K6MUpZgy5eBIAUkcIRYa1Whzr02Heqs2j5+IBpUoWqc=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gNJb/DeqRo0iGq8/tqo2BLN0xDtYBSgLDn4Nm1KXFt5bJa5a+cNlItPdEF3kDVc2YMvcto3rTU4LrDDCmw8WSFKkMNHUfE3J8EZ2WRfcd5YgR9PP5i3Q72cc9OBfcU/Hh2vrTGEljcMuPIHPAqf38ZtoJGcyVzG67nMvnC5BSJA= 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=KaNjXXii; arc=none smtp.client-ip=209.85.216.48 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="KaNjXXii" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-3660ab73adbso3135492a91.1 for ; Tue, 19 May 2026 23:47:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779259646; x=1779864446; 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=1cHgHzHWAoKXE2eMaeg8MSzma23SMwAsMBQx7k/VOAI=; b=KaNjXXii4w1a9rmx9f8/k7giBofh6OXihv18O5SCLo+6uyYsfVlo3hHB0+bF+MgLsd S2eYqwxFQNjOYuPpt0cfpWIdjUHcSY6CGfnG4jpdBPJGv6p8KsXv2soXY5yFndMmP2CY V11BrsjiGQpXDSDd9mDJBQZg5xGD/BT35ZfDlqTaPHxS4QI/X9x+Vb/SV+KWoFZsAX9Y XZnXtS2Q4mgbFsaGzFXnaod6RwOdOCJ0vwiBCMkGgTRFJ3NFtz6ANPTQXrqe6XR0Gqqx 9oSuSdtyBVzLCsrUWKA5WSSgB0A7O+y2ktCzgPixuCNbdbZP/RniDJCHuA4Ivf5DbYAt F7Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779259646; x=1779864446; 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=1cHgHzHWAoKXE2eMaeg8MSzma23SMwAsMBQx7k/VOAI=; b=lvCYlsD0weDR/J1ZBk1xl0UOJ0Xr26WYxZ4tYgBqicJW6s/C/bq7yohPLzpaczOSdG WhzYtIHQ/dwdm5ti6/UP8jjddpYMuv6Rb9brRiRlPPla8ednbPtc6VB7hpGVzVXm/a77 hYquLCPhUOw6AH8b3EC8E+ekCkwa2eOCs40GLG9LW08LtuMIsV9aIvgKYFGbVG8iti8d J2i+ITu2loCZzjChLMoDeooT4Q68yPPoiHZ7pdFl3hmtKrM/UIWFQiR6i0neop6Sq2Dq 3wnljBNcSdrTqiN0Fp3XejuHc+kegv5lvrsaUsO1JEtiL+k8RZdRwiBD++ruYjk99Snc EKfg== X-Forwarded-Encrypted: i=1; AFNElJ8seZM0o6s6VhuR9PuWcNwYdEApyNA1CUgb6QPcvS+ABC00ZCmV15AiodklEVQRAqeKXlimV5T0lUJhypg=@vger.kernel.org X-Gm-Message-State: AOJu0YyAYMCJm07MLx4OU0qxWNgc1QF+1pkI4G/Kl2Cp8Aqte5oF/+kR 3jsCjSHoOHJew0wdtO22cYC0dbfpVM9UgM7ZbC6dQOHCcYAW8DmLcHaT X-Gm-Gg: Acq92OGLgvt4FIjZxM0Zi18wK7M47bRTQDymaaBsZGEOABbrpp7HHPMJ4oG8SnshZLT p1XePlpChndk5Z/gF1HLiWunYVhkXaCR03hg2qTKbvvFFxSSIt0HvYRkv7BeQL7CtvaROb3PUxL 124vE5jQ1ZFB6Nl6G40y8ePkeaR7dqjSoGeEQeBF61Umdblkm/orAmkI8qn56qKhaTfRSIsQZRH 9dajoNFRFKLyc2LFNEmr148yPzHk5ht4Um6GyHSfj0kApW7i75cZ0nBDF4UpIfIOUFhtKp8RQlg Htm3wg4xsZjP8nzOsIp1i7vletMTLjmOym8oqzDM9hA5Q6BcoN5rO7sQHGgJdQn7uux8XbKpxRW +LXuTz7H4YrkLEQhMF1c9qba9O25SVROgY9oWXldCecDc7zz7iqgoPPm/oOorGo20m3xLe6ySSS R+PoLrD0S9xkdpjJbq5iEDxV4q9Xheed8l36L9viBquHWcqc5vsvSF86eu3vIBoIMFaUe2p4wKr U6G X-Received: by 2002:a17:90a:f10:b0:369:7944:d723 with SMTP id 98e67ed59e1d1-3697944defbmr7347179a91.4.1779259645871; Tue, 19 May 2026 23:47:25 -0700 (PDT) Received: from li-1a3e774c-28e4-11b2-a85c-acc9f2883e29.ibm.com.com ([106.51.160.236]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3695a0e93e0sm6069970a91.10.2026.05.19.23.47.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2026 23:47:25 -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, 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 Message-ID: <20260520064630.1785283-4-mkchauras@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520064630.1785283-1-mkchauras@gmail.com> References: <20260520064630.1785283-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.54.0