From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (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 2B4163101B6 for ; Fri, 17 Apr 2026 15:23:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776439427; cv=none; b=mTLW0OIL1KBfuZBpaLfwAbfvd5bZ5K/22mxF+RCrc5O/elqmtd8zC30v7pBtY+AkASa8HETv6HndFNTmEeh7LqVLSY6+hETniL3zXuEa9v3Mgdv2D3RViy8sayn6qetEwL8009UpnBBjoKdf5+W84S+aOZfow1Y/9DyOSoqXNkU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776439427; c=relaxed/simple; bh=8WQ7jEq8bJBsdnlHGUXrbWXnXrrr5Xxc2+zvN+1cF+Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KnDLecAxAqlQObNht2qkcdnYreQsUD5W2WtuaEvYUNjSxLa0r6tP8L2bVEZJAbx/zGrByOCgxF4FhUKAiGxxsRSGcuPTXYciu+AgqVCznKVjeeDWI5sE8iIr/thS+zYK01VNETTGqwQddG/qRGk7qAE4LCotJxZAF1/Tg89Pd5M= 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=TbZaUz6H; arc=none smtp.client-ip=209.85.215.178 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="TbZaUz6H" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-c79467f128cso327322a12.3 for ; Fri, 17 Apr 2026 08:23:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776439425; x=1777044225; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SIf376OZyXcpY0mdrIrP1nTWV/VE0v5g8114Fjjgl84=; b=TbZaUz6H3O0m1xGl8hvdU7eggKnjETDRAEDLN00BZJUQhNLHWTFzuGEQxUOBPJR+iy 8ql+hs9AbQ/6YIgQbRmsvxHc+p+1onywT+nXUJCsPPxRxPlip9lbBc/RhlG1GhVYyW20 8UDkgiVI7FZMkc59JnZHRqGJe8krinhFVGh881gzh7Ag9sMH+iidJz/7NZXe5JGrvjmv ItkvZvtBFTpkURuozeiSR5UV2tzJBg08Af8+B422FJscFZD3I5HCo+cOUpQtDxZG+m+A 923sGzYe6wVlCVOlL9ycg2AcUj8uJPCupYDPRlK4c4Mn0icCPsvPL8eA/zGNPRAVFTnX OtsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776439425; x=1777044225; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=SIf376OZyXcpY0mdrIrP1nTWV/VE0v5g8114Fjjgl84=; b=r46jxHbmgaSVJ6gM6wr1JGw1/OstIVnzcHM9GbaHEwFzq3nv4+jyBacWAasGiFBNHN keZbt4tXoDi7cy8yAUC3A8zcZquihopryIemGfFLHvT7Ou1RSDJmcP1yrrce2EfgKCbM q8nyoz2PBplaStX9GStEFm9ymZWaCT7LRFT6P174PkkZZZlewcjJtye6REh6dYh2dCha 48qktONE76zQ5Ln4sTh0RqcDpqJqe31vnNEdo8A9BapYgVLQLVJkDVGXV2GjCBdgXu59 rNcNePEAMQ8e1ALkS35b2QFHbx2LGP1OwDn86Y3SYT0n2jzxJP9OfpRtrG+XK93E0zZ4 Z41g== X-Forwarded-Encrypted: i=1; AFNElJ+jKOcHluPcEWkA92/uBbxb8TkjlsN6zvt0NCoLcPDPlqzGPGYtWhFLQpewB88mdptrPtsYVf7KFsAXw6I=@vger.kernel.org X-Gm-Message-State: AOJu0Yz8CjaEhVpHvsFjPbhO0lQGkSdgChv49E4yI+ymEoTIvoZ/ZdE7 ZXkr4CVw8Kel7HmRhQ5XT3AGstKdhT7ulmuc61my9wojQ1Cfqp+Ci/gD X-Gm-Gg: AeBDietl6HRIaSsZLHBuHjnvx5eavXl9c5fkRKwrhOsNpnFokuo1kOTubTwAuCqvW9+ RnFyZA0Bt+c6XCIoKrIfbl26mcQ0wKrY6CMCdoeodB0n9PgGvBJu5fb2G2Tk4+gQl8MRD83cXVV yYirP1JF6V9k7gvvGkAqWoY9bhNDmCfBPNlT3wcCeXuJfMRGufcw6BJ1D7tIob1MsR20dp/VbqZ vbYAtL4ubf0BSyfLo0CjyPXio7aVINnsLbCqZGkq+g9uqaf+myzHS4AkNSs7zTpg4xszqwzdQjI 1yjoVwz2RPpbnfp9ucqsmjCTPa656SRbsB3HghXTRsM60jL9x2cth/rHZqK9FKU3taGG/eOBEwH TlwDiay6YjKrVOMVNQV8b2sXwtJAVsWK585VHtogEihpkXh0QS3fpVtKdt8K/FGveptI7FSrYrr +tg2y9mGgJGdd30ZaUo3YCPj1tBx15ARWs1yJLR8prwn8X+JnR137I8q/ViEF1Xia0Ls+3x1OZF 9/2tSTJB6mgIDY= X-Received: by 2002:a05:6a20:7491:b0:398:ac0d:9a06 with SMTP id adf61e73a8af0-3a08d933c68mr3614755637.55.1776439425364; Fri, 17 Apr 2026 08:23:45 -0700 (PDT) Received: from li-1a3e774c-28e4-11b2-a85c-acc9f2883e29.ibm.com.com ([106.51.164.157]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82f8ebb3829sm2384373b3a.31.2026.04.17.08.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2026 08:23:45 -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, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, llvm@lists.linux.dev Cc: "Mukesh Kumar Chaurasiya (IBM)" Subject: [PATCH V11 2/4] powerpc/jump_label: adjust inline asm to be consistent Date: Fri, 17 Apr 2026 20:52:51 +0530 Message-ID: <20260417152253.2312961-3-mkchauras@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260417152253.2312961-1-mkchauras@gmail.com> References: <20260417152253.2312961-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