diff options
| author | Ilya Leoshkevich <iii@linux.ibm.com> | 2024-07-02 01:40:23 +0200 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2024-07-02 18:31:52 +0200 |
| commit | a1c04bcc41f9638460a9c68f894fb770596380de (patch) | |
| tree | 8330aff9f78be2e20a012c4c71820e884833eba1 | |
| parent | s390/bpf: Introduce pre- and post- probe functions (diff) | |
| download | linux-a1c04bcc41f9638460a9c68f894fb770596380de.tar.xz linux-a1c04bcc41f9638460a9c68f894fb770596380de.zip | |
s390/bpf: Land on the next JITed instruction after exception
Currently we land on the nop, which is unnecessary: we can just as well
begin executing the next instruction. Furthermore, the upcoming arena
support for the loop-based BPF_XCHG implementation will require landing
on an instruction that comes after the loop.
So land on the next JITed instruction, which covers both cases.
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20240701234304.14336-6-iii@linux.ibm.com
| -rw-r--r-- | arch/s390/net/bpf_jit_comp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c index 582fa3830772..ecd53f8f0602 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c @@ -747,10 +747,11 @@ static int bpf_jit_probe_post(struct bpf_jit *jit, struct bpf_prog *fp, return -1; ex->insn = delta; /* - * Always land on the nop. Note that extable infrastructure - * ignores fixup field, it is handled by ex_handler_bpf(). + * Land on the current instruction. Note that the extable + * infrastructure ignores the fixup field; it is handled by + * ex_handler_bpf(). */ - delta = jit->prg_buf + probe->nop_prg - (u8 *)&ex->fixup; + delta = jit->prg_buf + jit->prg - (u8 *)&ex->fixup; if (WARN_ON_ONCE(delta < INT_MIN || delta > INT_MAX)) /* JIT bug - landing pad and extable must be close. */ return -1; |