From patchwork Mon Mar 30 22:42:01 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vineet Gupta X-Patchwork-Id: 132475 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 428E64B7A1ED for ; Mon, 30 Mar 2026 22:43:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 428E64B7A1ED Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=whNxs9sH X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from out-180.mta1.migadu.com (out-180.mta1.migadu.com [95.215.58.180]) by sourceware.org (Postfix) with ESMTPS id D4E324BB58DF for ; Mon, 30 Mar 2026 22:42:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D4E324BB58DF Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.dev ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D4E324BB58DF Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=95.215.58.180 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774910541; cv=none; b=SxbeAtsKQ2MV+LL3BtMqyBOeCt9y5K+eNhB9+seQCR14hElTrhTRajSkkf2BG9TYQU8+SJosw/pzmOnaXTZZLuM5zbWtkQ4fH4fAJZapxAfImDGj2OdT4D05qez6OVmnX4CzJ4AmIT7R+//+d2jMBTDmCK2wveVc41PPtXjt8Mo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774910541; c=relaxed/simple; bh=tMFJtWJhDZs516qxR55R8BEJWpigDw765Jcg7gya4Gw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=E132v1KofAiGsfkNJjXc4vxnqvZxB1Qsg5oB98Pq3/B1kpWl4Igh6PJQk6iKFEDDBxHv3MvheQLAo2j66ye6oBmgbTEcTcjKUOqFBSYOVlSLkQii+wWhbpa7IPbttu+QlsXRrWnLCEbg9fqYIlNE9Qwd/f6zF2YFEFbKmlQbquo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D4E324BB58DF X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1774910539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hfFE4M4uPrECCP17x48EB7tFDy5ER+3JIkPWp7zyd24=; b=whNxs9sHonZhT46EbqZlpaJShES0Q1FnnBpflukxiyhki26GHX/4/ijreWxHiz2nLsZEDW 9v1PPKiikdxJuPs9GLNo1t83vuAZ6zOyGBtBFA6Pl8fP2QsDwbSB6roGbabf9WQxmjDBbL jWJcITlwi1cz28A2lPMpyA+Owjb0fdQ= From: Vineet Gupta To: bpf@gcc.gnu.org Cc: binutils@sourceware.org, jose.marchesi@oracle.com, ast@kernel.org, Eduard Zingerman , Yonghong Song , Vineet Gupta Subject: [PATCH 1/3] bpf: print failing insn for unexpected register Date: Mon, 30 Mar 2026 15:42:01 -0700 Message-ID: <20260330224203.3110788-2-vineet.gupta@linux.dev> In-Reply-To: <20260330224203.3110788-1-vineet.gupta@linux.dev> References: <20260330224203.3110788-1-vineet.gupta@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-8.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_PASS, TXREP, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org prev: | /tmp/cc7214hK.s: Assembler messages: | /tmp/cc7214hK.s:40: Error: unexpected register name `w0' in expression New | /tmp/cc7214hK.s: Assembler messages: | /tmp/cc7214hK.s:40: Error: unexpected register name `w0' in instruction `*(u32 *) (r9+0) = w5' Signed-off-by: Vineet Gupta --- gas/config/tc-bpf.c | 6 ++++-- gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.l | 14 +++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gas/config/tc-bpf.c b/gas/config/tc-bpf.c index bc83d3d19d58..57c2b869cbab 100644 --- a/gas/config/tc-bpf.c +++ b/gas/config/tc-bpf.c @@ -1235,6 +1235,7 @@ add_relaxed_insn (struct bpf_insn *insn, expressionS *exp) static int exp_parse_failed = 0; static bool parsing_insn_operands = false; +static char *g_curr_insn_str; static char * parse_expression (char *s, expressionS *exp) @@ -1357,8 +1358,8 @@ bpf_parse_name (const char *name, expressionS *exp, enum expr_mode mode) if (parse_bpf_register ((char *) name, 'r', ®no) || parse_bpf_register ((char *) name, 'w', ®no)) { - as_bad (_("unexpected register name `%s' in expression"), - name); + as_bad (_("unexpected register name `%s' in instruction `%s'"), + name, g_curr_insn_str); return false; } } @@ -1464,6 +1465,7 @@ md_assemble (char *str ATTRIBUTE_UNUSED) function above. */ partial_match_length = 0; errmsg = NULL; + g_curr_insn_str = str; #define PARSE_ERROR(...) parse_error (s > str ? s - str : 0, __VA_ARGS__) diff --git a/gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.l b/gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.l index eeda735fb993..b12739ed7a68 100644 --- a/gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.l +++ b/gas/testsuite/gas/bpf/regs-for-symbols-pseudoc.l @@ -1,8 +1,8 @@ .*: Assembler messages: -.*:1: Error: unexpected register name `w3' in expression -.*:2: Error: unexpected register name `r3' in expression -.*:2: Error: unexpected register name `r3' in expression -.*:3: Error: unexpected register name `r3' in expression -.*:3: Error: unexpected register name `r3' in expression -.*:4: Error: unexpected register name `r3' in expression -.*:4: Error: unexpected register name `r3' in expression +.*:1: Error: unexpected register name `w3' in instruction `goto w3' +.*:2: Error: unexpected register name `r3' in instruction `r2 =r3' +.*:2: Error: unexpected register name `r3' in instruction `r2 =r3' +.*:3: Error: unexpected register name `r3' in instruction `r2 =r3' +.*:3: Error: unexpected register name `r3' in instruction `r2 =r3' +.*:4: Error: unexpected register name `r3' in instruction `r2 =1\+r3' +.*:4: Error: unexpected register name `r3' in instruction `r2 =1\+r3' From patchwork Mon Mar 30 22:42:02 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vineet Gupta X-Patchwork-Id: 132476 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id A19384B7A1E7 for ; Mon, 30 Mar 2026 22:43:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A19384B7A1E7 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=kr2UEwLd X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from out-179.mta1.migadu.com (out-179.mta1.migadu.com [95.215.58.179]) by sourceware.org (Postfix) with ESMTPS id 083B24B92099 for ; Mon, 30 Mar 2026 22:42:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 083B24B92099 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.dev ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 083B24B92099 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=95.215.58.179 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774910543; cv=none; b=G17FN1ZCHMaxvYuM656VHgm8J4QTI1Lv4CVhyGLWvJ8g8vv3b87kjPbDlbQRUWrtCW+/uTgYr7k+vv1j+XESyGH4LARMtg4BQfVI4EgTf7R0yJf0PXwkAnQPNvbTSX2iPmU2MA1+2OeICWCicpQ/h21r+ie6kLvdKgXzNw6hXq4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774910543; c=relaxed/simple; bh=LBS44Rtkf02qvtO/xV3s2TW+jrmmwFhqfQQvMkhGdKs=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=ZLBMKLdLevTy3k/OwoSFZQQBK5hSVLqOQsNwR4kXcjz52UWhmzXVlBBzKkz5XqSHEsyuDMCL6QGBgQBejvhG2JMedzMFVUQR88PrehS/JjCSC8UuLJScIpn6amtVfCuPeTU0LFtSDwYDdjBZtQWK0H0dXhaQUlKj433sWE2T+YE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 083B24B92099 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1774910542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BMqgjbHduN0MUAlF5TvTnozNBGerX+/o5J1au5Cn9UU=; b=kr2UEwLdnN6tqut6psU4X/NwgBtRH8UIKCpHd9NrIADElIy1Wj/1D+ZuhyosEmQXr+qTo+ JLL9UGP5HdZQL5mQNuum4Bj8iQNd+2t3wB6u2CYwHmpiHharz0F6W4cfD0myEzuzyL4M+6 kp4xTOXxD9hSH46dnC2FkjEPgmETLfI= From: Vineet Gupta To: bpf@gcc.gnu.org Cc: binutils@sourceware.org, jose.marchesi@oracle.com, ast@kernel.org, Eduard Zingerman , Yonghong Song , Vineet Gupta Subject: [PATCH 2/3] PR 34029: bpf: allow w regs in store insns similar to llvm Date: Mon, 30 Mar 2026 15:42:02 -0700 Message-ID: <20260330224203.3110788-3-vineet.gupta@linux.dev> In-Reply-To: <20260330224203.3110788-1-vineet.gupta@linux.dev> References: <20260330224203.3110788-1-vineet.gupta@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_PASS, TXREP, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org | *(u32 *)(r9 +0) = w5 | Error: unexpected register name `w5' in expression This syntax is allowed by llvm, athough encoding wise it is same as the insn with rN src reg. The original motivation was a now abondoned gcc change which would generate these patterns. Signed-off-by: Vineet Gupta --- gas/testsuite/gas/bpf/mem-be-pseudoc.d | 5 ++++- gas/testsuite/gas/bpf/mem-pseudoc.d | 5 ++++- gas/testsuite/gas/bpf/mem-pseudoc.s | 3 +++ include/opcode/bpf.h | 1 + opcodes/bpf-opc.c | 6 ++++++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gas/testsuite/gas/bpf/mem-be-pseudoc.d b/gas/testsuite/gas/bpf/mem-be-pseudoc.d index b7715c463a24..8a0980dd3dfa 100644 --- a/gas/testsuite/gas/bpf/mem-be-pseudoc.d +++ b/gas/testsuite/gas/bpf/mem-be-pseudoc.d @@ -30,4 +30,7 @@ Disassembly of section .text: 98: 89 21 7e ef 00 00 00 00 r2=\*\(s16\*\)\(r1\+0x7eef\) a0: 91 21 7e ef 00 00 00 00 r2=\*\(s8\*\)\(r1\+0x7eef\) a8: 99 21 7e ef 00 00 00 00 r2=\*\(s64\*\)\(r1\+0x7eef\) - b0: 61 21 00 00 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x0\) + b0: 63 12 7e ef 00 00 00 00 \*\(u32\*\)\(r1\+0x7eef\)=r2 + b8: 6b 12 7e ef 00 00 00 00 \*\(u16\*\)\(r1\+0x7eef\)=r2 + c0: 73 12 7e ef 00 00 00 00 \*\(u8\*\)\(r1\+0x7eef\)=r2 + c8: 61 21 00 00 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x0\) diff --git a/gas/testsuite/gas/bpf/mem-pseudoc.d b/gas/testsuite/gas/bpf/mem-pseudoc.d index b704de51f8fa..6863cd923f3a 100644 --- a/gas/testsuite/gas/bpf/mem-pseudoc.d +++ b/gas/testsuite/gas/bpf/mem-pseudoc.d @@ -30,4 +30,7 @@ Disassembly of section .text: 98: 89 12 ef 7e 00 00 00 00 r2=\*\(s16\*\)\(r1\+0x7eef\) a0: 91 12 ef 7e 00 00 00 00 r2=\*\(s8\*\)\(r1\+0x7eef\) a8: 99 12 ef 7e 00 00 00 00 r2=\*\(s64\*\)\(r1\+0x7eef\) - b0: 61 12 00 00 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x0\) + b0: 63 21 ef 7e 00 00 00 00 \*\(u32\*\)\(r1\+0x7eef\)=r2 + b8: 6b 21 ef 7e 00 00 00 00 \*\(u16\*\)\(r1\+0x7eef\)=r2 + c0: 73 21 ef 7e 00 00 00 00 \*\(u8\*\)\(r1\+0x7eef\)=r2 + c8: 61 12 00 00 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x0\) diff --git a/gas/testsuite/gas/bpf/mem-pseudoc.s b/gas/testsuite/gas/bpf/mem-pseudoc.s index 199077539163..08797ae58dcf 100644 --- a/gas/testsuite/gas/bpf/mem-pseudoc.s +++ b/gas/testsuite/gas/bpf/mem-pseudoc.s @@ -23,4 +23,7 @@ r2 = *(s16*)(r1+0x7eef) r2 = *(s8*)(r1+0x7eef) r2 = *(s64*)(r1+0x7eef) + *(u32 *)(r1 + 32495) = w2 + *(u16 *)(r1 + 32495) = w2 + *(u8 *)(r1 + 32495) = w2 r2 = *(u32 *)(r1 + 0) diff --git a/include/opcode/bpf.h b/include/opcode/bpf.h index e4ccd430f0ce..7befef454425 100644 --- a/include/opcode/bpf.h +++ b/include/opcode/bpf.h @@ -198,6 +198,7 @@ enum bpf_insn_id BPF_INSN_LDXSB, BPF_INSN_LDXSH, BPF_INSN_LDXSW, BPF_INSN_LDXSDW, /* Generic store instructions (from register.) */ BPF_INSN_STXBR, BPF_INSN_STXHR, BPF_INSN_STXWR, BPF_INSN_STXDWR, + BPF_INSN_STXBW, BPF_INSN_STXHW, BPF_INSN_STXWW, BPF_INSN_STXBI, BPF_INSN_STXHI, BPF_INSN_STXWI, BPF_INSN_STXDWI, /* Compare-and-jump instructions (reg OP reg.) */ BPF_INSN_JAR, BPF_INSN_JEQR, BPF_INSN_JGTR, BPF_INSN_JSGTR, diff --git a/opcodes/bpf-opc.c b/opcodes/bpf-opc.c index aa5493280eaa..c46ff07901c9 100644 --- a/opcodes/bpf-opc.c +++ b/opcodes/bpf-opc.c @@ -236,6 +236,12 @@ const struct bpf_opcode bpf_opcodes[] = BPF_V1, BPF_CODE, BPF_CLASS_STX|BPF_SIZE_W|BPF_MODE_MEM}, {BPF_INSN_STXDWR, "stxdw%W[ %dr %o16 ] , %sr", "* ( u64 * ) ( %dr %o16 ) = %sr", BPF_V1, BPF_CODE, BPF_CLASS_STX|BPF_SIZE_DW|BPF_MODE_MEM}, + {BPF_INSN_STXBW, "stxb%W[ %dr %o16 ] , %sr", "* ( u8 * ) ( %dr %o16 ) = %sw", + BPF_V1, BPF_CODE, BPF_CLASS_STX|BPF_SIZE_B|BPF_MODE_MEM}, + {BPF_INSN_STXHW, "stxh%W[ %dr %o16 ] , %sr", "* ( u16 * ) ( %dr %o16 ) = %sw", + BPF_V1, BPF_CODE, BPF_CLASS_STX|BPF_SIZE_H|BPF_MODE_MEM}, + {BPF_INSN_STXWW, "stxw%W[ %dr %o16 ], %sr", "* ( u32 * ) ( %dr %o16 ) = %sw", + BPF_V1, BPF_CODE, BPF_CLASS_STX|BPF_SIZE_W|BPF_MODE_MEM}, /* Generic store instructions (from 32-bit immediate.) */ {BPF_INSN_STXBI, "stb%W[ %dr %o16 ] , %i32", "* ( u8 * ) ( %dr %o16 ) = %i32", From patchwork Mon Mar 30 22:42:03 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vineet Gupta X-Patchwork-Id: 132477 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 6106E4B92090 for ; Mon, 30 Mar 2026 22:45:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6106E4B92090 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=G/fyAHJl X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from out-174.mta1.migadu.com (out-174.mta1.migadu.com [95.215.58.174]) by sourceware.org (Postfix) with ESMTPS id 16CE94B920C5 for ; Mon, 30 Mar 2026 22:42:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 16CE94B920C5 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.dev ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 16CE94B920C5 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=95.215.58.174 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774910545; cv=none; b=pg8yF612PqsLUCvOfjfpEaZTXqMDJtB1AFY80hcS1NJvq5CT/gTKMrYqC01ZOpMv+9lk2XpYs6RQtXzk7qwMtxajBlhoSo8tM3DgtRuTyEGx/UzVovDX/H/GpbcTf8m5C2dk6hqmWaxeLHY1twmXINAc2Rl2qdUMMU64Ql/rpHI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774910545; c=relaxed/simple; bh=20G//a94FEm/KHbElmpGdRljjuoFceQHwrl8r7l0d5U=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=FoxwFZo3XxJaptDZ3MZnYcFnCDbhTYgvQ35Rln3GnxNeNy1wbwb4LC41Dk+vtB7w9TsuMhaJeTUsNFSjmXRQp5HBbzNeouqTjEoamk+laTSCN82mXBIY/goDHYXwoSwcdrIEt8yWIWgjw/OY70sR0Lhy6zR3sWtAmzHgP5zhO2g= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 16CE94B920C5 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1774910544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9953r6EV2TteFgrNHsgrP4P/1npsOmcJj/fGuf7JHgw=; b=G/fyAHJllpxsDDOpsuqZzs8ZB0+4HVQMw/vzWN5qO/ujgZJ6GHRa6p73pBXNoWXk5Hmq3m 9jM3u/xGFnjUJcUySeQRBnAzcoJINIcsVEFzTODFOPXhABqCzqvflnCyO3yzLbLwwDS8sW xoHwbdW6rFcVVPBfkgcPHIVkqBVYogw= From: Vineet Gupta To: bpf@gcc.gnu.org Cc: binutils@sourceware.org, jose.marchesi@oracle.com, ast@kernel.org, Eduard Zingerman , Yonghong Song , Vineet Gupta Subject: [PATCH 3/3] PR 34029: bpf: allow w regs in load insns similar to llvm Date: Mon, 30 Mar 2026 15:42:03 -0700 Message-ID: <20260330224203.3110788-4-vineet.gupta@linux.dev> In-Reply-To: <20260330224203.3110788-1-vineet.gupta@linux.dev> References: <20260330224203.3110788-1-vineet.gupta@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_PASS, TXREP, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org e.g. | w5 = *(u32 *)(r9 +0) | Error: unexpected register name `w5' in expression Similar theme as prior patch for store insns. Signed-off-by: Vineet Gupta --- gas/testsuite/gas/bpf/mem-be-pseudoc.d | 11 +++++++---- gas/testsuite/gas/bpf/mem-pseudoc.d | 11 +++++++---- gas/testsuite/gas/bpf/mem-pseudoc.s | 3 +++ include/opcode/bpf.h | 1 + opcodes/bpf-opc.c | 6 ++++++ 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/gas/testsuite/gas/bpf/mem-be-pseudoc.d b/gas/testsuite/gas/bpf/mem-be-pseudoc.d index 8a0980dd3dfa..37178ef85849 100644 --- a/gas/testsuite/gas/bpf/mem-be-pseudoc.d +++ b/gas/testsuite/gas/bpf/mem-be-pseudoc.d @@ -30,7 +30,10 @@ Disassembly of section .text: 98: 89 21 7e ef 00 00 00 00 r2=\*\(s16\*\)\(r1\+0x7eef\) a0: 91 21 7e ef 00 00 00 00 r2=\*\(s8\*\)\(r1\+0x7eef\) a8: 99 21 7e ef 00 00 00 00 r2=\*\(s64\*\)\(r1\+0x7eef\) - b0: 63 12 7e ef 00 00 00 00 \*\(u32\*\)\(r1\+0x7eef\)=r2 - b8: 6b 12 7e ef 00 00 00 00 \*\(u16\*\)\(r1\+0x7eef\)=r2 - c0: 73 12 7e ef 00 00 00 00 \*\(u8\*\)\(r1\+0x7eef\)=r2 - c8: 61 21 00 00 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x0\) + b0: 61 21 7e ef 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x7eef\) + b8: 69 21 7e ef 00 00 00 00 r2=\*\(u16\*\)\(r1\+0x7eef\) + c0: 71 21 7e ef 00 00 00 00 r2=\*\(u8\*\)\(r1\+0x7eef\) + c8: 63 12 7e ef 00 00 00 00 \*\(u32\*\)\(r1\+0x7eef\)=r2 + d0: 6b 12 7e ef 00 00 00 00 \*\(u16\*\)\(r1\+0x7eef\)=r2 + d8: 73 12 7e ef 00 00 00 00 \*\(u8\*\)\(r1\+0x7eef\)=r2 + e0: 61 21 00 00 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x0\) diff --git a/gas/testsuite/gas/bpf/mem-pseudoc.d b/gas/testsuite/gas/bpf/mem-pseudoc.d index 6863cd923f3a..c60512126561 100644 --- a/gas/testsuite/gas/bpf/mem-pseudoc.d +++ b/gas/testsuite/gas/bpf/mem-pseudoc.d @@ -30,7 +30,10 @@ Disassembly of section .text: 98: 89 12 ef 7e 00 00 00 00 r2=\*\(s16\*\)\(r1\+0x7eef\) a0: 91 12 ef 7e 00 00 00 00 r2=\*\(s8\*\)\(r1\+0x7eef\) a8: 99 12 ef 7e 00 00 00 00 r2=\*\(s64\*\)\(r1\+0x7eef\) - b0: 63 21 ef 7e 00 00 00 00 \*\(u32\*\)\(r1\+0x7eef\)=r2 - b8: 6b 21 ef 7e 00 00 00 00 \*\(u16\*\)\(r1\+0x7eef\)=r2 - c0: 73 21 ef 7e 00 00 00 00 \*\(u8\*\)\(r1\+0x7eef\)=r2 - c8: 61 12 00 00 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x0\) + b0: 61 12 ef 7e 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x7eef\) + b8: 69 12 ef 7e 00 00 00 00 r2=\*\(u16\*\)\(r1\+0x7eef\) + c0: 71 12 ef 7e 00 00 00 00 r2=\*\(u8\*\)\(r1\+0x7eef\) + c8: 63 21 ef 7e 00 00 00 00 \*\(u32\*\)\(r1\+0x7eef\)=r2 + d0: 6b 21 ef 7e 00 00 00 00 \*\(u16\*\)\(r1\+0x7eef\)=r2 + d8: 73 21 ef 7e 00 00 00 00 \*\(u8\*\)\(r1\+0x7eef\)=r2 + e0: 61 12 00 00 00 00 00 00 r2=\*\(u32\*\)\(r1\+0x0\) diff --git a/gas/testsuite/gas/bpf/mem-pseudoc.s b/gas/testsuite/gas/bpf/mem-pseudoc.s index 08797ae58dcf..2b71b15904d3 100644 --- a/gas/testsuite/gas/bpf/mem-pseudoc.s +++ b/gas/testsuite/gas/bpf/mem-pseudoc.s @@ -23,6 +23,9 @@ r2 = *(s16*)(r1+0x7eef) r2 = *(s8*)(r1+0x7eef) r2 = *(s64*)(r1+0x7eef) + w2 = *(u32 *)(r1 + 32495) + w2 = *(u16 *)(r1 + 32495) + w2 = *(u8 *)(r1 + 32495) *(u32 *)(r1 + 32495) = w2 *(u16 *)(r1 + 32495) = w2 *(u8 *)(r1 + 32495) = w2 diff --git a/include/opcode/bpf.h b/include/opcode/bpf.h index 7befef454425..c0a80fd2ffd1 100644 --- a/include/opcode/bpf.h +++ b/include/opcode/bpf.h @@ -194,6 +194,7 @@ enum bpf_insn_id BPF_INSN_LDINDB, BPF_INSN_LDINDH, BPF_INSN_LDINDW, /* Generic load instructions (to register.) */ BPF_INSN_LDXB, BPF_INSN_LDXH, BPF_INSN_LDXW, BPF_INSN_LDXDW, + BPF_INSN_LDXBW, BPF_INSN_LDXHW, BPF_INSN_LDXWW, /* Generic signed load instructions. */ BPF_INSN_LDXSB, BPF_INSN_LDXSH, BPF_INSN_LDXSW, BPF_INSN_LDXSDW, /* Generic store instructions (from register.) */ diff --git a/opcodes/bpf-opc.c b/opcodes/bpf-opc.c index c46ff07901c9..e67c7ba1fb51 100644 --- a/opcodes/bpf-opc.c +++ b/opcodes/bpf-opc.c @@ -216,6 +216,12 @@ const struct bpf_opcode bpf_opcodes[] = BPF_V1, BPF_CODE, BPF_CLASS_LDX|BPF_SIZE_W|BPF_MODE_MEM}, {BPF_INSN_LDXDW, "ldxdw%W%dr , [ %sr %o16 ]","%dr = * ( u64 * ) ( %sr %o16 )", BPF_V1, BPF_CODE, BPF_CLASS_LDX|BPF_SIZE_DW|BPF_MODE_MEM}, + {BPF_INSN_LDXBW, "ldxb%W%dr , [ %sr %o16 ]", "%dw = * ( u8 * ) ( %sr %o16 )", + BPF_V1, BPF_CODE, BPF_CLASS_LDX|BPF_SIZE_B|BPF_MODE_MEM}, + {BPF_INSN_LDXHW, "ldxh%W%dr , [ %sr %o16 ]", "%dw = * ( u16 * ) ( %sr %o16 )", + BPF_V1, BPF_CODE, BPF_CLASS_LDX|BPF_SIZE_H|BPF_MODE_MEM}, + {BPF_INSN_LDXWW, "ldxw%W%dr , [ %sr %o16 ]", "%dw = * ( u32 * ) ( %sr %o16 )", + BPF_V1, BPF_CODE, BPF_CLASS_LDX|BPF_SIZE_W|BPF_MODE_MEM}, /* Generic signed load instructions (to register.) */ {BPF_INSN_LDXSB, "ldxsb%W%dr , [ %sr %o16 ]", "%dr = * ( s8 * ) ( %sr %o16 )",