From: Nicholas Dudar <main.kalliope@gmail.com>
To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
eddyz87@gmail.com, memxor@gmail.com, udknight@gmail.com,
tglx@kernel.org, mingo@redhat.com, bp@alien8.de,
dave.hansen@linux.intel.com, x86@kernel.org
Cc: martin.lau@linux.dev, song@kernel.org, yonghong.song@linux.dev,
jolsa@kernel.org, emil@etsalapatis.com, ihor.solodrai@linux.dev,
hpa@zytor.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org,
visitorckw@gmail.com
Subject: [PATCH bpf-next 2/5] bpf, x86: Extract the i386 JIT load emitter
Date: Mon, 14 Sep 2026 22:13:35 -0400 [thread overview]
Message-ID: <20260915021338.1520964-3-main.kalliope@gmail.com> (raw)
In-Reply-To: <20260915021338.1520964-1-main.kalliope@gmail.com>
Move ordinary LDX lowering into an instruction-owned helper. Keep address
staging, displacement encoding and register-pair completion together,
including verifier-managed zero extension for narrow loads.
Use the helper for the existing BPF_MEM cases before adding signed loads.
This separates the code movement from the MEMSX instruction handling.
The emitted instructions are preserved.
Assisted-by: Codex:gpt-6
Signed-off-by: Nicholas Dudar <main.kalliope@gmail.com>
---
arch/x86/net/bpf_jit_comp32.c | 148 +++++++++++++++++++---------------
1 file changed, 84 insertions(+), 64 deletions(-)
diff --git a/arch/x86/net/bpf_jit_comp32.c b/arch/x86/net/bpf_jit_comp32.c
index 9cbeabac4f27..6839c233cb73 100644
--- a/arch/x86/net/bpf_jit_comp32.c
+++ b/arch/x86/net/bpf_jit_comp32.c
@@ -1214,6 +1214,89 @@ static inline void emit_ia32_mul_i64(const u8 dst[], const u32 val,
*pprog = prog;
}
+static void emit_ia32_ldx(const struct bpf_insn *insn, u8 **pprog,
+ const struct bpf_prog_aux *aux)
+{
+ const u8 *dst = bpf2ia32[insn->dst_reg];
+ const u8 *src = bpf2ia32[insn->src_reg];
+ bool dstk = insn->dst_reg != BPF_REG_AX;
+ bool sstk = insn->src_reg != BPF_REG_AX;
+ u8 *prog = *pprog;
+ int cnt = 0;
+
+ /* Stage the address in EAX; dst may alias src. */
+ if (sstk)
+ /* mov eax,dword ptr [ebp+off] */
+ EMIT3(0x8B, add_2reg(0x40, IA32_EBP, IA32_EAX),
+ STACK_VAR(src_lo));
+ else
+ /* mov eax,src_lo */
+ EMIT2(0x8B, add_2reg(0xC0, src_lo, IA32_EAX));
+
+ switch (BPF_SIZE(insn->code)) {
+ case BPF_B:
+ /* movzx edx,byte ptr [eax+off] */
+ EMIT2(0x0F, 0xB6);
+ break;
+ case BPF_H:
+ /* movzx edx,word ptr [eax+off] */
+ EMIT2(0x0F, 0xB7);
+ break;
+ case BPF_W:
+ case BPF_DW:
+ /* mov edx,dword ptr [eax+off] */
+ EMIT1(0x8B);
+ break;
+ }
+
+ if (is_imm8(insn->off))
+ EMIT2(add_2reg(0x40, IA32_EAX, IA32_EDX), insn->off);
+ else
+ EMIT1_off32(add_2reg(0x80, IA32_EAX, IA32_EDX), insn->off);
+
+ if (dstk)
+ /* mov dword ptr [ebp+off],edx */
+ EMIT3(0x89, add_2reg(0x40, IA32_EBP, IA32_EDX),
+ STACK_VAR(dst_lo));
+ else
+ /* mov dst_lo,edx */
+ EMIT2(0x89, add_2reg(0xC0, dst_lo, IA32_EDX));
+
+ switch (BPF_SIZE(insn->code)) {
+ case BPF_B:
+ case BPF_H:
+ case BPF_W:
+ if (aux->verifier_zext)
+ break;
+ if (dstk) {
+ /* mov dword ptr [ebp+off],0 */
+ EMIT3(0xC7, add_1reg(0x40, IA32_EBP),
+ STACK_VAR(dst_hi));
+ EMIT(0x0, 4);
+ } else {
+ /* xor dst_hi,dst_hi */
+ EMIT2(0x33, add_2reg(0xC0, dst_hi, dst_hi));
+ }
+ break;
+ case BPF_DW:
+ /* mov edx,dword ptr [eax+off+4] */
+ EMIT2_off32(0x8B, add_2reg(0x80, IA32_EAX, IA32_EDX),
+ insn->off + 4);
+ if (dstk)
+ /* mov dword ptr [ebp+off],edx */
+ EMIT3(0x89, add_2reg(0x40, IA32_EBP, IA32_EDX),
+ STACK_VAR(dst_hi));
+ else
+ /* mov dst_hi,edx */
+ EMIT2(0x89, add_2reg(0xC0, dst_hi, IA32_EDX));
+ break;
+ default:
+ break;
+ }
+
+ *pprog = prog;
+}
+
static int bpf_size_to_x86_bytes(int bpf_size)
{
if (bpf_size == BPF_W)
@@ -2065,70 +2148,7 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,
case BPF_LDX | BPF_MEM | BPF_H:
case BPF_LDX | BPF_MEM | BPF_W:
case BPF_LDX | BPF_MEM | BPF_DW:
- if (sstk)
- /* mov eax,dword ptr [ebp+off] */
- EMIT3(0x8B, add_2reg(0x40, IA32_EBP, IA32_EAX),
- STACK_VAR(src_lo));
- else
- /* mov eax,dword ptr [ebp+off] */
- EMIT2(0x8B, add_2reg(0xC0, src_lo, IA32_EAX));
-
- switch (BPF_SIZE(code)) {
- case BPF_B:
- EMIT2(0x0F, 0xB6); break;
- case BPF_H:
- EMIT2(0x0F, 0xB7); break;
- case BPF_W:
- case BPF_DW:
- EMIT(0x8B, 1); break;
- }
-
- if (is_imm8(insn->off))
- EMIT2(add_2reg(0x40, IA32_EAX, IA32_EDX),
- insn->off);
- else
- EMIT1_off32(add_2reg(0x80, IA32_EAX, IA32_EDX),
- insn->off);
-
- if (dstk)
- /* mov dword ptr [ebp+off],edx */
- EMIT3(0x89, add_2reg(0x40, IA32_EBP, IA32_EDX),
- STACK_VAR(dst_lo));
- else
- /* mov dst_lo,edx */
- EMIT2(0x89, add_2reg(0xC0, dst_lo, IA32_EDX));
- switch (BPF_SIZE(code)) {
- case BPF_B:
- case BPF_H:
- case BPF_W:
- if (bpf_prog->aux->verifier_zext)
- break;
- if (dstk) {
- EMIT3(0xC7, add_1reg(0x40, IA32_EBP),
- STACK_VAR(dst_hi));
- EMIT(0x0, 4);
- } else {
- /* xor dst_hi,dst_hi */
- EMIT2(0x33,
- add_2reg(0xC0, dst_hi, dst_hi));
- }
- break;
- case BPF_DW:
- EMIT2_off32(0x8B,
- add_2reg(0x80, IA32_EAX, IA32_EDX),
- insn->off + 4);
- if (dstk)
- EMIT3(0x89,
- add_2reg(0x40, IA32_EBP,
- IA32_EDX),
- STACK_VAR(dst_hi));
- else
- EMIT2(0x89,
- add_2reg(0xC0, dst_hi, IA32_EDX));
- break;
- default:
- break;
- }
+ emit_ia32_ldx(insn, &prog, bpf_prog->aux);
break;
/* call */
case BPF_JMP | BPF_CALL:
next prev parent reply other threads:[~2026-09-15 2:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-15 2:13 [PATCH bpf-next 0/5] bpf, x86: Extend CPUv4 instruction support in the i386 JIT Nicholas Dudar
2026-09-15 2:13 ` [PATCH bpf-next 1/5] bpf, x86: Add support for BPF_MOVSX " Nicholas Dudar
2026-09-15 3:12 ` bot+bpf-ci
2026-09-15 2:13 ` Nicholas Dudar [this message]
2026-09-15 3:12 ` [PATCH bpf-next 2/5] bpf, x86: Extract the i386 JIT load emitter bot+bpf-ci
2026-09-15 2:13 ` [PATCH bpf-next 3/5] bpf, x86: Add BPF_MEMSX support to the i386 JIT Nicholas Dudar
2026-09-15 2:13 ` [PATCH bpf-next 4/5] bpf, x86: Add BPF_JMP32 | BPF_JA " Nicholas Dudar
2026-09-15 3:12 ` bot+bpf-ci
2026-09-15 2:13 ` [PATCH bpf-next 5/5] bpf, x86: Add unconditional byte swap " Nicholas Dudar
2026-09-15 3:12 ` bot+bpf-ci
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260915021338.1520964-3-main.kalliope@gmail.com \
--to=main.kalliope@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bp@alien8.de \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=dave.hansen@linux.intel.com \
--cc=eddyz87@gmail.com \
--cc=emil@etsalapatis.com \
--cc=hpa@zytor.com \
--cc=ihor.solodrai@linux.dev \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=memxor@gmail.com \
--cc=mingo@redhat.com \
--cc=song@kernel.org \
--cc=tglx@kernel.org \
--cc=udknight@gmail.com \
--cc=visitorckw@gmail.com \
--cc=x86@kernel.org \
--cc=yonghong.song@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®