From: Greg Kroah-Hartman Date: Tue, 12 Oct 2021 09:31:52 +0000 (+0200) Subject: drop powerpc-bpf-fix-bpf_mod-when-imm-1.patch from everywhere except 5.14 X-Git-Tag: v5.14.12~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=57bad83d93208316daef1e8a7966ede67f455f59;p=thirdparty%2Fkernel%2Fstable-queue.git drop powerpc-bpf-fix-bpf_mod-when-imm-1.patch from everywhere except 5.14 --- diff --git a/queue-4.14/powerpc-bpf-fix-bpf_mod-when-imm-1.patch b/queue-4.14/powerpc-bpf-fix-bpf_mod-when-imm-1.patch deleted file mode 100644 index 420ca4b3cce..00000000000 --- a/queue-4.14/powerpc-bpf-fix-bpf_mod-when-imm-1.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9ffaecf1f31e0226c4ccd258ecee0668e07eb586 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 6 Oct 2021 01:55:22 +0530 -Subject: powerpc/bpf: Fix BPF_MOD when imm == 1 - -From: Naveen N. Rao - -[ Upstream commit 8bbc9d822421d9ac8ff9ed26a3713c9afc69d6c8 ] - -Only ignore the operation if dividing by 1. - -Fixes: 156d0e290e969c ("powerpc/ebpf/jit: Implement JIT compiler for extended BPF") -Signed-off-by: Naveen N. Rao -Tested-by: Johan Almbladh -Reviewed-by: Christophe Leroy -Acked-by: Song Liu -Acked-by: Johan Almbladh -Signed-off-by: Michael Ellerman -Link: https://lore.kernel.org/r/c674ca18c3046885602caebb326213731c675d06.1633464148.git.naveen.n.rao@linux.vnet.ibm.com -Signed-off-by: Sasha Levin ---- - arch/powerpc/net/bpf_jit_comp64.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/arch/powerpc/net/bpf_jit_comp64.c b/arch/powerpc/net/bpf_jit_comp64.c -index 28434040cfb6..75d495491364 100644 ---- a/arch/powerpc/net/bpf_jit_comp64.c -+++ b/arch/powerpc/net/bpf_jit_comp64.c -@@ -426,8 +426,14 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, - case BPF_ALU64 | BPF_DIV | BPF_K: /* dst /= imm */ - if (imm == 0) - return -EINVAL; -- else if (imm == 1) -- goto bpf_alu32_trunc; -+ if (imm == 1) { -+ if (BPF_OP(code) == BPF_DIV) { -+ goto bpf_alu32_trunc; -+ } else { -+ EMIT(PPC_LI(dst_reg, 0)); -+ break; -+ } -+ } - - PPC_LI32(b2p[TMP_REG_1], imm); - switch (BPF_CLASS(code)) { --- -2.33.0 - diff --git a/queue-4.14/series b/queue-4.14/series index a4f2a14bf45..adb73df3797 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -21,4 +21,3 @@ drm-nouveau-debugfs-fix-file-release-memory-leak.patch rtnetlink-fix-if_nlmsg_stats_size-under-estimation.patch i40e-fix-endless-loop-under-rtnl.patch i2c-acpi-fix-resource-leak-in-reconfiguration-device.patch -powerpc-bpf-fix-bpf_mod-when-imm-1.patch diff --git a/queue-4.19/powerpc-bpf-fix-bpf_mod-when-imm-1.patch b/queue-4.19/powerpc-bpf-fix-bpf_mod-when-imm-1.patch deleted file mode 100644 index f65bbe45581..00000000000 --- a/queue-4.19/powerpc-bpf-fix-bpf_mod-when-imm-1.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 8b235a4816b9acb2facc9e410cbb0597eb7b2153 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 6 Oct 2021 01:55:22 +0530 -Subject: powerpc/bpf: Fix BPF_MOD when imm == 1 - -From: Naveen N. Rao - -[ Upstream commit 8bbc9d822421d9ac8ff9ed26a3713c9afc69d6c8 ] - -Only ignore the operation if dividing by 1. - -Fixes: 156d0e290e969c ("powerpc/ebpf/jit: Implement JIT compiler for extended BPF") -Signed-off-by: Naveen N. Rao -Tested-by: Johan Almbladh -Reviewed-by: Christophe Leroy -Acked-by: Song Liu -Acked-by: Johan Almbladh -Signed-off-by: Michael Ellerman -Link: https://lore.kernel.org/r/c674ca18c3046885602caebb326213731c675d06.1633464148.git.naveen.n.rao@linux.vnet.ibm.com -Signed-off-by: Sasha Levin ---- - arch/powerpc/net/bpf_jit_comp64.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/arch/powerpc/net/bpf_jit_comp64.c b/arch/powerpc/net/bpf_jit_comp64.c -index e7d56ddba43a..ff201b1fe768 100644 ---- a/arch/powerpc/net/bpf_jit_comp64.c -+++ b/arch/powerpc/net/bpf_jit_comp64.c -@@ -385,8 +385,14 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, - case BPF_ALU64 | BPF_DIV | BPF_K: /* dst /= imm */ - if (imm == 0) - return -EINVAL; -- else if (imm == 1) -- goto bpf_alu32_trunc; -+ if (imm == 1) { -+ if (BPF_OP(code) == BPF_DIV) { -+ goto bpf_alu32_trunc; -+ } else { -+ EMIT(PPC_LI(dst_reg, 0)); -+ break; -+ } -+ } - - PPC_LI32(b2p[TMP_REG_1], imm); - switch (BPF_CLASS(code)) { --- -2.33.0 - diff --git a/queue-4.19/series b/queue-4.19/series index e2f7d4b7d9a..ea05fff3179 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -24,5 +24,4 @@ rtnetlink-fix-if_nlmsg_stats_size-under-estimation.patch i40e-fix-endless-loop-under-rtnl.patch i40e-fix-freeing-of-uninitialized-misc-irq-vector.patch i2c-acpi-fix-resource-leak-in-reconfiguration-device.patch -powerpc-bpf-fix-bpf_mod-when-imm-1.patch x86-kconfig-correct-reference-to-mwinchip3d.patch diff --git a/queue-4.9/powerpc-bpf-fix-bpf_mod-when-imm-1.patch b/queue-4.9/powerpc-bpf-fix-bpf_mod-when-imm-1.patch deleted file mode 100644 index ab9ca2ced29..00000000000 --- a/queue-4.9/powerpc-bpf-fix-bpf_mod-when-imm-1.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d66f20bc9bee7918ac734286fed4436cee22df9c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 6 Oct 2021 01:55:22 +0530 -Subject: powerpc/bpf: Fix BPF_MOD when imm == 1 - -From: Naveen N. Rao - -[ Upstream commit 8bbc9d822421d9ac8ff9ed26a3713c9afc69d6c8 ] - -Only ignore the operation if dividing by 1. - -Fixes: 156d0e290e969c ("powerpc/ebpf/jit: Implement JIT compiler for extended BPF") -Signed-off-by: Naveen N. Rao -Tested-by: Johan Almbladh -Reviewed-by: Christophe Leroy -Acked-by: Song Liu -Acked-by: Johan Almbladh -Signed-off-by: Michael Ellerman -Link: https://lore.kernel.org/r/c674ca18c3046885602caebb326213731c675d06.1633464148.git.naveen.n.rao@linux.vnet.ibm.com -Signed-off-by: Sasha Levin ---- - arch/powerpc/net/bpf_jit_comp64.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/arch/powerpc/net/bpf_jit_comp64.c b/arch/powerpc/net/bpf_jit_comp64.c -index 888ee95340da..2152ffe4e5ea 100644 ---- a/arch/powerpc/net/bpf_jit_comp64.c -+++ b/arch/powerpc/net/bpf_jit_comp64.c -@@ -430,8 +430,14 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, - case BPF_ALU64 | BPF_DIV | BPF_K: /* dst /= imm */ - if (imm == 0) - return -EINVAL; -- else if (imm == 1) -- goto bpf_alu32_trunc; -+ if (imm == 1) { -+ if (BPF_OP(code) == BPF_DIV) { -+ goto bpf_alu32_trunc; -+ } else { -+ EMIT(PPC_LI(dst_reg, 0)); -+ break; -+ } -+ } - - PPC_LI32(b2p[TMP_REG_1], imm); - switch (BPF_CLASS(code)) { --- -2.33.0 - diff --git a/queue-4.9/series b/queue-4.9/series index 7c27c98e20e..a2c18c2f223 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -16,4 +16,3 @@ netlink-annotate-data-races-around-nlk-bound.patch drm-nouveau-debugfs-fix-file-release-memory-leak.patch rtnetlink-fix-if_nlmsg_stats_size-under-estimation.patch i40e-fix-endless-loop-under-rtnl.patch -powerpc-bpf-fix-bpf_mod-when-imm-1.patch diff --git a/queue-5.10/powerpc-bpf-fix-bpf_mod-when-imm-1.patch b/queue-5.10/powerpc-bpf-fix-bpf_mod-when-imm-1.patch deleted file mode 100644 index c032c7be9e1..00000000000 --- a/queue-5.10/powerpc-bpf-fix-bpf_mod-when-imm-1.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0b095810df7e1e5fa574e416f56047112c5cd8e7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 6 Oct 2021 01:55:22 +0530 -Subject: powerpc/bpf: Fix BPF_MOD when imm == 1 - -From: Naveen N. Rao - -[ Upstream commit 8bbc9d822421d9ac8ff9ed26a3713c9afc69d6c8 ] - -Only ignore the operation if dividing by 1. - -Fixes: 156d0e290e969c ("powerpc/ebpf/jit: Implement JIT compiler for extended BPF") -Signed-off-by: Naveen N. Rao -Tested-by: Johan Almbladh -Reviewed-by: Christophe Leroy -Acked-by: Song Liu -Acked-by: Johan Almbladh -Signed-off-by: Michael Ellerman -Link: https://lore.kernel.org/r/c674ca18c3046885602caebb326213731c675d06.1633464148.git.naveen.n.rao@linux.vnet.ibm.com -Signed-off-by: Sasha Levin ---- - arch/powerpc/net/bpf_jit_comp64.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/arch/powerpc/net/bpf_jit_comp64.c b/arch/powerpc/net/bpf_jit_comp64.c -index 658ca2bab13c..e79f9eae2bc0 100644 ---- a/arch/powerpc/net/bpf_jit_comp64.c -+++ b/arch/powerpc/net/bpf_jit_comp64.c -@@ -408,8 +408,14 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, - case BPF_ALU64 | BPF_DIV | BPF_K: /* dst /= imm */ - if (imm == 0) - return -EINVAL; -- else if (imm == 1) -- goto bpf_alu32_trunc; -+ if (imm == 1) { -+ if (BPF_OP(code) == BPF_DIV) { -+ goto bpf_alu32_trunc; -+ } else { -+ EMIT(PPC_LI(dst_reg, 0)); -+ break; -+ } -+ } - - PPC_LI32(b2p[TMP_REG_1], imm); - switch (BPF_CLASS(code)) { --- -2.33.0 - diff --git a/queue-5.10/series b/queue-5.10/series index f5b591367f4..702a50f6137 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -70,7 +70,6 @@ i2c-mediatek-add-offset_ext_conf-setting-back.patch riscv-vdso-make-arch_setup_additional_pages-wait-for.patch bpf-s390-fix-potential-memory-leak-about-jit_data.patch risc-v-include-clone3-on-rv32.patch -powerpc-bpf-fix-bpf_mod-when-imm-1.patch powerpc-bpf-fix-bpf_sub-when-imm-0x80000000.patch powerpc-64s-fix-program-check-interrupt-emergency-st.patch pseries-eeh-fix-the-kdump-kernel-crash-during-eeh_ps.patch diff --git a/queue-5.4/powerpc-bpf-fix-bpf_mod-when-imm-1.patch b/queue-5.4/powerpc-bpf-fix-bpf_mod-when-imm-1.patch deleted file mode 100644 index 5da733b3193..00000000000 --- a/queue-5.4/powerpc-bpf-fix-bpf_mod-when-imm-1.patch +++ /dev/null @@ -1,48 +0,0 @@ -From e0c5e87fa166904cd133acc8da185b24fe28726e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 6 Oct 2021 01:55:22 +0530 -Subject: powerpc/bpf: Fix BPF_MOD when imm == 1 - -From: Naveen N. Rao - -[ Upstream commit 8bbc9d822421d9ac8ff9ed26a3713c9afc69d6c8 ] - -Only ignore the operation if dividing by 1. - -Fixes: 156d0e290e969c ("powerpc/ebpf/jit: Implement JIT compiler for extended BPF") -Signed-off-by: Naveen N. Rao -Tested-by: Johan Almbladh -Reviewed-by: Christophe Leroy -Acked-by: Song Liu -Acked-by: Johan Almbladh -Signed-off-by: Michael Ellerman -Link: https://lore.kernel.org/r/c674ca18c3046885602caebb326213731c675d06.1633464148.git.naveen.n.rao@linux.vnet.ibm.com -Signed-off-by: Sasha Levin ---- - arch/powerpc/net/bpf_jit_comp64.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/arch/powerpc/net/bpf_jit_comp64.c b/arch/powerpc/net/bpf_jit_comp64.c -index 20bfd753bcba..a05386318f70 100644 ---- a/arch/powerpc/net/bpf_jit_comp64.c -+++ b/arch/powerpc/net/bpf_jit_comp64.c -@@ -408,8 +408,14 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, - case BPF_ALU64 | BPF_DIV | BPF_K: /* dst /= imm */ - if (imm == 0) - return -EINVAL; -- else if (imm == 1) -- goto bpf_alu32_trunc; -+ if (imm == 1) { -+ if (BPF_OP(code) == BPF_DIV) { -+ goto bpf_alu32_trunc; -+ } else { -+ EMIT(PPC_LI(dst_reg, 0)); -+ break; -+ } -+ } - - PPC_LI32(b2p[TMP_REG_1], imm); - switch (BPF_CLASS(code)) { --- -2.33.0 - diff --git a/queue-5.4/series b/queue-5.4/series index 3f849faf025..1f21caa28a0 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -46,7 +46,6 @@ net-prefer-socket-bound-to-interface-when-not-in-vrf.patch i2c-acpi-fix-resource-leak-in-reconfiguration-device.patch bpf-s390-fix-potential-memory-leak-about-jit_data.patch risc-v-include-clone3-on-rv32.patch -powerpc-bpf-fix-bpf_mod-when-imm-1.patch x86-platform-olpc-correct-ifdef-symbol-to-intended-config_olpc_xo15_sci.patch x86-hpet-use-another-crystalball-to-evaluate-hpet-usability.patch x86-kconfig-correct-reference-to-mwinchip3d.patch