From nobody Tue Jun 16 19:33:09 2026 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 080683EF661 for ; Wed, 29 Apr 2026 12:35:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777466136; cv=none; b=aWndaM1mD23ptO4e/+Vw1RxESjm5pixXUQWE3GJiNyQ/dIAuw1o7Z7qUOqp8DXAL2At7bv2NWZ6rR6C5k8eDhrPah/3GJGXGnpY4xXH+Z7v3JRWwikCs2u9fLljCq+ZlbJaxkZ4B993AZCj//C/3x2/MdT++4LKQ6s+aqpEW2z8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777466136; c=relaxed/simple; bh=MnqhpnMcV2P1Wy0heNfuJG74jwvy4A1hjAwYRvR5OgY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ur5jsCrdCfzWlN3gEDdFQO03NnL1SI0qt0p4Y3FhHhSHlbvoNamhGTjcoUi2/wDR8U2O4ale3uSGFuhVTSKHr+DL0EYOnn1qgATVwjmlVBkYCJkBHhubN/Z4rYVrdzlEaRw6ll+d0i1qPHzv49aUTPw0EsajcKzLGK9EzDP5g48= 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=hkjKBKOg; arc=none smtp.client-ip=209.85.216.54 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="hkjKBKOg" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-362ddc1de56so4298400a91.1 for ; Wed, 29 Apr 2026 05:35:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777466134; x=1778070934; 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=mxdKbXflghhv0mGi1QDRLpuzGnjGR2JliNl5UkqK1ag=; b=hkjKBKOg8w8ISxAHhrJFQfZNjQ9dtSq+nj0zURdGVBh4n+EZYXF3FjnIsuy3aclhCw MApqAu9DAgIqadz9I9xCyfx7nckQJ2pfwMmy6JjEjFqNhejhwbkueC06mtO/6EiTI2rK ONkcq8UBM+ZFhVo/S0cvGiXzIh+barTiJFsYJtALm3xYmUYyfqOWLSOP2KpvXvG5i0ny LuAdGZTqi5dBdOXxi3EDtCcN1u4syP7UgdyQZkSZUdIfSdmISt3IhMxreaYNbujYdnOh btNOFyK0nX/62bK/UyMtrP8m2UB6pl3AXDycCvpqWEQQ8U9iFqbxV2PaIgReKsA1gEyJ tZ7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777466134; x=1778070934; 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=mxdKbXflghhv0mGi1QDRLpuzGnjGR2JliNl5UkqK1ag=; b=Q0X6pA72ikswgsIk1q3uH8x7UioeH4UBOYCFBcnbg4kCFZhJpiM8KjsMFrhgUFMr4Z 48ynswETMkkJSNOwR6ouYxhWlOamJlbGDRUjO+mBzS0s8qoX1JkCRYnwXLbeoxzCxumR kjbYX64i3zx5AYc6YITcv0C9OO9OfVBpguixC3gwbdrQxUs0YsihuAIggrXbt+KJL8bC H+xM7dvE1FXmnoQdQviJFMVzzf6sXOJ3/UsFCp1GVXNm6SVHNfwUGcidToKd+TANOOJq ys5c9sivkFSl/amppB3o91NUDyd0+AgWEy+bqBjai6jRG/0tWgv7mWvbbmRoGae+AYXd nr0w== X-Forwarded-Encrypted: i=1; AFNElJ+2jovisHTG9xW5S0YaXHceuVWWAXPCDV8miw8iKsGSW0izuVlzjjnorYgt7cI+mFOuAyMKHIzD7UIjZSo=@vger.kernel.org X-Gm-Message-State: AOJu0YxLlBSNbMQYW4nO4nKxU+VICIns7RTxGQdKRpqocjCf7I1R/rNe dhVp67ll+Bf2MhIXjoT6cR4zSujCgngX0oWdgi64QBQp0fZUpvzkKIZB X-Gm-Gg: AeBDiesyRzi2Cf8+cpnHT7H9a/z06KIYXEaPev93VD7KsgIDr2dO9hST9vqUskWxLV3 QsqoJPscVLVO79jOLkg6gSt+PJweRLNo+xVL+W9LPf6oU1oB4N9ie3qDUVB/9ZSR3KLMBZ7VyYO KwZ3quJfdNzkDrnBdUElJxr9VFM/+yBdR5Poe7yr8VN9abynCBIJW8kNsb6ZhlqwthlEoUPzu18 lFnMCoaDVw0LZl6N6cnIwvB33MYB/oWlNcUkFaxNzzCWoPvRX2S7/9w2uwBGpeq9AiqLIfx/43I mqnnuEpp60zYe8GRLwXW60YRObujL3che+ySh+gyRIhSSJcpxvoM+nVUc6tLK5PICH5B1fWm94j 3e+DpvIdXwI0Wh188hVqOUIGPHyk+s8SKZ1weqnNTMJRJmIsLM5+O56as0zn6dSsV7CMAY7eUxo 4DWECJOZwRo2oURBfs27PSTgGvv1z80hpuvrki7f7+cM410qTSVo/mQcWQdbCt2pQaKQHINrw5E BjedYV98ed2A009OvmH1xoq2ghD9PaSHPk/CG0o9st7 X-Received: by 2002:a17:90b:3b8a:b0:35d:9da0:4947 with SMTP id 98e67ed59e1d1-36492019132mr7805627a91.11.1777466134253; Wed, 29 Apr 2026 05:35:34 -0700 (PDT) Received: from visitorckw-work01.c.googlers.com.com (32.237.80.34.bc.googleusercontent.com. [34.80.237.32]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-364a419c9a6sm2261855a91.7.2026.04.29.05.35.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2026 05:35:33 -0700 (PDT) From: Kuan-Wei Chiu To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, eddyz87@gmail.com, memxor@gmail.com, luke.r.nels@gmail.com, xi.wang@gmail.com, pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu Cc: martin.lau@linux.dev, song@kernel.org, yonghong.song@linux.dev, jolsa@kernel.org, alex@ghiti.fr, jserv@ccns.ncku.edu.tw, eleanor15x@gmail.com, marscheng@google.com, bpf@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH bpf-next 1/3] riscv, bpf: Fix support for BPF_SDIV and BPF_SMOD in RV32 JIT Date: Wed, 29 Apr 2026 12:35:11 +0000 Message-ID: <20260429123513.3477780-2-visitorckw@gmail.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog In-Reply-To: <20260429123513.3477780-1-visitorckw@gmail.com> References: <20260429123513.3477780-1-visitorckw@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: quoted-printable Content-Type: text/plain; charset="utf-8" The current rv32 bpf jit compiler incorrectly treats BPF_SDIV and BPF_SMOD as unsigned operations. The BPF instruction set allows signed division and modulo by reusing the BPF_DIV and BPF_MOD opcodes with the instruction offset set to 1. Update the emit_alu_r32() function to accept an 'is_sdiv' variable and emit the correct div and rem instructions when the offset is 1. Before this patch: [ 44.161771] test_bpf: #165 ALU_SDIV_X: -6 / 2 =3D -3 jited:1 ret 2147483= 645 !=3D -3 (0x7ffffffd !=3D 0xfffffffd)FAIL (1 times) [ 44.167385] test_bpf: #166 ALU_SDIV_K: -6 / 2 =3D -3 jited:1 ret 2147483= 645 !=3D -3 (0x7ffffffd !=3D 0xfffffffd)FAIL (1 times) [ 44.171053] test_bpf: #169 ALU_SMOD_X: -7 % 2 =3D -1 jited:1 ret 1 !=3D = -1 (0x1 !=3D 0xffffffff)FAIL (1 times) [ 44.172081] test_bpf: #170 ALU_SMOD_K: -7 % 2 =3D -1 jited:1 ret 1 !=3D = -1 (0x1 !=3D 0xffffffff)FAIL (1 times) After this patch: [ 16.002192] test_bpf: #165 ALU_SDIV_X: -6 / 2 =3D -3 jited:1 95 PASS [ 16.002983] test_bpf: #166 ALU_SDIV_K: -6 / 2 =3D -3 jited:1 1059 PASS [ 16.017167] test_bpf: #169 ALU_SMOD_X: -7 % 2 =3D -1 jited:1 136 PASS [ 16.023002] test_bpf: #170 ALU_SMOD_K: -7 % 2 =3D -1 jited:1 109 PASS Signed-off-by: Kuan-Wei Chiu --- arch/riscv/net/bpf_jit_comp32.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/arch/riscv/net/bpf_jit_comp32.c b/arch/riscv/net/bpf_jit_comp3= 2.c index 592dd86fbf81..7396899ea276 100644 --- a/arch/riscv/net/bpf_jit_comp32.c +++ b/arch/riscv/net/bpf_jit_comp32.c @@ -509,7 +509,7 @@ static void emit_alu_r64(const s8 *dst, const s8 *src, } =20 static void emit_alu_r32(const s8 *dst, const s8 *src, - struct rv_jit_context *ctx, const u8 op) + struct rv_jit_context *ctx, const u8 op, bool is_sdiv) { const s8 *tmp1 =3D bpf2rv32[TMP_REG_1]; const s8 *tmp2 =3D bpf2rv32[TMP_REG_2]; @@ -539,10 +539,16 @@ static void emit_alu_r32(const s8 *dst, const s8 *src, emit(rv_mul(lo(rd), lo(rd), lo(rs)), ctx); break; case BPF_DIV: - emit(rv_divu(lo(rd), lo(rd), lo(rs)), ctx); + if (is_sdiv) + emit(rv_div(lo(rd), lo(rd), lo(rs)), ctx); + else + emit(rv_divu(lo(rd), lo(rd), lo(rs)), ctx); break; case BPF_MOD: - emit(rv_remu(lo(rd), lo(rd), lo(rs)), ctx); + if (is_sdiv) + emit(rv_rem(lo(rd), lo(rd), lo(rs)), ctx); + else + emit(rv_remu(lo(rd), lo(rd), lo(rs)), ctx); break; case BPF_LSH: emit(rv_sll(lo(rd), lo(rd), lo(rs)), ctx); @@ -959,6 +965,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, stru= ct rv_jit_context *ctx, u8 code =3D insn->code; s16 off =3D insn->off; s32 imm =3D insn->imm; + bool is_sdiv =3D false; =20 const s8 *dst =3D bpf2rv32[insn->dst_reg]; const s8 *src =3D bpf2rv32[insn->src_reg]; @@ -1041,7 +1048,9 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, st= ruct rv_jit_context *ctx, emit_imm32(tmp2, imm, ctx); src =3D tmp2; } - emit_alu_r32(dst, src, ctx, BPF_OP(code)); + if ((BPF_OP(code) =3D=3D BPF_DIV || BPF_OP(code) =3D=3D BPF_MOD) && insn= ->off =3D=3D 1) + is_sdiv =3D true; + emit_alu_r32(dst, src, ctx, BPF_OP(code), is_sdiv); break; =20 case BPF_ALU | BPF_MOV | BPF_K: @@ -1065,7 +1074,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, st= ruct rv_jit_context *ctx, * src is ignored---choose tmp2 as a dummy register since it * is not on the stack. */ - emit_alu_r32(dst, tmp2, ctx, BPF_OP(code)); + emit_alu_r32(dst, tmp2, ctx, BPF_OP(code), false); break; =20 case BPF_ALU | BPF_END | BPF_FROM_LE: --=20 2.54.0.545.g6539524ca2-goog From nobody Tue Jun 16 19:33:09 2026 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (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 6FBD03F54A4 for ; Wed, 29 Apr 2026 12:35:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777466142; cv=none; b=mCMc7I2b27/8/46EOMUwNhj4r06BxkKqgc5a86CaBiSe9eFX0PW1fi4NqnQajxNkvABQyy9WlUu4cRQ/M9p4Om2L9Xzu8dJ55gAIo8LR13Ry3RWC9mcev/wnI9eoWuzbxnvyq2iHUyEm5YBWD+DEPD5RqIb2WKDWBY7Nffjyvvs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777466142; c=relaxed/simple; bh=AjTYGwgBOQtOfYmN09UgbPmmji9Klyu9h3CWG62A8jc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eNIWX2X5CjtsTy4bje8j5/u+49Wu3zbXwcuLouHCeN6/GzicMloIyFBPLxODvNWgHKDs3u0WA9uZm+vP/MGefIz3W4RJYaUZfPNypcwdPmZp+mApvnwGwrVdbVymTW0K9uYHKLb9fPBU7Vpi95NGGqef3CjqH9tYZ4iiQukIBiM= 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=L9Ijf5PN; arc=none smtp.client-ip=209.85.216.49 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="L9Ijf5PN" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-3585ec417f6so377679a91.1 for ; Wed, 29 Apr 2026 05:35:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777466139; x=1778070939; 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=ednz/cghQpogB1tCla7fjN5pIBUu1nziwhwuKFzLoEk=; b=L9Ijf5PNO8FX43PIIaHshmbKi0ZLbVaVyCAUc9bHm1OudFV1kME1G0Hlt7TsJyi3DI kbSN1Xb/SpbUX63fFv0EaZ5QZkTXbKA0DGnZvFT5FiN1OHCVWtWbtWPEyh1uZ0PR1DqH qKs4O/2tVXDU7ZQw8WUqL63A+DHrbvZtYsFUfuGJoReul5CtsvZ4jPQ1Fjf/Vs3xT/6w ZNeBn7q+5MEiwp29XiqrSOOoVwhtHmePxLtTXVFq6wkPOhscg9iIp4E1/oz+tJSynfWC B0YMLQQyZfMRVGpeEugB1pFBryq7jjxZNZauKz79+HyqYvMo+3Z0uUTJ/27FGaYuamV9 bCEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777466139; x=1778070939; 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=ednz/cghQpogB1tCla7fjN5pIBUu1nziwhwuKFzLoEk=; b=j34/DwyJA1FcfrTGFcq/gJFR+g5eoBRbJSq2F4TkLEJZkwC3LP99sGBI9A68nHMj6W SKYEI4Jw5YIpF0TMRhR+AaZnM3l/2yx7+h8at0Xmwc0yQaxzm6dI5RfmWDaKiSEZ48ob th03CEsAUerwY8XMznRE9PPPCo0YoDt4lko49cbmeSklhVVJBqNi/PtWDTwzIgL25yuR ug/tjKiZ4REVK4b0k3tnQV7xK4/r08rlfPiQoXWrcvCcd70sn0xsujoiOyRrU7weShyi y9k8oeGK9e7T2U/O3kWxy/1Rr7+wUsYsHv61gzlOaXxQU5eAToYEN/l3iEcJlWL/tmcd +mFg== X-Forwarded-Encrypted: i=1; AFNElJ8yX4uHyjZyMLnb8lFrpjUORmm4qPYP4lh87zQVy907i/X7xcRwqV+Ev2GVVvRZgJcxwVipfWihMxy4VZ8=@vger.kernel.org X-Gm-Message-State: AOJu0Yw4E1vqFU+U1/mAubUkgto6IdR9mRmGH+F0jEhttBfRcmpLfBmN RXoe2qo7C9OXwBUFd8BIoj/o7DGckFqXAgbqIPXahUBMTl63U8jMeXkD X-Gm-Gg: AeBDieubm2XtNH7n+dLMEYisDegu17E1aZlI8+in7+p/hmr40ZjcM2eZl/eNAHu+T3j dHBZZh8dtLoIX8tpkAUUcEWGvOSkdIrvg1bRARTqM1UBzzIcuzxnzg+kzsb7/f+NIU0a/fHTjct dVPhR23fU3iJhyi5d3/UaCIeGkN3ADHB/d6gy2UWnZsNEiMntYnkLMxi529PXdJQ2kosJNbPbo0 tpuv9GuJWkHCbRoJNTEhbua0okojM+YrKQkxlIDpQD9PmnSiuZg65BqdZaEHrwrwCbjdpyFOKJE rELR3W/AUW5CCRCrdrgyQTDj2ngaoreZ6iLG4UiBKUgnr9v6YFEQuOIdOqQaGlvCZOdq3elkFj2 Ji0dN3wNmUk9vTygO6DSxppFwQ8pFwyTFoWDy4XcGicTwQaUmVDysL5ZYa7cKy3a4/ojaqPe8ep D6LE66dj6dmDQsQ2imx8L+Im3qiqTesqe22JFMcqhyuhhC+0ETT3ntp0tjpRdc7aICnTEjwByF1 K6Y2lt8rAlW5VVFzINSo6IeOdLHxfS1fq2P4x35TH5oMHojRDB6rpI= X-Received: by 2002:a17:90b:394d:b0:35f:b1ae:d0ee with SMTP id 98e67ed59e1d1-364a1e69c83mr2946890a91.5.1777466139351; Wed, 29 Apr 2026 05:35:39 -0700 (PDT) Received: from visitorckw-work01.c.googlers.com.com (32.237.80.34.bc.googleusercontent.com. [34.80.237.32]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-364a419c9a6sm2261855a91.7.2026.04.29.05.35.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2026 05:35:39 -0700 (PDT) From: Kuan-Wei Chiu To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, eddyz87@gmail.com, memxor@gmail.com, luke.r.nels@gmail.com, xi.wang@gmail.com, pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu Cc: martin.lau@linux.dev, song@kernel.org, yonghong.song@linux.dev, jolsa@kernel.org, alex@ghiti.fr, jserv@ccns.ncku.edu.tw, eleanor15x@gmail.com, marscheng@google.com, bpf@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH bpf-next 2/3] riscv, bpf: Fix support for BPF_MOVSX in RV32 JIT Date: Wed, 29 Apr 2026 12:35:12 +0000 Message-ID: <20260429123513.3477780-3-visitorckw@gmail.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog In-Reply-To: <20260429123513.3477780-1-visitorckw@gmail.com> References: <20260429123513.3477780-1-visitorckw@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: quoted-printable Content-Type: text/plain; charset="utf-8" The current rv32 bpf jit compiler incorrectly treats BPF_MOVSX as a standard zero-extended move operation. The bpf instruction set allows sign-extension moves by reusing the BPF_MOV opcode with the instruction offset set to 8, 16, or 32. Update the bpf_jit_emit_insn() function to check the offset field for both ALU and ALU64 MOV operations. If the offset is non-zero, emit the correct slli and srai instructions to perform the sign extension. Before this patch: [ 19.549705] test_bpf: #82 ALU_MOVSX | BPF_B jited:1 ret 2 !=3D 1 (0x2 != =3D 0x1)FAIL (1 times) [ 19.551354] test_bpf: #83 ALU_MOVSX | BPF_H jited:1 ret 2 !=3D 1 (0x2 != =3D 0x1)FAIL (1 times) [ 19.552576] test_bpf: #84 ALU64_MOVSX | BPF_B jited:1 ret 2 !=3D 1 (0x2 = !=3D 0x1)FAIL (1 times) [ 19.553542] test_bpf: #85 ALU64_MOVSX | BPF_H jited:1 ret 2 !=3D 1 (0x2 = !=3D 0x1)FAIL (1 times) [ 19.554807] test_bpf: #86 ALU64_MOVSX | BPF_W jited:1 ret 2 !=3D 1 (0x2 = !=3D 0x1)FAIL (1 times) After this patch: [ 17.931172] test_bpf: #82 ALU_MOVSX | BPF_B jited:1 125 PASS [ 17.932198] test_bpf: #83 ALU_MOVSX | BPF_H jited:1 124 PASS [ 17.933039] test_bpf: #84 ALU64_MOVSX | BPF_B jited:1 124 PASS [ 17.933918] test_bpf: #85 ALU64_MOVSX | BPF_H jited:1 124 PASS [ 17.934751] test_bpf: #86 ALU64_MOVSX | BPF_W jited:1 122 PASS Signed-off-by: Kuan-Wei Chiu --- arch/riscv/net/bpf_jit_comp32.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/arch/riscv/net/bpf_jit_comp32.c b/arch/riscv/net/bpf_jit_comp3= 2.c index 7396899ea276..f8509950fed4 100644 --- a/arch/riscv/net/bpf_jit_comp32.c +++ b/arch/riscv/net/bpf_jit_comp32.c @@ -974,6 +974,24 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, str= uct rv_jit_context *ctx, =20 switch (code) { case BPF_ALU64 | BPF_MOV | BPF_X: + if (insn->off !=3D 0) { + const s8 *rd =3D bpf_get_reg64(dst, tmp1, ctx); + const s8 *rs =3D bpf_get_reg64(src, tmp2, ctx); + + if (insn->off =3D=3D 8) { + emit(rv_slli(lo(rd), lo(rs), 24), ctx); + emit(rv_srai(lo(rd), lo(rd), 24), ctx); + } else if (insn->off =3D=3D 16) { + emit(rv_slli(lo(rd), lo(rs), 16), ctx); + emit(rv_srai(lo(rd), lo(rd), 16), ctx); + } else { + emit(rv_addi(lo(rd), lo(rs), 0), ctx); + } + emit(rv_srai(hi(rd), lo(rd), 31), ctx); + bpf_put_reg64(dst, rd, ctx); + break; + } + fallthrough; =20 case BPF_ALU64 | BPF_ADD | BPF_X: case BPF_ALU64 | BPF_ADD | BPF_K: @@ -1024,6 +1042,20 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, s= truct rv_jit_context *ctx, emit_zext64(dst, ctx); break; } + if (insn->off !=3D 0) { + const s8 *rd =3D bpf_get_reg32(dst, tmp1, ctx); + const s8 *rs =3D bpf_get_reg32(src, tmp2, ctx); + + if (insn->off =3D=3D 8) { + emit(rv_slli(lo(rd), lo(rs), 24), ctx); + emit(rv_srai(lo(rd), lo(rd), 24), ctx); + } else if (insn->off =3D=3D 16) { + emit(rv_slli(lo(rd), lo(rs), 16), ctx); + emit(rv_srai(lo(rd), lo(rd), 16), ctx); + } + bpf_put_reg32(dst, rd, ctx); + break; + } fallthrough; =20 case BPF_ALU | BPF_ADD | BPF_X: --=20 2.54.0.545.g6539524ca2-goog From nobody Tue Jun 16 19:33:09 2026 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (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 D70943BED1E for ; Wed, 29 Apr 2026 12:35:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777466146; cv=none; b=JrlTeISaKRekPNmZVmOVsLh5UYB5kjq3GRaR/zBSurcInyUxlvXp1GriQbuvqaWQ3NPyisqGEbSdhcIckcO0fYRxf7ZGEh0+4r8CdnqQI+3cYqs2EeRj7XMqg/5T+VuE+PqN5DncAyNhzWqK2QTV8L4c3sEUkjf+8QGLJBV0tpw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777466146; c=relaxed/simple; bh=R6LT/oXtwCIK8rBIYICuZx9Lf4fBXDESH6WRM3D3CCM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EhIFTksFg6AE4CtvHXK3eyf/YxTdsXixmfO0HMkNxNiixSJSRro4Xl+upHjJ4dUp8wqYXW8Sc9l3JFVpuVA6lCadZQmM2qxvL+CCv3xZOh73t9ko4ZdVrEC/IgeqUsROShujo3oEi0r2preChCIFcxONAE9a1adx+X03/dMfMpQ= 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=jR5SAkx4; arc=none smtp.client-ip=209.85.216.44 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="jR5SAkx4" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-358ed696623so5548193a91.0 for ; Wed, 29 Apr 2026 05:35:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777466144; x=1778070944; 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=Quty2+kN4SQkJsBp5DT7Nz27mG7X1e/3uN0TQkO7euI=; b=jR5SAkx4NjBUmwyqsG3ga2JbSumv0G2NcpfF8yNSGE3uKi1XhORvY065IZdyOtFBe/ TCWvmGdtEtAEnSuZ9g08Jr9twJoHSRzlmAWcRE6fb0l7mQq8kTCtr1QqTvUeUHoOvBHY QCiZ0t1KU91StUUQ+YOfrYexs8bedhFRQUwWLipu58qv38+RsqsbqRRXQ7q9+WDARd3b MeaDNWyL5rlJAkcUrsKAerCmoZVTZiqHwvpBDz50ksO5KDxe6ONIU8peRzcCK9tsBxaP tMS4WcJnmbpfXlKPBjsOYzvm8qDm1u61CNqVo9GCPkcfADf+Q+MEpFL2zIJWSe08Lk3K 0t1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777466144; x=1778070944; 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=Quty2+kN4SQkJsBp5DT7Nz27mG7X1e/3uN0TQkO7euI=; b=Wvf6lnoPOp/tkNw3yD6n2n0zGYj1pW3mUpHmIx1PwKEKunjJT2YF2swpsQ+FiFTQMy no9DKNJMkB4GlYRjCttTfkIREaswOw96Vu41I1qinThiS/oYiQJEtHd4U52EaCykB4UZ nIJfYxxgbFZS3KmV5islAhWSxuRxiDXVnQDoNe/mtkxFT1CDZ2er8/y5M2lMQ48baEbI mycRc/g4s3W7cKotLhQ+6ggTBZct6WZn3xe2AQkRCXIQHmPKudARkNxPB8OV6/DhmTKT eY4S529hdhwK9JZuw649EcjT0bUp5aGmlBmIAN3sbVhLAlwafs5a3ryHSnhcYifz0GYK UtRg== X-Forwarded-Encrypted: i=1; AFNElJ/wQCFs6zdkmB9j4eMKgmBUVUcRhoHjM4p7MDQXX0qC8Rp2IJlWS3/d4ZykKUjbmxDuKCItMtzPe0VISDA=@vger.kernel.org X-Gm-Message-State: AOJu0YzTfzYc9QSCjGxXmjbdpRz88UbzCu4nXPFXJWs6DpxsQd64dA0v SSHofILXgWiWyk1Ofd3dkjfFt6dhnkXTUAI0dkL7BF/fJXoAIXHafLdK X-Gm-Gg: AeBDiesfukqALoXcYgdXyAIFDlEYcSTjZdyjiW49vElTCVgxPmQB9emOMdOP1l1oz7D pibfRhOgTkBeANdoiodADdCMqOMRjXvGtv6lDwGD9C42vA6Kla9j1kUteoRP9GGK1LZxP9Zy8Md Avrf3XAbQJa3yQZhbjozN2WRC9mBMgffnZP2rcFXkEvgOAAy6YbrDt6vfe+AhpEfJjYQtCeZBrp OBgzBv5dTDqtXxgbAvhRGOUmcbYgQfz5QbbCJGPTzTwWiZlt4ggOJUIT347QO0CkgS2WEVD72Or MGUlYWvcPVD47oHv8Fx8Iew5JKOGrMqtJ3vP4SH82ZYQGdCAJELq4vfRtoC4pNxbILxfm5S4nEH ggf8pdX2FdiSaPZVv471MNU0pxXz7scKxjqCqqS9f1v7G6gq+Iv8sLbYF68TZop8LJMCFf78j4g Kjyc0LjpckAiR1ZdEpAfdxCE2SoCMDGpOuzkkxjqGPEJqaHuRTzHEq16pfwhz6FXyCD5Z8GoNJR n3I55nuSkvu8dvhmwUiBXbQD11sDLciz/B8UODUrcp6 X-Received: by 2002:a17:90b:554f:b0:35a:18b1:c245 with SMTP id 98e67ed59e1d1-36491f6c91fmr7853015a91.3.1777466144094; Wed, 29 Apr 2026 05:35:44 -0700 (PDT) Received: from visitorckw-work01.c.googlers.com.com (32.237.80.34.bc.googleusercontent.com. [34.80.237.32]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-364a419c9a6sm2261855a91.7.2026.04.29.05.35.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2026 05:35:43 -0700 (PDT) From: Kuan-Wei Chiu To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, eddyz87@gmail.com, memxor@gmail.com, luke.r.nels@gmail.com, xi.wang@gmail.com, pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu Cc: martin.lau@linux.dev, song@kernel.org, yonghong.song@linux.dev, jolsa@kernel.org, alex@ghiti.fr, jserv@ccns.ncku.edu.tw, eleanor15x@gmail.com, marscheng@google.com, bpf@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Kuan-Wei Chiu Subject: [PATCH bpf-next 3/3] riscv, bpf: Add 32 bit atomic operations to RV32 JIT Date: Wed, 29 Apr 2026 12:35:13 +0000 Message-ID: <20260429123513.3477780-4-visitorckw@gmail.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog In-Reply-To: <20260429123513.3477780-1-visitorckw@gmail.com> References: <20260429123513.3477780-1-visitorckw@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: quoted-printable Content-Type: text/plain; charset="utf-8" The RV32 BPF JIT compiler currently only supports the BPF_ADD atomic operation. Other 32 bit atomic operations (and, or, xor, xchg) and their BPF_FETCH variants are not supported and gracefully fall back to the interpreter. Since the RISC-V A extension is required for Linux on RV32, we can natively support these 32-bit BPF atomic operations by mapping them directly to the corresponding RISC-V amo*.w instructions. Implement BPF_ADD, BPF_AND, BPF_OR, BPF_XOR, and BPF_XCHG with and without BPF_FETCH. BPF_CMPXCHG requires a more complex lr.w/sc.w loop and is left to fall back to the interpreter. Before this patch: [ 138.862161] test_bpf: Summary: 1054 PASSED, 0 FAILED, [843/1042 JIT'ed] After this patch: [ 157.024124] test_bpf: Summary: 1054 PASSED, 0 FAILED, [902/1042 JIT'ed] Signed-off-by: Kuan-Wei Chiu --- arch/riscv/net/bpf_jit_comp32.c | 47 +++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/arch/riscv/net/bpf_jit_comp32.c b/arch/riscv/net/bpf_jit_comp3= 2.c index f8509950fed4..710c56b20f98 100644 --- a/arch/riscv/net/bpf_jit_comp32.c +++ b/arch/riscv/net/bpf_jit_comp32.c @@ -877,7 +877,7 @@ static int emit_load_r64(const s8 *dst, const s8 *src, = s16 off, =20 static int emit_store_r64(const s8 *dst, const s8 *src, s16 off, struct rv_jit_context *ctx, const u8 size, - const u8 mode) + const u8 mode, s32 imm) { const s8 *tmp1 =3D bpf2rv32[TMP_REG_1]; const s8 *tmp2 =3D bpf2rv32[TMP_REG_2]; @@ -902,11 +902,40 @@ static int emit_store_r64(const s8 *dst, const s8 *sr= c, s16 off, case BPF_MEM: emit(rv_sw(RV_REG_T0, 0, lo(rs)), ctx); break; - case BPF_ATOMIC: /* Only BPF_ADD supported */ - emit(rv_amoadd_w(RV_REG_ZERO, lo(rs), RV_REG_T0, 0, 0), - ctx); + case BPF_ATOMIC: + { + s8 fetch_reg =3D (imm & BPF_FETCH) ? lo(rs) : RV_REG_ZERO; + + switch (imm) { + case BPF_ADD: + case BPF_ADD | BPF_FETCH: + emit(rv_amoadd_w(fetch_reg, lo(rs), RV_REG_T0, 0, 0), ctx); + break; + case BPF_AND: + case BPF_AND | BPF_FETCH: + emit(rv_amoand_w(fetch_reg, lo(rs), RV_REG_T0, 0, 0), ctx); + break; + case BPF_OR: + case BPF_OR | BPF_FETCH: + emit(rv_amoor_w(fetch_reg, lo(rs), RV_REG_T0, 0, 0), ctx); + break; + case BPF_XOR: + case BPF_XOR | BPF_FETCH: + emit(rv_amoxor_w(fetch_reg, lo(rs), RV_REG_T0, 0, 0), ctx); + break; + case BPF_XCHG: + emit(rv_amoswap_w(fetch_reg, lo(rs), RV_REG_T0, 0, 0), ctx); + break; + default: + return -1; + } + if (imm & BPF_FETCH) { + emit(rv_addi(hi(rs), RV_REG_ZERO, 0), ctx); + bpf_put_reg64(src, rs, ctx); + } break; } + } break; case BPF_DW: emit(rv_sw(RV_REG_T0, 0, lo(rs)), ctx); @@ -1308,20 +1337,16 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, = struct rv_jit_context *ctx, } =20 if (emit_store_r64(dst, src, off, ctx, BPF_SIZE(code), - BPF_MODE(code))) + BPF_MODE(code), 0)) return -1; break; =20 case BPF_STX | BPF_ATOMIC | BPF_W: - if (insn->imm !=3D BPF_ADD) { - pr_info_once( - "bpf-jit: not supported: atomic operation %02x ***\n", - insn->imm); + if (insn->imm =3D=3D BPF_CMPXCHG) return -EFAULT; - } =20 if (emit_store_r64(dst, src, off, ctx, BPF_SIZE(code), - BPF_MODE(code))) + BPF_MODE(code), insn->imm)) return -1; break; =20 --=20 2.54.0.545.g6539524ca2-goog