From: Greg Kroah-Hartman Date: Mon, 16 Oct 2023 16:59:17 +0000 (+0200) Subject: drop perf-inject-fix-gen_elf_text_offset-for-jit.patch from all queues X-Git-Tag: v5.15.136~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5334062d9072e147d7ddc729f2e145961c0ac8e8;p=thirdparty%2Fkernel%2Fstable-queue.git drop perf-inject-fix-gen_elf_text_offset-for-jit.patch from all queues breaks the build. --- diff --git a/queue-4.19/perf-inject-fix-gen_elf_text_offset-for-jit.patch b/queue-4.19/perf-inject-fix-gen_elf_text_offset-for-jit.patch deleted file mode 100644 index d049a14d610..00000000000 --- a/queue-4.19/perf-inject-fix-gen_elf_text_offset-for-jit.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 83e311b1992042a982a9b6a91045131debb1061c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 14 Oct 2022 20:09:04 +0300 -Subject: perf inject: Fix GEN_ELF_TEXT_OFFSET for jit - -From: Adrian Hunter - -[ Upstream commit 89b15d00527b7825ff19130ed83478e80e3fae99 ] - -When a program header was added, it moved the text section but -GEN_ELF_TEXT_OFFSET was not updated. - -Fix by adding the program header size and aligning. - -Fixes: babd04386b1df8c3 ("perf jit: Include program header in ELF files") -Signed-off-by: Adrian Hunter -Tested-by: Arnaldo Carvalho de Melo -Cc: Ian Rogers -Cc: Jiri Olsa -Cc: Lieven Hey -Cc: Namhyung Kim -Link: https://lore.kernel.org/r/20221014170905.64069-7-adrian.hunter@intel.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/util/genelf.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/util/genelf.h b/tools/perf/util/genelf.h -index 23a7401a63d02..7f5ce4f285d8b 100644 ---- a/tools/perf/util/genelf.h -+++ b/tools/perf/util/genelf.h -@@ -2,6 +2,8 @@ - #ifndef __GENELF_H__ - #define __GENELF_H__ - -+#include -+ - /* genelf.c */ - int jit_write_elf(int fd, uint64_t code_addr, const char *sym, - const void *code, int csize, void *debug, int nr_debug_entries, -@@ -64,6 +66,6 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent - #endif - - /* The .text section is directly after the ELF header */ --#define GEN_ELF_TEXT_OFFSET sizeof(Elf_Ehdr) -+#define GEN_ELF_TEXT_OFFSET round_up(sizeof(Elf_Ehdr) + sizeof(Elf_Phdr), 16) - - #endif --- -2.40.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 47c0088e7d3..bbd72b80868 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -17,7 +17,6 @@ ixgbe-fix-crash-with-empty-vf-macvlan-list.patch net-nfc-fix-races-in-nfc_llcp_sock_get-and-nfc_llcp_.patch nfc-nci-assert-requested-protocol-is-valid.patch workqueue-override-implicit-ordered-attribute-in-wor.patch -perf-inject-fix-gen_elf_text_offset-for-jit.patch sched-idle-rcu-push-rcu_idle-deeper-into-the-idle-path.patch dmaengine-stm32-mdma-abort-resume-if-no-ongoing-transfer.patch usb-xhci-xhci-ring-use-sysdev-for-mapping-bounce-buffer.patch diff --git a/queue-5.10/perf-inject-fix-gen_elf_text_offset-for-jit.patch b/queue-5.10/perf-inject-fix-gen_elf_text_offset-for-jit.patch deleted file mode 100644 index ef3dcdfacfb..00000000000 --- a/queue-5.10/perf-inject-fix-gen_elf_text_offset-for-jit.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 828b08b76bee95e3aff9b5fdd3931854331aaaba Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 14 Oct 2022 20:09:04 +0300 -Subject: perf inject: Fix GEN_ELF_TEXT_OFFSET for jit - -From: Adrian Hunter - -[ Upstream commit 89b15d00527b7825ff19130ed83478e80e3fae99 ] - -When a program header was added, it moved the text section but -GEN_ELF_TEXT_OFFSET was not updated. - -Fix by adding the program header size and aligning. - -Fixes: babd04386b1df8c3 ("perf jit: Include program header in ELF files") -Signed-off-by: Adrian Hunter -Tested-by: Arnaldo Carvalho de Melo -Cc: Ian Rogers -Cc: Jiri Olsa -Cc: Lieven Hey -Cc: Namhyung Kim -Link: https://lore.kernel.org/r/20221014170905.64069-7-adrian.hunter@intel.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/util/genelf.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/util/genelf.h b/tools/perf/util/genelf.h -index ac638945b4cb0..159c69bcc33e6 100644 ---- a/tools/perf/util/genelf.h -+++ b/tools/perf/util/genelf.h -@@ -2,6 +2,8 @@ - #ifndef __GENELF_H__ - #define __GENELF_H__ - -+#include -+ - /* genelf.c */ - int jit_write_elf(int fd, uint64_t code_addr, const char *sym, - const void *code, int csize, void *debug, int nr_debug_entries, -@@ -73,6 +75,6 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent - #endif - - /* The .text section is directly after the ELF header */ --#define GEN_ELF_TEXT_OFFSET sizeof(Elf_Ehdr) -+#define GEN_ELF_TEXT_OFFSET round_up(sizeof(Elf_Ehdr) + sizeof(Elf_Phdr), 16) - - #endif --- -2.40.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 3449a57747f..b319fa5a309 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -26,7 +26,6 @@ ethtool-fix-mod-state-of-verbose-no_mask-bitset.patch pinctrl-renesas-rzn1-enable-missing-pinmux.patch nfc-nci-assert-requested-protocol-is-valid.patch workqueue-override-implicit-ordered-attribute-in-wor.patch -perf-inject-fix-gen_elf_text_offset-for-jit.patch revert-spi-zynqmp-gqspi-fix-clock-imbalance-on-probe.patch revert-spi-spi-zynqmp-gqspi-fix-runtime-pm-imbalance.patch net-add-sysctl-accept_ra_min_rtr_lft.patch diff --git a/queue-5.15/perf-inject-fix-gen_elf_text_offset-for-jit.patch b/queue-5.15/perf-inject-fix-gen_elf_text_offset-for-jit.patch deleted file mode 100644 index f465845b9be..00000000000 --- a/queue-5.15/perf-inject-fix-gen_elf_text_offset-for-jit.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 9474d779678c71aaa84d0d863b81914213ef9ab0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 14 Oct 2022 20:09:04 +0300 -Subject: perf inject: Fix GEN_ELF_TEXT_OFFSET for jit - -From: Adrian Hunter - -[ Upstream commit 89b15d00527b7825ff19130ed83478e80e3fae99 ] - -When a program header was added, it moved the text section but -GEN_ELF_TEXT_OFFSET was not updated. - -Fix by adding the program header size and aligning. - -Fixes: babd04386b1df8c3 ("perf jit: Include program header in ELF files") -Signed-off-by: Adrian Hunter -Tested-by: Arnaldo Carvalho de Melo -Cc: Ian Rogers -Cc: Jiri Olsa -Cc: Lieven Hey -Cc: Namhyung Kim -Link: https://lore.kernel.org/r/20221014170905.64069-7-adrian.hunter@intel.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/util/genelf.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/util/genelf.h b/tools/perf/util/genelf.h -index ac638945b4cb0..159c69bcc33e6 100644 ---- a/tools/perf/util/genelf.h -+++ b/tools/perf/util/genelf.h -@@ -2,6 +2,8 @@ - #ifndef __GENELF_H__ - #define __GENELF_H__ - -+#include -+ - /* genelf.c */ - int jit_write_elf(int fd, uint64_t code_addr, const char *sym, - const void *code, int csize, void *debug, int nr_debug_entries, -@@ -73,6 +75,6 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent - #endif - - /* The .text section is directly after the ELF header */ --#define GEN_ELF_TEXT_OFFSET sizeof(Elf_Ehdr) -+#define GEN_ELF_TEXT_OFFSET round_up(sizeof(Elf_Ehdr) + sizeof(Elf_Phdr), 16) - - #endif --- -2.40.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 9233c1f3731..41792fae0d5 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -39,7 +39,6 @@ net-smc-fix-pos-miscalculation-in-statistics.patch pinctrl-renesas-rzn1-enable-missing-pinmux.patch nfc-nci-assert-requested-protocol-is-valid.patch workqueue-override-implicit-ordered-attribute-in-wor.patch -perf-inject-fix-gen_elf_text_offset-for-jit.patch net-add-sysctl-accept_ra_min_rtr_lft.patch net-change-accept_ra_min_rtr_lft-to-affect-all-ra-lifetimes.patch net-release-reference-to-inet6_dev-pointer.patch diff --git a/queue-5.4/perf-inject-fix-gen_elf_text_offset-for-jit.patch b/queue-5.4/perf-inject-fix-gen_elf_text_offset-for-jit.patch deleted file mode 100644 index a3d93b9900c..00000000000 --- a/queue-5.4/perf-inject-fix-gen_elf_text_offset-for-jit.patch +++ /dev/null @@ -1,52 +0,0 @@ -From f1afd34891218acf5d538ef0f4ea104e011fff9c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 14 Oct 2022 20:09:04 +0300 -Subject: perf inject: Fix GEN_ELF_TEXT_OFFSET for jit - -From: Adrian Hunter - -[ Upstream commit 89b15d00527b7825ff19130ed83478e80e3fae99 ] - -When a program header was added, it moved the text section but -GEN_ELF_TEXT_OFFSET was not updated. - -Fix by adding the program header size and aligning. - -Fixes: babd04386b1df8c3 ("perf jit: Include program header in ELF files") -Signed-off-by: Adrian Hunter -Tested-by: Arnaldo Carvalho de Melo -Cc: Ian Rogers -Cc: Jiri Olsa -Cc: Lieven Hey -Cc: Namhyung Kim -Link: https://lore.kernel.org/r/20221014170905.64069-7-adrian.hunter@intel.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/util/genelf.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/util/genelf.h b/tools/perf/util/genelf.h -index ac638945b4cb0..159c69bcc33e6 100644 ---- a/tools/perf/util/genelf.h -+++ b/tools/perf/util/genelf.h -@@ -2,6 +2,8 @@ - #ifndef __GENELF_H__ - #define __GENELF_H__ - -+#include -+ - /* genelf.c */ - int jit_write_elf(int fd, uint64_t code_addr, const char *sym, - const void *code, int csize, void *debug, int nr_debug_entries, -@@ -73,6 +75,6 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent - #endif - - /* The .text section is directly after the ELF header */ --#define GEN_ELF_TEXT_OFFSET sizeof(Elf_Ehdr) -+#define GEN_ELF_TEXT_OFFSET round_up(sizeof(Elf_Ehdr) + sizeof(Elf_Phdr), 16) - - #endif --- -2.40.1 - diff --git a/queue-5.4/series b/queue-5.4/series index faab2b484a3..94aee64295f 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -17,7 +17,6 @@ ixgbe-fix-crash-with-empty-vf-macvlan-list.patch net-nfc-fix-races-in-nfc_llcp_sock_get-and-nfc_llcp_.patch nfc-nci-assert-requested-protocol-is-valid.patch workqueue-override-implicit-ordered-attribute-in-wor.patch -perf-inject-fix-gen_elf_text_offset-for-jit.patch dmaengine-stm32-mdma-abort-resume-if-no-ongoing-transfer.patch usb-xhci-xhci-ring-use-sysdev-for-mapping-bounce-buffer.patch net-usb-dm9601-fix-uninitialized-variable-use-in-dm9601_mdio_read.patch