| Message ID | 20230607091814.46080-4-puranjay12@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | bpf, arm64: use BPF prog pack allocator in BPF JIT | expand |
On Wed, Jun 7, 2023 at 2:18 AM Puranjay Mohan <puranjay12@gmail.com> wrote: > [...] > + > static inline int epilogue_offset(const struct jit_ctx *ctx) > { > int to = ctx->epilogue_offset; > @@ -701,7 +716,8 @@ static int add_exception_handler(const struct bpf_insn *insn, > struct jit_ctx *ctx, > int dst_reg) > { > - off_t offset; > + off_t ins_offset; > + off_t fixup_offset; Please add some comments for these two offsets. > unsigned long pc; > struct exception_table_entry *ex; > > @@ -717,12 +733,11 @@ static int add_exception_handler(const struct bpf_insn *insn, > return -EINVAL; > > ex = &ctx->prog->aux->extable[ctx->exentry_idx]; > - pc = (unsigned long)&ctx->image[ctx->idx - 1]; > + pc = (unsigned long)&ctx->ro_image[ctx->idx - 1]; > > - offset = pc - (long)&ex->insn; > - if (WARN_ON_ONCE(offset >= 0 || offset < INT_MIN)) > + ins_offset = pc - (long)&ex->insn; > + if (WARN_ON_ONCE(ins_offset >= 0 || ins_offset < INT_MIN)) > return -ERANGE; > - ex->insn = offset; > > /* > * Since the extable follows the program, the fixup offset is always > @@ -732,11 +747,20 @@ static int add_exception_handler(const struct bpf_insn *insn, > * modifying the upper bits because the table is already sorted, and > * isn't part of the main exception table. > */ > - offset = (long)&ex->fixup - (pc + AARCH64_INSN_SIZE); > - if (!FIELD_FIT(BPF_FIXUP_OFFSET_MASK, offset)) > + fixup_offset = (long)&ex->fixup - (pc + AARCH64_INSN_SIZE); > + if (!FIELD_FIT(BPF_FIXUP_OFFSET_MASK, fixup_offset)) > return -ERANGE; > > - ex->fixup = FIELD_PREP(BPF_FIXUP_OFFSET_MASK, offset) | > + /* > + * The offsets above have been calculated using the RO buffer but we > + * need to use the R/W buffer for writes. > + * switch ex to rw buffer for writing. > + */ > + ex = (void *)ctx->image + ((void *)ex - (void *)ctx->ro_image); > + > + ex->insn = ins_offset; > + > + ex->fixup = FIELD_PREP(BPF_FIXUP_OFFSET_MASK, fixup_offset) | > FIELD_PREP(BPF_FIXUP_REG_MASK, dst_reg); > > ex->type = EX_TYPE_BPF; [...] > /* And we're done. */ > if (bpf_jit_enable > 1) > bpf_jit_dump(prog->len, prog_size, 2, ctx.image); > > - bpf_flush_icache(header, ctx.image + ctx.idx); > + bpf_flush_icache(ro_header, ctx.ro_image + ctx.idx); > > if (!prog->is_func || extra_pass) { > if (extra_pass && ctx.idx != jit_data->ctx.idx) { > pr_err_once("multi-func JIT bug %d != %d\n", > ctx.idx, jit_data->ctx.idx); > - bpf_jit_binary_free(header); > prog->bpf_func = NULL; > prog->jited = 0; > prog->jited_len = 0; > + goto out_free_hdr; > + } > + if (WARN_ON(bpf_jit_binary_pack_finalize(prog, ro_header, > + header))) { > + ro_header = NULL; I think we need prog = orig_prog; here. Thanks, Song
Hi Song, On Thu, Jun 8, 2023 at 6:28 PM Song Liu <song@kernel.org> wrote: > > On Wed, Jun 7, 2023 at 2:18 AM Puranjay Mohan <puranjay12@gmail.com> wrote: > > > [...] > > + > > static inline int epilogue_offset(const struct jit_ctx *ctx) > > { > > int to = ctx->epilogue_offset; > > @@ -701,7 +716,8 @@ static int add_exception_handler(const struct bpf_insn *insn, > > struct jit_ctx *ctx, > > int dst_reg) > > { > > - off_t offset; > > + off_t ins_offset; > > + off_t fixup_offset; > > Please add some comments for these two offsets. Here I am using two variables because I need to change from the RO buffer for calculating offsets to the RW buffer for writing. Earlier, a single variable could work because it was being reused for calculating the second offset after writing the first one. Here, I can't re-calculate using the same variable because I have to change to the RW buffer, and using the same variable would need changing back to the RO buffer. So, I am calculating both offsets first, changing to RW buffer and writing both offsets. But I will add comments explaining what these offsets are being used for. > > > unsigned long pc; > > struct exception_table_entry *ex; > > > > @@ -717,12 +733,11 @@ static int add_exception_handler(const struct bpf_insn *insn, > > return -EINVAL; > > > > ex = &ctx->prog->aux->extable[ctx->exentry_idx]; > > - pc = (unsigned long)&ctx->image[ctx->idx - 1]; > > + pc = (unsigned long)&ctx->ro_image[ctx->idx - 1]; > > > > - offset = pc - (long)&ex->insn; > > - if (WARN_ON_ONCE(offset >= 0 || offset < INT_MIN)) > > + ins_offset = pc - (long)&ex->insn; > > + if (WARN_ON_ONCE(ins_offset >= 0 || ins_offset < INT_MIN)) > > return -ERANGE; > > - ex->insn = offset; > > > > /* > > * Since the extable follows the program, the fixup offset is always > > @@ -732,11 +747,20 @@ static int add_exception_handler(const struct bpf_insn *insn, > > * modifying the upper bits because the table is already sorted, and > > * isn't part of the main exception table. > > */ > > - offset = (long)&ex->fixup - (pc + AARCH64_INSN_SIZE); > > - if (!FIELD_FIT(BPF_FIXUP_OFFSET_MASK, offset)) > > + fixup_offset = (long)&ex->fixup - (pc + AARCH64_INSN_SIZE); > > + if (!FIELD_FIT(BPF_FIXUP_OFFSET_MASK, fixup_offset)) > > return -ERANGE; > > > > - ex->fixup = FIELD_PREP(BPF_FIXUP_OFFSET_MASK, offset) | > > + /* > > + * The offsets above have been calculated using the RO buffer but we > > + * need to use the R/W buffer for writes. > > + * switch ex to rw buffer for writing. > > + */ > > + ex = (void *)ctx->image + ((void *)ex - (void *)ctx->ro_image); > > + > > + ex->insn = ins_offset; > > + > > + ex->fixup = FIELD_PREP(BPF_FIXUP_OFFSET_MASK, fixup_offset) | > > FIELD_PREP(BPF_FIXUP_REG_MASK, dst_reg); > > > > ex->type = EX_TYPE_BPF; > [...] > > /* And we're done. */ > > if (bpf_jit_enable > 1) > > bpf_jit_dump(prog->len, prog_size, 2, ctx.image); > > > > - bpf_flush_icache(header, ctx.image + ctx.idx); > > + bpf_flush_icache(ro_header, ctx.ro_image + ctx.idx); > > > > if (!prog->is_func || extra_pass) { > > if (extra_pass && ctx.idx != jit_data->ctx.idx) { > > pr_err_once("multi-func JIT bug %d != %d\n", > > ctx.idx, jit_data->ctx.idx); > > - bpf_jit_binary_free(header); > > prog->bpf_func = NULL; > > prog->jited = 0; > > prog->jited_len = 0; > > + goto out_free_hdr; > > + } > > + if (WARN_ON(bpf_jit_binary_pack_finalize(prog, ro_header, > > + header))) { > > + ro_header = NULL; > > I think we need > prog = orig_prog; > here. I agree, this is a mistake from my side. I will add this in the next version. Thanks, Puranjay Mohan
On Thu, Jun 8, 2023 at 9:51 AM Puranjay Mohan <puranjay12@gmail.com> wrote: > > Hi Song, > > On Thu, Jun 8, 2023 at 6:28 PM Song Liu <song@kernel.org> wrote: > > > > On Wed, Jun 7, 2023 at 2:18 AM Puranjay Mohan <puranjay12@gmail.com> wrote: > > > > > [...] > > > + > > > static inline int epilogue_offset(const struct jit_ctx *ctx) > > > { > > > int to = ctx->epilogue_offset; > > > @@ -701,7 +716,8 @@ static int add_exception_handler(const struct bpf_insn *insn, > > > struct jit_ctx *ctx, > > > int dst_reg) > > > { > > > - off_t offset; > > > + off_t ins_offset; > > > + off_t fixup_offset; > > > > Please add some comments for these two offsets. > > Here I am using two variables because I need to change from the RO > buffer for calculating offsets > to the RW buffer for writing. > > Earlier, a single variable could work because it was being reused for > calculating the second offset > after writing the first one. Here, I can't re-calculate using the same > variable because I have to change > to the RW buffer, and using the same variable would need changing back > to the RO buffer. > > So, I am calculating both offsets first, changing to RW buffer and > writing both offsets. > > But I will add comments explaining what these offsets are being used for. Thanks for the explanation! These comments will be useful for future work. Song
diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c index 145b540ec34f..0e38fa63b551 100644 --- a/arch/arm64/net/bpf_jit_comp.c +++ b/arch/arm64/net/bpf_jit_comp.c @@ -76,6 +76,7 @@ struct jit_ctx { int *offset; int exentry_idx; __le32 *image; + __le32 *ro_image; u32 stack_size; int fpb_offset; }; @@ -205,6 +206,20 @@ static void jit_fill_hole(void *area, unsigned int size) *ptr++ = cpu_to_le32(AARCH64_BREAK_FAULT); } +int bpf_arch_text_invalidate(void *dst, size_t len) +{ + __le32 *ptr; + int ret; + + for (ptr = dst; len >= sizeof(u32); len -= sizeof(u32)) { + ret = aarch64_insn_patch_text_nosync(ptr++, AARCH64_BREAK_FAULT); + if (ret) + return ret; + } + + return 0; +} + static inline int epilogue_offset(const struct jit_ctx *ctx) { int to = ctx->epilogue_offset; @@ -701,7 +716,8 @@ static int add_exception_handler(const struct bpf_insn *insn, struct jit_ctx *ctx, int dst_reg) { - off_t offset; + off_t ins_offset; + off_t fixup_offset; unsigned long pc; struct exception_table_entry *ex; @@ -717,12 +733,11 @@ static int add_exception_handler(const struct bpf_insn *insn, return -EINVAL; ex = &ctx->prog->aux->extable[ctx->exentry_idx]; - pc = (unsigned long)&ctx->image[ctx->idx - 1]; + pc = (unsigned long)&ctx->ro_image[ctx->idx - 1]; - offset = pc - (long)&ex->insn; - if (WARN_ON_ONCE(offset >= 0 || offset < INT_MIN)) + ins_offset = pc - (long)&ex->insn; + if (WARN_ON_ONCE(ins_offset >= 0 || ins_offset < INT_MIN)) return -ERANGE; - ex->insn = offset; /* * Since the extable follows the program, the fixup offset is always @@ -732,11 +747,20 @@ static int add_exception_handler(const struct bpf_insn *insn, * modifying the upper bits because the table is already sorted, and * isn't part of the main exception table. */ - offset = (long)&ex->fixup - (pc + AARCH64_INSN_SIZE); - if (!FIELD_FIT(BPF_FIXUP_OFFSET_MASK, offset)) + fixup_offset = (long)&ex->fixup - (pc + AARCH64_INSN_SIZE); + if (!FIELD_FIT(BPF_FIXUP_OFFSET_MASK, fixup_offset)) return -ERANGE; - ex->fixup = FIELD_PREP(BPF_FIXUP_OFFSET_MASK, offset) | + /* + * The offsets above have been calculated using the RO buffer but we + * need to use the R/W buffer for writes. + * switch ex to rw buffer for writing. + */ + ex = (void *)ctx->image + ((void *)ex - (void *)ctx->ro_image); + + ex->insn = ins_offset; + + ex->fixup = FIELD_PREP(BPF_FIXUP_OFFSET_MASK, fixup_offset) | FIELD_PREP(BPF_FIXUP_REG_MASK, dst_reg); ex->type = EX_TYPE_BPF; @@ -1446,7 +1470,8 @@ static inline void bpf_flush_icache(void *start, void *end) struct arm64_jit_data { struct bpf_binary_header *header; - u8 *image; + u8 *ro_image; + struct bpf_binary_header *ro_header; struct jit_ctx ctx; }; @@ -1455,12 +1480,14 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) int image_size, prog_size, extable_size, extable_align, extable_offset; struct bpf_prog *tmp, *orig_prog = prog; struct bpf_binary_header *header; + struct bpf_binary_header *ro_header; struct arm64_jit_data *jit_data; bool was_classic = bpf_prog_was_classic(prog); bool tmp_blinded = false; bool extra_pass = false; struct jit_ctx ctx; u8 *image_ptr; + u8 *ro_image_ptr; if (!prog->jit_requested) return orig_prog; @@ -1487,8 +1514,11 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) } if (jit_data->ctx.offset) { ctx = jit_data->ctx; - image_ptr = jit_data->image; + ro_image_ptr = jit_data->ro_image; + ro_header = jit_data->ro_header; header = jit_data->header; + image_ptr = (void *)header + ((void *)ro_image_ptr + - (void *)ro_header); extra_pass = true; prog_size = sizeof(u32) * ctx.idx; goto skip_init_ctx; @@ -1533,18 +1563,27 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) /* also allocate space for plt target */ extable_offset = round_up(prog_size + PLT_TARGET_SIZE, extable_align); image_size = extable_offset + extable_size; - header = bpf_jit_binary_alloc(image_size, &image_ptr, - sizeof(u32), jit_fill_hole); - if (header == NULL) { + ro_header = bpf_jit_binary_pack_alloc(image_size, &ro_image_ptr, + sizeof(u32), &header, &image_ptr, + jit_fill_hole); + if (!ro_header) { prog = orig_prog; goto out_off; } /* 2. Now, the actual pass. */ + /* + * Use the image(RW) for writing the JITed instructions. But also save + * the ro_image(RX) for calculating the offsets in the image. The RW + * image will be later copied to the RX image from where the program + * will run. The bpf_jit_binary_pack_finalize() will do this copy in the + * final step. + */ ctx.image = (__le32 *)image_ptr; + ctx.ro_image = (__le32 *)ro_image_ptr; if (extable_size) - prog->aux->extable = (void *)image_ptr + extable_offset; + prog->aux->extable = (void *)ro_image_ptr + extable_offset; skip_init_ctx: ctx.idx = 0; ctx.exentry_idx = 0; @@ -1552,9 +1591,8 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) build_prologue(&ctx, was_classic); if (build_body(&ctx, extra_pass)) { - bpf_jit_binary_free(header); prog = orig_prog; - goto out_off; + goto out_free_hdr; } build_epilogue(&ctx); @@ -1562,34 +1600,37 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) /* 3. Extra pass to validate JITed code. */ if (validate_ctx(&ctx)) { - bpf_jit_binary_free(header); prog = orig_prog; - goto out_off; + goto out_free_hdr; } /* And we're done. */ if (bpf_jit_enable > 1) bpf_jit_dump(prog->len, prog_size, 2, ctx.image); - bpf_flush_icache(header, ctx.image + ctx.idx); + bpf_flush_icache(ro_header, ctx.ro_image + ctx.idx); if (!prog->is_func || extra_pass) { if (extra_pass && ctx.idx != jit_data->ctx.idx) { pr_err_once("multi-func JIT bug %d != %d\n", ctx.idx, jit_data->ctx.idx); - bpf_jit_binary_free(header); prog->bpf_func = NULL; prog->jited = 0; prog->jited_len = 0; + goto out_free_hdr; + } + if (WARN_ON(bpf_jit_binary_pack_finalize(prog, ro_header, + header))) { + ro_header = NULL; goto out_off; } - bpf_jit_binary_lock_ro(header); } else { jit_data->ctx = ctx; - jit_data->image = image_ptr; + jit_data->ro_image = ro_image_ptr; jit_data->header = header; + jit_data->ro_header = ro_header; } - prog->bpf_func = (void *)ctx.image; + prog->bpf_func = (void *)ctx.ro_image; prog->jited = 1; prog->jited_len = prog_size; @@ -1610,6 +1651,14 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) bpf_jit_prog_release_other(prog, prog == orig_prog ? tmp : orig_prog); return prog; + +out_free_hdr: + if (header) { + bpf_arch_text_copy(&ro_header->size, &header->size, + sizeof(header->size)); + bpf_jit_binary_pack_free(ro_header, header); + } + goto out_off; } bool bpf_jit_supports_kfunc_call(void) @@ -1617,6 +1666,13 @@ bool bpf_jit_supports_kfunc_call(void) return true; } +void *bpf_arch_text_copy(void *dst, void *src, size_t len) +{ + if (!aarch64_insn_copy(dst, src, len)) + return ERR_PTR(-EINVAL); + return dst; +} + u64 bpf_jit_alloc_exec_limit(void) { return VMALLOC_END - VMALLOC_START; @@ -2221,3 +2277,27 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type poke_type, return ret; } + +void bpf_jit_free(struct bpf_prog *prog) +{ + if (prog->jited) { + struct arm64_jit_data *jit_data = prog->aux->jit_data; + struct bpf_binary_header *hdr; + + /* + * If we fail the final pass of JIT (from jit_subprogs), + * the program may not be finalized yet. Call finalize here + * before freeing it. + */ + if (jit_data) { + bpf_jit_binary_pack_finalize(prog, jit_data->ro_header, + jit_data->header); + kfree(jit_data); + } + hdr = bpf_jit_binary_pack_hdr(prog); + bpf_jit_binary_pack_free(hdr, NULL); + WARN_ON_ONCE(!bpf_prog_kallsyms_verify_off(prog)); + } + + bpf_prog_unlock_free(prog); +}
Use bpf_jit_binary_pack_alloc for memory management of JIT binaries in ARM64 BPF JIT. The bpf_jit_binary_pack_alloc creates a pair of RW and RX buffers. The JIT writes the program into the RW buffer. When the JIT is done, the program is copied to the final RX buffer with bpf_jit_binary_pack_finalize. Implement bpf_arch_text_copy() and bpf_arch_text_invalidate() for ARM64 JIT as these functions are required by bpf_jit_binary_pack allocator. Signed-off-by: Puranjay Mohan <puranjay12@gmail.com> --- Changes in v1 => v2: - Made the naming of ro_ prefix consistent. Now image/header/image_ptr are read/write and ro_image/ro_header/ro_image_ptr are read-only. arch/arm64/net/bpf_jit_comp.c | 126 +++++++++++++++++++++++++++------- 1 file changed, 103 insertions(+), 23 deletions(-)