From: Qian Cai <cai@lca.pw>
To: Jean-Philippe Brucker <jean-philippe@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org, bpf@vger.kernel.org,
songliubraving@fb.com, andriin@fb.com, daniel@iogearbox.net,
catalin.marinas@arm.com, john.fastabend@gmail.com,
ast@kernel.org, zlim.lnx@gmail.com, kpsingh@chromium.org,
yhs@fb.com, will@kernel.org, kafai@fb.com, sfr@canb.auug.org.au,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH bpf-next 1/1] arm64: bpf: Add BPF exception tables
Date: Thu, 30 Jul 2020 08:28:56 -0400 [thread overview]
Message-ID: <20200730122855.GA3773@lca.pw> (raw)
In-Reply-To: <20200728152122.1292756-2-jean-philippe@linaro.org>
On Tue, Jul 28, 2020 at 05:21:26PM +0200, Jean-Philippe Brucker wrote:
> When a tracing BPF program attempts to read memory without using the
> bpf_probe_read() helper, the verifier marks the load instruction with
> the BPF_PROBE_MEM flag. Since the arm64 JIT does not currently recognize
> this flag it falls back to the interpreter.
>
> Add support for BPF_PROBE_MEM, by appending an exception table to the
> BPF program. If the load instruction causes a data abort, the fixup
> infrastructure finds the exception table and fixes up the fault, by
> clearing the destination register and jumping over the faulting
> instruction.
>
> To keep the compact exception table entry format, inspect the pc in
> fixup_exception(). A more generic solution would add a "handler" field
> to the table entry, like on x86 and s390.
>
> Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
This will fail to compile on arm64,
https://gitlab.com/cailca/linux-mm/-/blob/master/arm64.config
arch/arm64/mm/extable.o: In function `fixup_exception':
arch/arm64/mm/extable.c:19: undefined reference to `arm64_bpf_fixup_exception'
> ---
> Note: the extable is aligned on 32 bits. Given that extable entries have
> 32-bit members I figured we don't need to align it to 64 bits.
> ---
> arch/arm64/include/asm/extable.h | 3 ++
> arch/arm64/mm/extable.c | 11 ++--
> arch/arm64/net/bpf_jit_comp.c | 93 +++++++++++++++++++++++++++++---
> 3 files changed, 98 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm64/include/asm/extable.h b/arch/arm64/include/asm/extable.h
> index 56a4f68b262e..bcee40df1586 100644
> --- a/arch/arm64/include/asm/extable.h
> +++ b/arch/arm64/include/asm/extable.h
> @@ -22,5 +22,8 @@ struct exception_table_entry
>
> #define ARCH_HAS_RELATIVE_EXTABLE
>
> +int arm64_bpf_fixup_exception(const struct exception_table_entry *ex,
> + struct pt_regs *regs);
> +
> extern int fixup_exception(struct pt_regs *regs);
> #endif
> diff --git a/arch/arm64/mm/extable.c b/arch/arm64/mm/extable.c
> index 81e694af5f8c..1f42991cacdd 100644
> --- a/arch/arm64/mm/extable.c
> +++ b/arch/arm64/mm/extable.c
> @@ -11,8 +11,13 @@ int fixup_exception(struct pt_regs *regs)
> const struct exception_table_entry *fixup;
>
> fixup = search_exception_tables(instruction_pointer(regs));
> - if (fixup)
> - regs->pc = (unsigned long)&fixup->fixup + fixup->fixup;
> + if (!fixup)
> + return 0;
>
> - return fixup != NULL;
> + if (regs->pc >= BPF_JIT_REGION_START &&
> + regs->pc < BPF_JIT_REGION_END)
> + return arm64_bpf_fixup_exception(fixup, regs);
> +
> + regs->pc = (unsigned long)&fixup->fixup + fixup->fixup;
> + return 1;
> }
> diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
> index 3cb25b43b368..f8912e45be7a 100644
> --- a/arch/arm64/net/bpf_jit_comp.c
> +++ b/arch/arm64/net/bpf_jit_comp.c
> @@ -7,6 +7,7 @@
>
> #define pr_fmt(fmt) "bpf_jit: " fmt
>
> +#include <linux/bitfield.h>
> #include <linux/bpf.h>
> #include <linux/filter.h>
> #include <linux/printk.h>
> @@ -56,6 +57,7 @@ struct jit_ctx {
> int idx;
> int epilogue_offset;
> int *offset;
> + int exentry_idx;
> __le32 *image;
> u32 stack_size;
> };
> @@ -351,6 +353,67 @@ static void build_epilogue(struct jit_ctx *ctx)
> emit(A64_RET(A64_LR), ctx);
> }
>
> +#define BPF_FIXUP_OFFSET_MASK GENMASK(26, 0)
> +#define BPF_FIXUP_REG_MASK GENMASK(31, 27)
> +
> +int arm64_bpf_fixup_exception(const struct exception_table_entry *ex,
> + struct pt_regs *regs)
> +{
> + off_t offset = FIELD_GET(BPF_FIXUP_OFFSET_MASK, ex->fixup);
> + int dst_reg = FIELD_GET(BPF_FIXUP_REG_MASK, ex->fixup);
> +
> + regs->regs[dst_reg] = 0;
> + regs->pc = (unsigned long)&ex->fixup - offset;
> + return 1;
> +}
> +
[]
next prev parent reply other threads:[~2020-07-30 12:29 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 15:21 [PATCH bpf-next 0/1] arm64: Add BPF exception tables Jean-Philippe Brucker
2020-07-28 15:21 ` [PATCH bpf-next 1/1] arm64: bpf: " Jean-Philippe Brucker
2020-07-29 17:28 ` Song Liu
2020-07-29 21:29 ` Daniel Borkmann
2020-07-30 8:28 ` Jean-Philippe Brucker
2020-07-30 12:28 ` Qian Cai [this message]
2020-07-30 14:22 ` Jean-Philippe Brucker
2020-07-30 19:47 ` Daniel Borkmann
2020-07-30 21:14 ` Jean-Philippe Brucker
2020-07-30 22:45 ` Daniel Borkmann
2021-06-09 12:04 ` [PATCH bpf-next 0/1] arm64: " Ravi Bangoria
2021-06-11 0:12 ` Alexei Starovoitov
2021-06-17 6:58 ` Ravi Bangoria
2021-06-18 16:34 ` Alexei Starovoitov
2021-06-22 7:10 ` Ravi Bangoria
2021-06-22 11:00 ` [PATCH] x86 bpf: Fix extable offset calculation Ravi Bangoria
2021-06-25 4:01 ` Alexei Starovoitov
2021-06-25 6:22 ` Ravi Bangoria
2021-06-25 15:07 ` Alexei Starovoitov
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=20200730122855.GA3773@lca.pw \
--to=cai@lca.pw \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=catalin.marinas@arm.com \
--cc=daniel@iogearbox.net \
--cc=jean-philippe@linaro.org \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=songliubraving@fb.com \
--cc=will@kernel.org \
--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: 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;
as well as URLs for NNTP newsgroup(s).