LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: Adrian Hunter <adrian.hunter@intel.com> To: Thomas Gleixner <tglx@linutronix.de>, Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Ingo Molnar <mingo@redhat.com>, Peter Zijlstra <peterz@infradead.org>, Andy Lutomirski <luto@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>, Andi Kleen <ak@linux.intel.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Dave Hansen <dave.hansen@linux.intel.com>, Joerg Roedel <joro@8bytes.org>, Jiri Olsa <jolsa@redhat.com>, linux-kernel@vger.kernel.org, x86@kernel.org Subject: [PATCH V2 15/20] perf buildid-cache: kcore_copy: Calculate offset from phnum Date: Thu, 17 May 2018 12:22:03 +0300 [thread overview] Message-ID: <1526548928-20790-16-git-send-email-adrian.hunter@intel.com> (raw) In-Reply-To: <1526548928-20790-1-git-send-email-adrian.hunter@intel.com> In preparation to add more program headers, calculate offset from the number of phdrs. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- 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; -- 1.9.1
next prev parent reply other threads:[~2018-05-17 9:24 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-17 9:21 [PATCH V2 00/20] perf tools and x86 PTI entry trampolines Adrian Hunter 2018-05-17 9:21 ` [PATCH V2 01/20] kallsyms: Simplify update_iter_mod() Adrian Hunter 2018-05-17 9:21 ` [PATCH V2 02/20] kallsyms, x86: Export addresses of syscall trampolines Adrian Hunter 2018-05-17 9:21 ` [PATCH V2 03/20] x86: Add entry trampolines to kcore Adrian Hunter 2018-05-17 17:52 ` Dave Hansen 2018-05-17 18:09 ` Arnaldo Carvalho de Melo 2018-05-17 9:21 ` [PATCH V2 04/20] x86: kcore: Give entry trampolines all the same offset in kcore Adrian Hunter 2018-05-17 17:54 ` Dave Hansen 2018-05-17 9:21 ` [PATCH V2 05/20] perf tools: Add machine__is() to identify machine arch Adrian Hunter 2018-05-19 11:47 ` [tip:perf/core] perf machine: " tip-bot for Adrian Hunter 2018-05-17 9:21 ` [PATCH V2 06/20] perf tools: Fix kernel_start for PTI on x86 Adrian Hunter 2018-05-19 11:48 ` [tip:perf/core] " tip-bot for Adrian Hunter 2018-05-17 9:21 ` [PATCH V2 07/20] perf tools: Add machine__nr_cpus_avail() Adrian Hunter 2018-05-17 9:21 ` [PATCH V2 08/20] perf tools: Workaround missing maps for x86 PTI entry trampolines Adrian Hunter 2018-05-17 9:21 ` [PATCH V2 09/20] perf tools: Fix map_groups__split_kallsyms() for entry trampoline symbols Adrian Hunter 2018-05-17 9:21 ` [PATCH V2 10/20] perf tools: Allow for extra kernel maps Adrian Hunter 2018-05-17 9:21 ` [PATCH V2 11/20] perf tools: Create maps for x86 PTI entry trampolines Adrian Hunter 2018-05-17 9:22 ` [PATCH V2 12/20] perf tools: Synthesize and process mmap events " Adrian Hunter 2018-05-17 9:22 ` [PATCH V2 13/20] perf buildid-cache: kcore_copy: Keep phdr data in a list Adrian Hunter 2018-05-17 9:22 ` [PATCH V2 14/20] perf buildid-cache: kcore_copy: Keep a count of phdrs Adrian Hunter 2018-05-17 9:22 ` Adrian Hunter [this message] 2018-05-17 9:22 ` [PATCH V2 16/20] perf buildid-cache: kcore_copy: Layout sections Adrian Hunter 2018-05-17 9:22 ` [PATCH V2 17/20] perf buildid-cache: kcore_copy: Iterate phdrs Adrian Hunter 2018-05-17 9:22 ` [PATCH V2 18/20] perf buildid-cache: kcore_copy: Get rid of kernel_map Adrian Hunter 2018-05-17 9:22 ` [PATCH V2 19/20] perf buildid-cache: kcore_copy: Copy x86 PTI entry trampoline sections Adrian Hunter 2018-05-17 9:22 ` [PATCH V2 20/20] perf buildid-cache: kcore_copy: Amend the offset of sections that remap kernel text Adrian Hunter
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1526548928-20790-16-git-send-email-adrian.hunter@intel.com \ --to=adrian.hunter@intel.com \ --cc=acme@kernel.org \ --cc=ak@linux.intel.com \ --cc=alexander.shishkin@linux.intel.com \ --cc=dave.hansen@linux.intel.com \ --cc=hpa@zytor.com \ --cc=jolsa@redhat.com \ --cc=joro@8bytes.org \ --cc=linux-kernel@vger.kernel.org \ --cc=luto@kernel.org \ --cc=mingo@redhat.com \ --cc=peterz@infradead.org \ --cc=tglx@linutronix.de \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).