From c9dd1d894958b81a329ec01e7dd03b92eca52789 Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Tue, 22 May 2018 13:54:40 +0300 Subject: [PATCH] perf kcore_copy: Calculate offset from phnum In preparation to add more program headers, calculate offset from the number of phdrs. Signed-off-by: Adrian Hunter Cc: Alexander Shishkin Cc: Andi Kleen Cc: Andy Lutomirski Cc: Dave Hansen Cc: H. Peter Anvin Cc: Jiri Olsa Cc: Joerg Roedel Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: x86@kernel.org Link: http://lkml.kernel.org/r/1526986485-6562-13-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/symbol-elf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 4e7b71e8ac0e..4aec12102e19 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -1682,7 +1682,7 @@ int kcore_copy(const char *from_dir, const char *to_dir) struct kcore kcore; struct kcore extract; int idx = 0, err = -1; - off_t offset = page_size, sz, modules_offset = 0; + off_t offset, sz, modules_offset = 0; struct kcore_copy_info kci = { .stext = 0, }; char kcore_filename[PATH_MAX]; char extract_filename[PATH_MAX]; @@ -1710,6 +1710,10 @@ int kcore_copy(const char *from_dir, const char *to_dir) if (kcore__copy_hdr(&kcore, &extract, kci.phnum)) goto out_extract_close; + offset = gelf_fsize(extract.elf, ELF_T_EHDR, 1, EV_CURRENT) + + gelf_fsize(extract.elf, ELF_T_PHDR, kci.phnum, EV_CURRENT); + offset = round_up(offset, page_size); + if (kcore__add_phdr(&extract, idx++, offset, kci.kernel_map.addr, kci.kernel_map.len)) goto out_extract_close; -- GitLab