Patch "perf inject: Fix GEN_ELF_TEXT_OFFSET for jit" has been added to the 4.19-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    perf inject: Fix GEN_ELF_TEXT_OFFSET for jit

to the 4.19-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     perf-inject-fix-gen_elf_text_offset-for-jit.patch
and it can be found in the queue-4.19 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 83e311b1992042a982a9b6a91045131debb1061c
Author: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Date:   Fri Oct 14 20:09:04 2022 +0300

    perf inject: Fix GEN_ELF_TEXT_OFFSET for jit
    
    [ 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@xxxxxxxxx>
    Tested-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
    Cc: Ian Rogers <irogers@xxxxxxxxxx>
    Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
    Cc: Lieven Hey <lieven.hey@xxxxxxxx>
    Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20221014170905.64069-7-adrian.hunter@xxxxxxxxx
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

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 <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,
@@ -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



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux