From nobody Sat Jul 25 16:20:55 2026 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B23C0175A8D; Thu, 16 Jul 2026 06:15:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784182555; cv=none; b=m9JWRXus3evJJC2XnKmhNU2FmCHfIdWz2DFmLb6uD7O2k+KIUEQKyqsCJSfsKcT+5SNe0q5vffBqCyGhjnFSH607p9QoWHXclPpdVMgMUrY8CA2nsHquLNyyY/L4502GCrTXSp01GaTz9Vm/2BRFP70mP3BVG0jOAOalGzDb8zs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784182555; c=relaxed/simple; bh=7a4Oy8AtO+ngLFVnZ6dxvjwNuktLmyVCFYBimXpcMuo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=L5N9jbdkijQWW0KXPqxe293iJ8WBsLODrhTQMnvFXpIA5dUvfQdb6fazJYZl/y533caIfUumEBMUZHrByF2MsvFyQhwE27X1GT+OzZaM+n9sEGW8vZUQLnN4WFy1o/aTz1srZTkFKEyfzL33ZwImcbcjkhg7WuMdU7EitV3vYdU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: c218fede80dd11f1aa26b74ffac11d73-20260716 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:24b7af87-80c9-4755-b3af-78c446906130,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:e7bac3a,CLOUDID:35e991e9ada5afe51c5d0e6d5ad49dda,BulkI D:nil,BulkQuantity:0,Recheck:0,SF:102|850|865|898,TC:nil,Content:0|15|50,E DM:-3,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA :0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: c218fede80dd11f1aa26b74ffac11d73-20260716 X-User: jiangfeng@kylinos.cn Received: from [127.0.0.1] [(10.44.16.150)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 1448846488; Thu, 16 Jul 2026 14:15:35 +0800 From: Feng Jiang Date: Thu, 16 Jul 2026 06:15:18 +0000 Subject: [PATCH] bpf, riscv: fix missing extable entry for arena load_acquire Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260716-bpf-riscv-fix-extable-v1-1-af023cc17af4@kylinos.cn> X-B4-Tracking: v=1; b=H4sIAPV2WGoC/x2MQQqAIBAAvxJ7bkErNPtKdDBdayEsNCKI/p50H IaZBzIlpgxD9UCiizPvsYCsK3CrjQsh+8LQiEYJLRXOR8DE2V0Y+Ea6TztvhK0xptPOat17KO2 RqOj/O07v+wG3YW9BZwAAAA== X-Change-ID: 20260716-bpf-riscv-fix-extable-399947ca778d To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , =?utf-8?q?Bj=C3=B6rn_T=C3=B6pel?= , Pu Lehui , Puranjay Mohan , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti Cc: =?utf-8?q?Bj=C3=B6rn_T=C3=B6pel?= , bpf@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Feng Jiang X-Mailer: b4 0.14.3 emit_atomic_ld_st() returns 1 to have build_body() skip the zext after a sub-word load_acquire. The caller does "ret =3D ret ?: add_exception_handler(...)", which skips add_exception_handler() on any non-zero ret, so the extable entry is missing and a faulting PROBE_ATOMIC load_acquire oopses. Check ret >=3D 0 before calling add_exception_handler(), and return ret unchanged so build_body() still skips the zext. Fixes: fb7cefabae81 ("riscv, bpf: Add support arena atomics for RV64") Signed-off-by: Feng Jiang --- arch/riscv/net/bpf_jit_comp64.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp6= 4.c index f9d5347ba966..4fd4392dd080 100644 --- a/arch/riscv/net/bpf_jit_comp64.c +++ b/arch/riscv/net/bpf_jit_comp64.c @@ -1986,10 +1986,14 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, = struct rv_jit_context *ctx, else ret =3D emit_atomic_rmw(rd, rs, insn, ctx); =20 - ret =3D ret ?: add_exception_handler(insn, REG_DONT_CLEAR_MARKER, ctx); - if (ret) - return ret; - break; + /* ret can be 1 (skip-zext); extable entry still needs to be added */ + if (ret >=3D 0) { + int err =3D add_exception_handler(insn, REG_DONT_CLEAR_MARKER, ctx); + + if (err) + return err; + } + return ret; =20 default: pr_err("bpf-jit: unknown opcode %02x\n", code); --- base-commit: a13c140cc289c0b7b3770bce5b3ad42ab35074aa change-id: 20260716-bpf-riscv-fix-extable-399947ca778d Best regards, --=20 Feng Jiang