From e094831fecf3335db3009fa22f170855ea49e72b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 9 Apr 2021 14:28:45 +0200 Subject: [PATCH] Revert "Revert "bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG"" This reverts commit 21e2297daeddcdd90a7c22d22bf4212fa505a8ef as the kabi can be updated at this point in time. Signed-off-by: Greg Kroah-Hartman Change-Id: Ibd3111ca2a9071ae96a33c39428df927cc41d24a --- arch/x86/net/bpf_jit_comp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index 652bd64e422d..023ac12f54a2 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -1811,7 +1811,8 @@ int arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *image, void *i /* remember return value in a stack for bpf prog to access */ emit_stx(&prog, BPF_DW, BPF_REG_FP, BPF_REG_0, -8); im->ip_after_call = prog; - emit_nops(&prog, 5); + memcpy(prog, ideal_nops[NOP_ATOMIC5], X86_PATCH_SIZE); + prog += X86_PATCH_SIZE; } if (fmod_ret->nr_progs) {