From mboxrd@z Thu Jan 1 00:00:00 1970 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: 8bit 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_comp32.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, 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 = bpf2rv32[TMP_REG_1]; const s8 *tmp2 = bpf2rv32[TMP_REG_2]; @@ -902,11 +902,40 @@ static int emit_store_r64(const s8 *dst, const s8 *src, 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 = (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, } if (emit_store_r64(dst, src, off, ctx, BPF_SIZE(code), - BPF_MODE(code))) + BPF_MODE(code), 0)) return -1; break; case BPF_STX | BPF_ATOMIC | BPF_W: - if (insn->imm != BPF_ADD) { - pr_info_once( - "bpf-jit: not supported: atomic operation %02x ***\n", - insn->imm); + if (insn->imm == BPF_CMPXCHG) return -EFAULT; - } if (emit_store_r64(dst, src, off, ctx, BPF_SIZE(code), - BPF_MODE(code))) + BPF_MODE(code), insn->imm)) return -1; break; -- 2.54.0.545.g6539524ca2-goog