From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 2 Apr 2021 10:34:19 +0000 (+0200)
Subject: Merge branch 'x86/cpu' into WIP.x86/core, to merge the NOP changes & resolve a semant... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b1f480bc0686e65d5413c035bd13af2ea4888784;p=linux.git

Merge branch 'x86/cpu' into WIP.x86/core, to merge the NOP changes & resolve a semantic conflict

Conflict-merge this main commit in essence:

  a89dfde3dc3c: ("x86: Remove dynamic NOP selection")

With this upstream commit:

  b90829704780: ("bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG")

Semantic merge conflict:

  arch/x86/net/bpf_jit_comp.c

  - memcpy(prog, ideal_nops[NOP_ATOMIC5], X86_PATCH_SIZE);
  + memcpy(prog, x86_nops[5], X86_PATCH_SIZE);

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

b1f480bc0686e65d5413c035bd13af2ea4888784
diff --cc arch/x86/net/bpf_jit_comp.c
index b35fc80238846,6aa29c45c3f90..04814dd12dc17
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@@ -2011,9 -1999,6 +2011,9 @@@ int arch_prepare_bpf_trampoline(struct 
  		}
  		/* 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;
- 		memcpy(prog, ideal_nops[NOP_ATOMIC5], X86_PATCH_SIZE);
++		memcpy(prog, x86_nops[5], X86_PATCH_SIZE);
 +		prog += X86_PATCH_SIZE;
  	}
  
  	if (fmod_ret->nr_progs) {