Fixes for 5.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

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
new file mode 100644 (file)
index 0000000..a3d93b9
--- /dev/null
+++ b/queue-5.4/perf-inject-fix-gen_elf_text_offset-for-jit.patch
@@ -0,0 +1,52 @@
+From f1afd34891218acf5d538ef0f4ea104e011fff9c Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Fri, 14 Oct 2022 20:09:04 +0300
+Subject: perf inject: Fix GEN_ELF_TEXT_OFFSET for jit
+
+From: Adrian Hunter <adrian.hunter@intel.com>
+
+[ 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 <adrian.hunter@intel.com>
+Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: Ian Rogers <irogers@google.com>
+Cc: Jiri Olsa <jolsa@kernel.org>
+Cc: Lieven Hey <lieven.hey@kdab.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Link: https://lore.kernel.org/r/20221014170905.64069-7-adrian.hunter@intel.com
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ 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 <linux/math.h>
++
+ /* 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 879e070f357957918f3847d5f53a7b32bc8f994d..168c4caaf8848cfbf668b1b87a18437f822f3d3d 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -17,3 +17,4 @@ 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