Netdev Archive on lore.kernel.org help / color / mirror / Atom feed
From: Johan Almbladh <johan.almbladh@anyfinetworks.com> To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org Cc: kafai@fb.com, songliubraving@fb.com, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, illusionist.neo@gmail.com, zlim.lnx@gmail.com, paulburton@kernel.org, naveen.n.rao@linux.ibm.com, sandipan@linux.ibm.com, luke.r.nels@gmail.com, bjorn@kernel.org, iii@linux.ibm.com, hca@linux.ibm.com, gor@linux.ibm.com, davem@davemloft.net, udknight@gmail.com, Johan Almbladh <johan.almbladh@anyfinetworks.com> Subject: [PATCH bpf-next 2/7] arm64: bpf: Fix off-by-one in tail call count limiting Date: Mon, 9 Aug 2021 11:34:32 +0200 [thread overview] Message-ID: <20210809093437.876558-3-johan.almbladh@anyfinetworks.com> (raw) In-Reply-To: <20210809093437.876558-1-johan.almbladh@anyfinetworks.com> Before, the eBPF JIT allowed up to MAX_TAIL_CALL_CNT + 1 tail calls. Now, precisely MAX_TAIL_CALL_CNT is allowed, which is in line with the behaviour of the interpreter. Verified with the test_bpf test suite on qemu-system-aarch64. Signed-off-by: Johan Almbladh <johan.almbladh@anyfinetworks.com> --- arch/arm64/net/bpf_jit_comp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c index 41c23f474ea6..cda53e33bbec 100644 --- a/arch/arm64/net/bpf_jit_comp.c +++ b/arch/arm64/net/bpf_jit_comp.c @@ -286,11 +286,11 @@ static int emit_bpf_tail_call(struct jit_ctx *ctx) emit(A64_CMP(0, r3, tmp), ctx); emit(A64_B_(A64_COND_CS, jmp_offset), ctx); - /* if (tail_call_cnt > MAX_TAIL_CALL_CNT) + /* if (tail_call_cnt >= MAX_TAIL_CALL_CNT) * goto out; * tail_call_cnt++; */ - emit_a64_mov_i64(tmp, MAX_TAIL_CALL_CNT, ctx); + emit_a64_mov_i64(tmp, MAX_TAIL_CALL_CNT - 1, ctx); emit(A64_CMP(1, tcc, tmp), ctx); emit(A64_B_(A64_COND_HI, jmp_offset), ctx); emit(A64_ADD_I(1, tcc, tcc, 1), ctx); -- 2.25.1
next prev parent reply other threads:[~2021-08-09 9:35 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-09 9:34 [PATCH bpf-next 0/7] Fix MAX_TAIL_CALL_CNT handling in eBPF JITs Johan Almbladh 2021-08-09 9:34 ` [PATCH bpf-next 1/7] arm: bpf: Fix off-by-one in tail call count limiting Johan Almbladh 2021-08-09 9:34 ` Johan Almbladh [this message] 2021-08-09 9:34 ` [PATCH bpf-next 3/7] powerpc: " Johan Almbladh 2021-08-09 9:34 ` [PATCH bpf-next 4/7] s390: " Johan Almbladh 2021-08-09 12:24 ` Ilya Leoshkevich 2021-08-09 21:09 ` Johan Almbladh 2021-08-09 9:34 ` [PATCH bpf-next 5/7] sparc: " Johan Almbladh 2021-08-09 9:34 ` [PATCH bpf-next 6/7] mips: " Johan Almbladh 2021-08-09 9:34 ` [PATCH bpf-next 7/7] x86: bpf: Fix comments on " Johan Almbladh 2021-08-09 15:41 ` Daniel Borkmann 2021-08-09 18:02 ` Johan Almbladh 2021-08-12 16:36 ` [PATCH bpf-next 0/7] Fix MAX_TAIL_CALL_CNT handling in eBPF JITs Paul Chaignon 2021-08-16 7:17 ` Johan Almbladh
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=20210809093437.876558-3-johan.almbladh@anyfinetworks.com \ --to=johan.almbladh@anyfinetworks.com \ --cc=andrii@kernel.org \ --cc=ast@kernel.org \ --cc=bjorn@kernel.org \ --cc=bpf@vger.kernel.org \ --cc=daniel@iogearbox.net \ --cc=davem@davemloft.net \ --cc=gor@linux.ibm.com \ --cc=hca@linux.ibm.com \ --cc=iii@linux.ibm.com \ --cc=illusionist.neo@gmail.com \ --cc=john.fastabend@gmail.com \ --cc=kafai@fb.com \ --cc=kpsingh@kernel.org \ --cc=luke.r.nels@gmail.com \ --cc=naveen.n.rao@linux.ibm.com \ --cc=netdev@vger.kernel.org \ --cc=paulburton@kernel.org \ --cc=sandipan@linux.ibm.com \ --cc=songliubraving@fb.com \ --cc=udknight@gmail.com \ --cc=yhs@fb.com \ --cc=zlim.lnx@gmail.com \ /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: linkBe 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; as well as URLs for NNTP newsgroup(s).