Unverified Commit d235b796 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10968 bpf, arm64: Fix trampoline for BPF_TRAMP_F_CALL_ORIG 

Merge Pull Request from: @ci-robot 
 
PR sync from: Tengda Wu <wutengda2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ZEMH5SEAS5J7HSZLDRB7W6TGPMG4EM7R/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAKQ62 
 
Link:https://gitee.com/openeuler/kernel/pulls/10968

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 72d971db 66a28d2d

arch/arm64/net/bpf_jit_comp.c

+2 −2
Original line number Diff line number Diff line
@@ -1640,7 +1640,7 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im, 
	emit(A64_STR64I(A64_R(19), A64_SP, regs_off), ctx);



	if (flags & BPF_TRAMP_F_CALL_ORIG) {

		emit_addr_mov_i64(A64_R(0), (const u64)im, ctx);

		emit_a64_mov_i64(A64_R(0), (const u64)im, ctx);

		emit_call((const u64)__bpf_tramp_enter, ctx);

	}
@@ -1681,7 +1681,7 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im, 


	if (flags & BPF_TRAMP_F_CALL_ORIG) {

		im->ip_epilogue = ctx->image + ctx->idx;

		emit_addr_mov_i64(A64_R(0), (const u64)im, ctx);

		emit_a64_mov_i64(A64_R(0), (const u64)im, ctx);

		emit_call((const u64)__bpf_tramp_exit, ctx);

	}