mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-07-14 21:43:02 +02:00
Adrian HunterandGreg Kroah-Hartman
0eb556b238
commit89b15d0052upstream. 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:babd04386b("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> [namhyung: use "linux/kernel.h" instead to avoid build failure] Signed-off-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
81 lines
2.3 KiB
C
81 lines
2.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#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,
|
|
void *unwinding, uint64_t unwinding_header_size, uint64_t unwinding_size);
|
|
#ifdef HAVE_DWARF_SUPPORT
|
|
/* genelf_debug.c */
|
|
int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_entries);
|
|
#endif
|
|
|
|
#if defined(__arm__)
|
|
#define GEN_ELF_ARCH EM_ARM
|
|
#define GEN_ELF_CLASS ELFCLASS32
|
|
#elif defined(__aarch64__)
|
|
#define GEN_ELF_ARCH EM_AARCH64
|
|
#define GEN_ELF_CLASS ELFCLASS64
|
|
#elif defined(__x86_64__)
|
|
#define GEN_ELF_ARCH EM_X86_64
|
|
#define GEN_ELF_CLASS ELFCLASS64
|
|
#elif defined(__i386__)
|
|
#define GEN_ELF_ARCH EM_386
|
|
#define GEN_ELF_CLASS ELFCLASS32
|
|
#elif defined(__powerpc64__)
|
|
#define GEN_ELF_ARCH EM_PPC64
|
|
#define GEN_ELF_CLASS ELFCLASS64
|
|
#elif defined(__powerpc__)
|
|
#define GEN_ELF_ARCH EM_PPC
|
|
#define GEN_ELF_CLASS ELFCLASS32
|
|
#elif defined(__sparc__) && defined(__arch64__)
|
|
#define GEN_ELF_ARCH EM_SPARCV9
|
|
#define GEN_ELF_CLASS ELFCLASS64
|
|
#elif defined(__sparc__)
|
|
#define GEN_ELF_ARCH EM_SPARC
|
|
#define GEN_ELF_CLASS ELFCLASS32
|
|
#elif defined(__s390x__)
|
|
#define GEN_ELF_ARCH EM_S390
|
|
#define GEN_ELF_CLASS ELFCLASS64
|
|
#else
|
|
#error "unsupported architecture"
|
|
#endif
|
|
|
|
#if __BYTE_ORDER == __BIG_ENDIAN
|
|
#define GEN_ELF_ENDIAN ELFDATA2MSB
|
|
#else
|
|
#define GEN_ELF_ENDIAN ELFDATA2LSB
|
|
#endif
|
|
|
|
#if GEN_ELF_CLASS == ELFCLASS64
|
|
#define elf_newehdr elf64_newehdr
|
|
#define elf_newphdr elf64_newphdr
|
|
#define elf_getshdr elf64_getshdr
|
|
#define Elf_Ehdr Elf64_Ehdr
|
|
#define Elf_Phdr Elf64_Phdr
|
|
#define Elf_Shdr Elf64_Shdr
|
|
#define Elf_Sym Elf64_Sym
|
|
#define ELF_ST_TYPE(a) ELF64_ST_TYPE(a)
|
|
#define ELF_ST_BIND(a) ELF64_ST_BIND(a)
|
|
#define ELF_ST_VIS(a) ELF64_ST_VISIBILITY(a)
|
|
#else
|
|
#define elf_newehdr elf32_newehdr
|
|
#define elf_newphdr elf32_newphdr
|
|
#define elf_getshdr elf32_getshdr
|
|
#define Elf_Ehdr Elf32_Ehdr
|
|
#define Elf_Phdr Elf32_Phdr
|
|
#define Elf_Shdr Elf32_Shdr
|
|
#define Elf_Sym Elf32_Sym
|
|
#define ELF_ST_TYPE(a) ELF32_ST_TYPE(a)
|
|
#define ELF_ST_BIND(a) ELF32_ST_BIND(a)
|
|
#define ELF_ST_VIS(a) ELF32_ST_VISIBILITY(a)
|
|
#endif
|
|
|
|
/* The .text section is directly after the ELF header */
|
|
#define GEN_ELF_TEXT_OFFSET round_up(sizeof(Elf_Ehdr) + sizeof(Elf_Phdr), 16)
|
|
|
|
#endif
|