From cc9b5188efcb0cdb980fe06b0eb7ae06e33add12 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 11 Mar 2023 10:19:47 +0100 Subject: [PATCH] drop queue-4.14/s390-bpf-add-expoline-to-tail-calls.patch --- .../s390-bpf-add-expoline-to-tail-calls.patch | 47 ------------------- queue-4.14/series | 1 - 2 files changed, 48 deletions(-) delete mode 100644 queue-4.14/s390-bpf-add-expoline-to-tail-calls.patch diff --git a/queue-4.14/s390-bpf-add-expoline-to-tail-calls.patch b/queue-4.14/s390-bpf-add-expoline-to-tail-calls.patch deleted file mode 100644 index ba78f22998b..00000000000 --- a/queue-4.14/s390-bpf-add-expoline-to-tail-calls.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 914c53dcaea29d0ddb50b4ea448049e04982f337 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 29 Jan 2023 20:04:55 +0100 -Subject: s390/bpf: Add expoline to tail calls - -From: Ilya Leoshkevich - -[ Upstream commit bb4ef8fc3d193ed8d5583fb47cbeff5d8fb8302f ] - -All the indirect jumps in the eBPF JIT already use expolines, except -for the tail call one. - -Fixes: de5cb6eb514e ("s390: use expoline thunks in the BPF JIT") -Signed-off-by: Ilya Leoshkevich -Link: https://lore.kernel.org/r/20230129190501.1624747-3-iii@linux.ibm.com -Signed-off-by: Alexei Starovoitov -Signed-off-by: Sasha Levin ---- - arch/s390/net/bpf_jit_comp.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c -index 60029baaa72ad..f2b516f8a3a64 100644 ---- a/arch/s390/net/bpf_jit_comp.c -+++ b/arch/s390/net/bpf_jit_comp.c -@@ -1119,8 +1119,16 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i - /* lg %r1,bpf_func(%r1) */ - EMIT6_DISP_LH(0xe3000000, 0x0004, REG_1, REG_1, REG_0, - offsetof(struct bpf_prog, bpf_func)); -- /* bc 0xf,tail_call_start(%r1) */ -- _EMIT4(0x47f01000 + jit->tail_call_start); -+ if (nospec_uses_trampoline()) { -+ jit->seen |= SEEN_FUNC; -+ /* aghi %r1,tail_call_start */ -+ EMIT4_IMM(0xa70b0000, REG_1, jit->tail_call_start); -+ /* brcl 0xf,__s390_indirect_jump_r1 */ -+ EMIT6_PCREL_RILC(0xc0040000, 0xf, jit->r1_thunk_ip); -+ } else { -+ /* bc 0xf,tail_call_start(%r1) */ -+ _EMIT4(0x47f01000 + jit->tail_call_start); -+ } - /* out: */ - jit->labels[0] = jit->prg; - break; --- -2.39.2 - diff --git a/queue-4.14/series b/queue-4.14/series index 10b01371184..9bf4848d98c 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -38,7 +38,6 @@ wifi-ath9k-htc_hst-free-skb-in-ath9k_htc_rx_msg-if-t.patch wifi-ath9k-fix-potential-stack-out-of-bounds-write-i.patch acpi-battery-fix-missing-nul-termination-with-large-.patch crypto-seqiv-handle-ebusy-correctly.patch -s390-bpf-add-expoline-to-tail-calls.patch net-mlx5-enhance-debug-print-in-page-allocation-fail.patch irqchip-alpine-msi-fix-refcount-leak-in-alpine_msix_.patch irqchip-irq-mvebu-gicp-fix-refcount-leak-in-mvebu_gi.patch -- 2.47.3