Commit 68e4f238 authored by Hou Tao's avatar Hou Tao Committed by Daniel Borkmann
Browse files

bpf, arm64: Call build_prologue() first in first JIT pass 



BPF line info needs ctx->offset to be the instruction offset in the whole JITed
image instead of the body itself, so also call build_prologue() first in first
JIT pass.

Fixes: 37ab566c ("bpf: arm64: Enable arm64 jit to provide bpf_line_info")
Signed-off-by: default avatarHou Tao <houtao1@huawei.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20220226121906.5709-2-houtao1@huawei.com
parent 80bebebd

arch/arm64/net/bpf_jit_comp.c

+8 −5
Original line number Diff line number Diff line
@@ -1049,15 +1049,18 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 
		goto out_off;

	}



	/* 1. Initial fake pass to compute ctx->idx. */



	/* Fake pass to fill in ctx->offset. */

	if (build_body(&ctx, extra_pass)) {

	/*

	 * 1. Initial fake pass to compute ctx->idx and ctx->offset.

	 *

	 * BPF line info needs ctx->offset[i] to be the offset of

	 * instruction[i] in jited image, so build prologue first.

	 */

	if (build_prologue(&ctx, was_classic)) {

		prog = orig_prog;

		goto out_off;

	}



	if (build_prologue(&ctx, was_classic)) {

	if (build_body(&ctx, extra_pass)) {

		prog = orig_prog;

		goto out_off;

	}