From: Palmer Dabbelt <palmerdabbelt@google.com>
To: Bjorn Topel <bjorn.topel@gmail.com>
Cc: daniel@iogearbox.net, ast@kernel.org, zlim.lnx@gmail.com,
catalin.marinas@arm.com, will@kernel.org, kafai@fb.com,
songliubraving@fb.com, yhs@fb.com, andriin@fb.com,
shuah@kernel.org, Palmer Dabbelt <palmerdabbelt@google.com>,
netdev@vger.kernel.org, bpf@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
clang-built-linux@googlegroups.com, kernel-team@android.com
Subject: [PATCH 2/4] arm64: bpf: Convert bpf2a64 to a function
Date: Mon, 27 Jan 2020 18:11:43 -0800 [thread overview]
Message-ID: <20200128021145.36774-3-palmerdabbelt@google.com> (raw)
In-Reply-To: <20200128021145.36774-1-palmerdabbelt@google.com>
This patch is intended to change no functionality, it just allows me to more
cleanly add dynamic register mapping later.
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
---
arch/arm64/net/bpf_jit_comp.c | 53 +++++++++++++++++++----------------
1 file changed, 29 insertions(+), 24 deletions(-)
diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
index cdc79de0c794..8eee68705056 100644
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@ -25,7 +25,7 @@
#define TMP_REG_3 (MAX_BPF_JIT_REG + 3)
/* Map BPF registers to A64 registers */
-static const int bpf2a64[] = {
+static const int bpf2a64_default[] = {
/* return value from in-kernel function, and exit value from eBPF */
[BPF_REG_0] = A64_R(7),
/* arguments from eBPF program to in-kernel function */
@@ -60,6 +60,11 @@ struct jit_ctx {
u32 stack_size;
};
+static inline int bpf2a64(struct jit_ctx *ctx, int bpf_reg)
+{
+ return bpf2a64_default[bpf_reg];
+}
+
static inline void emit(const u32 insn, struct jit_ctx *ctx)
{
if (ctx->image != NULL)
@@ -176,12 +181,12 @@ static inline int epilogue_offset(const struct jit_ctx *ctx)
static int build_prologue(struct jit_ctx *ctx, bool ebpf_from_cbpf)
{
const struct bpf_prog *prog = ctx->prog;
- const u8 r6 = bpf2a64[BPF_REG_6];
- const u8 r7 = bpf2a64[BPF_REG_7];
- const u8 r8 = bpf2a64[BPF_REG_8];
- const u8 r9 = bpf2a64[BPF_REG_9];
- const u8 fp = bpf2a64[BPF_REG_FP];
- const u8 tcc = bpf2a64[TCALL_CNT];
+ const u8 r6 = bpf2a64(ctx, BPF_REG_6);
+ const u8 r7 = bpf2a64(ctx, BPF_REG_7);
+ const u8 r8 = bpf2a64(ctx, BPF_REG_8);
+ const u8 r9 = bpf2a64(ctx, BPF_REG_9);
+ const u8 fp = bpf2a64(ctx, BPF_REG_FP);
+ const u8 tcc = bpf2a64(ctx, TCALL_CNT);
const int idx0 = ctx->idx;
int cur_offset;
@@ -243,12 +248,12 @@ static int out_offset = -1; /* initialized on the first pass of build_body() */
static int emit_bpf_tail_call(struct jit_ctx *ctx)
{
/* bpf_tail_call(void *prog_ctx, struct bpf_array *array, u64 index) */
- const u8 r2 = bpf2a64[BPF_REG_2];
- const u8 r3 = bpf2a64[BPF_REG_3];
+ const u8 r2 = bpf2a64(ctx, BPF_REG_2);
+ const u8 r3 = bpf2a64(ctx, BPF_REG_3);
- const u8 tmp = bpf2a64[TMP_REG_1];
- const u8 prg = bpf2a64[TMP_REG_2];
- const u8 tcc = bpf2a64[TCALL_CNT];
+ const u8 tmp = bpf2a64(ctx, TMP_REG_1);
+ const u8 prg = bpf2a64(ctx, TMP_REG_2);
+ const u8 tcc = bpf2a64(ctx, TCALL_CNT);
const int idx0 = ctx->idx;
#define cur_offset (ctx->idx - idx0)
#define jmp_offset (out_offset - (cur_offset))
@@ -307,12 +312,12 @@ static int emit_bpf_tail_call(struct jit_ctx *ctx)
static void build_epilogue(struct jit_ctx *ctx)
{
- const u8 r0 = bpf2a64[BPF_REG_0];
- const u8 r6 = bpf2a64[BPF_REG_6];
- const u8 r7 = bpf2a64[BPF_REG_7];
- const u8 r8 = bpf2a64[BPF_REG_8];
- const u8 r9 = bpf2a64[BPF_REG_9];
- const u8 fp = bpf2a64[BPF_REG_FP];
+ const u8 r0 = bpf2a64(ctx, BPF_REG_0);
+ const u8 r6 = bpf2a64(ctx, BPF_REG_6);
+ const u8 r7 = bpf2a64(ctx, BPF_REG_7);
+ const u8 r8 = bpf2a64(ctx, BPF_REG_8);
+ const u8 r9 = bpf2a64(ctx, BPF_REG_9);
+ const u8 fp = bpf2a64(ctx, BPF_REG_FP);
/* We're done with BPF stack */
emit(A64_ADD_I(1, A64_SP, A64_SP, ctx->stack_size), ctx);
@@ -343,11 +348,11 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,
bool extra_pass)
{
const u8 code = insn->code;
- const u8 dst = bpf2a64[insn->dst_reg];
- const u8 src = bpf2a64[insn->src_reg];
- const u8 tmp = bpf2a64[TMP_REG_1];
- const u8 tmp2 = bpf2a64[TMP_REG_2];
- const u8 tmp3 = bpf2a64[TMP_REG_3];
+ const u8 dst = bpf2a64(ctx, insn->dst_reg);
+ const u8 src = bpf2a64(ctx, insn->src_reg);
+ const u8 tmp = bpf2a64(ctx, TMP_REG_1);
+ const u8 tmp2 = bpf2a64(ctx, TMP_REG_2);
+ const u8 tmp3 = bpf2a64(ctx, TMP_REG_3);
const s16 off = insn->off;
const s32 imm = insn->imm;
const int i = insn - ctx->prog->insnsi;
@@ -634,7 +639,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,
/* function call */
case BPF_JMP | BPF_CALL:
{
- const u8 r0 = bpf2a64[BPF_REG_0];
+ const u8 r0 = bpf2a64(ctx, BPF_REG_0);
bool func_addr_fixed;
u64 func_addr;
int ret;
--
2.25.0.341.g760bfbb309-goog
next prev parent reply other threads:[~2020-01-28 2:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-28 2:11 arm64: bpf: Elide some moves to a0 after calls Palmer Dabbelt
2020-01-28 2:11 ` [PATCH 1/4] selftests/bpf: Elide a check for LLVM versions that can't compile it Palmer Dabbelt
2020-02-11 18:20 ` Nick Desaulniers
2020-01-28 2:11 ` Palmer Dabbelt [this message]
2020-01-28 2:11 ` [PATCH 3/4] arm64: bpf: Split the read and write halves of dst Palmer Dabbelt
2020-01-28 2:11 ` [PATCH 4/4] arm64: bpf: Elide some moves to a0 after calls Palmer Dabbelt
2020-02-04 19:13 ` Björn Töpel
2020-02-11 0:15 ` Alexei Starovoitov
2020-02-04 19:30 ` Björn Töpel
2020-02-04 20:33 ` John Fastabend
2020-02-18 19:28 ` Palmer Dabbelt
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=20200128021145.36774-3-palmerdabbelt@google.com \
--to=palmerdabbelt@google.com \
--cc=andriin@fb.com \
--cc=ast@kernel.org \
--cc=bjorn.topel@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=catalin.marinas@arm.com \
--cc=clang-built-linux@googlegroups.com \
--cc=daniel@iogearbox.net \
--cc=kafai@fb.com \
--cc=kernel-team@android.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=shuah@kernel.org \
--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).