From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) (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 389C237DE84 for ; Fri, 5 Jun 2026 23:22:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780701764; cv=none; b=SqIwt2z1DiiklM8GA0FM2ZIVAmqMrN8b+N1HHBomVUAtnY2GTgTxWX8Y4gQWXvr7WtzzhAZbqvQXVOWWTeF6cRuxqXXCJE926wWVWaN90WXvDnE4t7nmuqTUP5qU0ImkF7YzobSf47wNBII5KfFC/wdZs5Fx2LHvemUIq8gKLzc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780701764; c=relaxed/simple; bh=+5eZIOiTkTTm8e0Em/sbC0u1KG8mFxpCqT6763nvZZc=; h=Mime-Version:Content-Type:Date:Message-Id:Cc:Subject:From:To: References:In-Reply-To; b=XEYfPbEiAj+OQEwWm0FGVZ+rtt6RkRlnznVzlU73PwR8es/C2omTprX7UhbnUccsWLq3+xmlz1mauGlkmUzPBm1BGjVH+Oj5uMJA+HBzJDHrXaKntUnEesLNs6JFO9L7SbprgEzjKt0qNYjy9fkOeU16cPvEbWLso6kwVlOzm3U= 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=Wklcnt+h; arc=none smtp.client-ip=209.85.210.43 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="Wklcnt+h" Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-7e71b2d527dso212689a34.1 for ; Fri, 05 Jun 2026 16:22:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780701761; x=1781306561; darn=vger.kernel.org; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-transfer-encoding:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=2k7U07qtwbFmbaheJUqoAwqTh+vQ4LcZsVmb0igPq1c=; b=Wklcnt+hU6Bjl3tdyqqI8j1t/GGH2HX8gIGW/sjKPmdKxDPEq12RIt7a1/hfk/fMXv QsHoSEGYyAuxUf6BVwhB75PZhYY4LANP6XAZC3OkiIQEuI0gKRVkEWTdur4Tjbh8asrO 40eLEJg++FgAPp586dGpwaTk0iPIaJ84hS4AVC0e34J/MWAxIQXc9OxYWxWqKh+K6HW9 NeLLAOAhkrjt3RWRvD5xmCp7T4NZYR7iivsFyKwrYKJ8bD+FIzP9J7Sq1ua7LuwdC0B2 HK/HSpduok2/kkJrqgdbx+vZFd0vdn2g1H3a4mZyabbFjvfFL0dwpIkqcaWTcMMWPKmD wqMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780701761; x=1781306561; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-transfer-encoding:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=2k7U07qtwbFmbaheJUqoAwqTh+vQ4LcZsVmb0igPq1c=; b=mzf79LwCCCBrr62B4TNfRtXAODGVyix6hJe+cCQ4e/G9lI3pZqM+1nSWkyVHqMrfIj Hp2978sJHmY+TAFC1jLabGkvHGaevZBEUf7pH+k5aYKp+p3yN6dOf6XBgFEzQAJXYOL1 q35D0ikZIcKtC088B8YTQkyqM2LP79Lh/i1n4sFkb00dRu4dH1u8+IIgtF8M+nJfUpaF yWLCjFewkX9geCZe7YgAt6dlmOuVG5Uj+2Rs90e4JjbgYGO0VVOgke8E+YFGzE7+xHEc 3EklqEQw9A72hSTNtpdlG/8yUPhvU56rvZegy5PFwxkvn6BpnhYECXldRJA3nqGzmrFX NJ9g== X-Forwarded-Encrypted: i=1; AFNElJ9ZyO6St3jxYxJDz2mMcQr8nrLs4swpAsDCikUcJR+QoodVveqSLT7N8y1kYu4jY1JyKBI=@vger.kernel.org X-Gm-Message-State: AOJu0YwYgFwpAyBLE7P6XSLh1dHFMsVEVFB6KtfHp7/dt5S4SOYlKfNz +DJ/M6YE2hoBOxUHPXWrjImW1ZJDUB3p+Jn6dZnpn55xXYUFNYlT0MMH X-Gm-Gg: Acq92OFNvA7CIKBkcqF29qnZBcvAJ8KZXL7tBrBBEvR7rl6HEYUCso5tV/FyD1dcQBi jTAaSohuubzWFV4/Eh2MsKiwDXkJVdAsF/Y0UXUBJJG4uSwKR9Bp93BvXSyGUs6M/16+TUf1OXi JvnWO/XE2Dt+bcZxbX17xl2Ug7D5aHOBlXorKVGwj4Dx6J1qzw0bH2uhH0oD9X/8VtfSYhivLos i4gX5UDs+99mg+zFzPKRYdWuNo5Hg6T3fMDCGoVsW7T9Mt6FqpgH0ptJ6SsK7fJ3F3IMOs2R022 eZYmXW8WIYiILOktqDp5W1B4R1lU7mAAjvBCVTV3w0GhPwpTg8OpzTzLqobPZ12uJJWXTI7FmJF mWOb8nsqirvE0v29ynWBvQ72D3CI7hd1lyUFZ0Vw43ghkKJcC94NL7e33aY5celt267mQUWaGFu guU1Ov39FGJ3Si7DzHUe7jrRQFjR2EYI2PqR5qbfE9PnqNGP4H02NMa+E7UyOgT5P2Pc3vx30zE sxbmt4wR82NjTpTlUEm8eo1T3jO X-Received: by 2002:a05:6830:82bb:b0:7de:4fc6:a588 with SMTP id 46e09a7af769-7e70ca7b3c2mr3388171a34.23.1780701761185; Fri, 05 Jun 2026 16:22:41 -0700 (PDT) Received: from localhost ([2a03:2880:10ff:4d::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7e6e745fea5sm6605643a34.5.2026.06.05.16.22.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 05 Jun 2026 16:22:40 -0700 (PDT) Precedence: bulk X-Mailing-List: bpf@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 Date: Fri, 05 Jun 2026 16:22:39 -0700 Message-Id: Cc: , "Bastien Curutchet" , "Thomas Petazzoni" , , , , , Subject: Re: [PATCH bpf-next v2 4/8] bpf, x86: refactor BPF_ST management in do_jit From: "Alexei Starovoitov" To: =?utf-8?b?QWxleGlzIExvdGhvcsOpIChlQlBGIEZvdW5kYXRpb24p?= , "Alexei Starovoitov" , "Daniel Borkmann" , "Andrii Nakryiko" , "Martin KaFai Lau" , "Eduard Zingerman" , "Kumar Kartikeya Dwivedi" , "Song Liu" , "Yonghong Song" , "Jiri Olsa" , "John Fastabend" , "Thomas Gleixner" , "Ingo Molnar" , "Borislav Petkov" , "Dave Hansen" , , "H. Peter Anvin" , "Shuah Khan" , "Maxime Coquelin" , "Alexandre Torgue" , "Ihor Solodrai" X-Mailer: aerc References: <20260604-kasan-v2-0-c066e627fda8@bootlin.com> <20260604-kasan-v2-4-c066e627fda8@bootlin.com> In-Reply-To: <20260604-kasan-v2-4-c066e627fda8@bootlin.com> On Thu Jun 4, 2026 at 1:22 PM PDT, Alexis Lothor=C3=A9 (eBPF Foundation) wr= ote: > In order to prepare for KASAN checks insertion before every > memory-related load or store, group all BPF_ST instructions that indeed > access memory in a single block of fall-through cases to allow > instrumenting those in one call, rather than having to instrument all > cases individually. > > Signed-off-by: Alexis Lothor=C3=A9 (eBPF Foundation) > --- > arch/x86/net/bpf_jit_comp.c | 53 ++++++++++++++++++++++++++-------------= ------ > 1 file changed, 31 insertions(+), 22 deletions(-) > > diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c > index 0981791014eb..943a0f315cf2 100644 > --- a/arch/x86/net/bpf_jit_comp.c > +++ b/arch/x86/net/bpf_jit_comp.c > @@ -2300,41 +2300,50 @@ static int do_jit(struct bpf_verifier_env *env, s= truct bpf_prog *bpf_prog, int * > EMIT_LFENCE(); > break; > =20 > - /* ST: *(u8*)(dst_reg + off) =3D imm */ > case BPF_ST | BPF_MEM | BPF_B: > - if (is_ereg(dst_reg)) > - EMIT2(0x41, 0xC6); > - else > - EMIT1(0xC6); > - goto st; > case BPF_ST | BPF_MEM | BPF_H: > - if (is_ereg(dst_reg)) > - EMIT3(0x66, 0x41, 0xC7); > - else > - EMIT2(0x66, 0xC7); > - goto st; > case BPF_ST | BPF_MEM | BPF_W: > - if (is_ereg(dst_reg)) > - EMIT2(0x41, 0xC7); > - else > - EMIT1(0xC7); > - goto st; > case BPF_ST | BPF_MEM | BPF_DW: > - if (dst_reg =3D=3D BPF_REG_PARAMS && insn->off =3D=3D -8) { > - /* Arg 6: store immediate in r9 register */ > - emit_mov_imm64(&prog, X86_REG_R9, imm32 >> 31, (u32)imm32); > + switch (BPF_SIZE(insn->code)) { > + case BPF_B: > + if (is_ereg(dst_reg)) > + EMIT2(0x41, 0xC6); > + else > + EMIT1(0xC6); > + break; > + case BPF_H: > + if (is_ereg(dst_reg)) > + EMIT3(0x66, 0x41, 0xC7); > + else > + EMIT2(0x66, 0xC7); > + break; > + case BPF_W: > + if (is_ereg(dst_reg)) > + EMIT2(0x41, 0xC7); > + else > + EMIT1(0xC7); > + break; > + case BPF_DW: > + if (dst_reg =3D=3D BPF_REG_PARAMS && > + insn->off =3D=3D -8) { > + /* Arg 6: store immediate in r9 register */ > + emit_mov_imm64(&prog, X86_REG_R9, > + imm32 >> 31, (u32)imm32); > + break; > + } > + EMIT2(add_1mod(0x48, dst_reg), 0xC7); maybe it's an opportunity to cover this into separate helper function? When indent reaches 4 tabs it's about time.