From: Adrian Hunter <adrian.hunter@intel.com>

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>
Link: https://lore.kernel.org/r/20221014170905.64069-7-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
[namhyung: use "linux/kernel.h" instead to avoid build failure]
Signed-off-by: Namhyung Kim <namhyung@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 b5c909546e3f..6af062d1c452 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/kernel.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,
@@ -76,6 +78,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.43.0.472.g3155946c3a-goog

On Tue, Jan 09, 2024 at 01:49:55PM -0800, Namhyung Kim wrote:
> From: Adrian Hunter <adrian.hunter@intel.com>
> 
> 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>
> Link: https://lore.kernel.org/r/20221014170905.64069-7-adrian.hunter@intel.com
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> [namhyung: use "linux/kernel.h" instead to avoid build failure]
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
>  tools/perf/util/genelf.h | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

What is the git commit id of this change in Linus's tree?

thanks,

greg k-h

Hello,

On Tue, Jan 9, 2024 at 11:59 PM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> On Tue, Jan 09, 2024 at 01:49:55PM -0800, Namhyung Kim wrote:
> > From: Adrian Hunter <adrian.hunter@intel.com>
> >
> > 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>
> > Link: https://lore.kernel.org/r/20221014170905.64069-7-adrian.hunter@intel.com
> > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> > [namhyung: use "linux/kernel.h" instead to avoid build failure]
> > Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> > ---
> >  tools/perf/util/genelf.h | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
>
> What is the git commit id of this change in Linus's tree?

Sorry I forgot to add that.  It's 89b15d00527b7825ff19130ed83478e80e3fae99

Thanks,
Namhyung

On Wed, Jan 10, 2024 at 09:53:17AM -0800, Namhyung Kim wrote:
> Hello,
> 
> On Tue, Jan 9, 2024 at 11:59 PM Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
> >
> > On Tue, Jan 09, 2024 at 01:49:55PM -0800, Namhyung Kim wrote:
> > > From: Adrian Hunter <adrian.hunter@intel.com>
> > >
> > > 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>
> > > Link: https://lore.kernel.org/r/20221014170905.64069-7-adrian.hunter@intel.com
> > > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> > > [namhyung: use "linux/kernel.h" instead to avoid build failure]
> > > Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> > > ---
> > >  tools/perf/util/genelf.h | 4 +++-
> > >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > What is the git commit id of this change in Linus's tree?
> 
> Sorry I forgot to add that.  It's 89b15d00527b7825ff19130ed83478e80e3fae99

Thanks, now queued up.

greg k-h