From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755087AbeEXFmW (ORCPT ); Thu, 24 May 2018 01:42:22 -0400 Received: from terminus.zytor.com ([198.137.202.136]:60081 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754937AbeEXFmT (ORCPT ); Thu, 24 May 2018 01:42:19 -0400 Date: Wed, 23 May 2018 22:41:54 -0700 From: tip-bot for Adrian Hunter Message-ID: Cc: dave.hansen@linux.intel.com, jolsa@redhat.com, alexander.shishkin@linux.intel.com, hpa@zytor.com, luto@kernel.org, joro@8bytes.org, mingo@kernel.org, tglx@linutronix.de, ak@linux.intel.com, peterz@infradead.org, acme@redhat.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org Reply-To: hpa@zytor.com, luto@kernel.org, joro@8bytes.org, dave.hansen@linux.intel.com, jolsa@redhat.com, alexander.shishkin@linux.intel.com, peterz@infradead.org, acme@redhat.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, mingo@kernel.org, tglx@linutronix.de, ak@linux.intel.com In-Reply-To: <1526986485-6562-11-git-send-email-adrian.hunter@intel.com> References: <1526986485-6562-11-git-send-email-adrian.hunter@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf kcore_copy: Keep phdr data in a list Git-Commit-ID: f6838209484d5cfb368ca5c61d150cc4054eef59 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f6838209484d5cfb368ca5c61d150cc4054eef59 Gitweb: https://git.kernel.org/tip/f6838209484d5cfb368ca5c61d150cc4054eef59 Author: Adrian Hunter AuthorDate: Tue, 22 May 2018 13:54:38 +0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 23 May 2018 10:26:40 -0300 perf kcore_copy: Keep phdr data in a list Currently, kcore_copy makes 2 program headers, one for the kernel text (namely kernel_map) and one for the modules (namely modules_map). Now more program headers are needed, but treating each program header as a special case results in much more code. Instead, in preparation to add more program headers, change to keep program header data (phdr_data) in a list. 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-11-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/symbol-elf.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 48943b834f11..b13873a6f368 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -1388,6 +1388,7 @@ struct phdr_data { off_t offset; u64 addr; u64 len; + struct list_head node; }; struct kcore_copy_info { @@ -1399,6 +1400,7 @@ struct kcore_copy_info { u64 last_module_symbol; struct phdr_data kernel_map; struct phdr_data modules_map; + struct list_head phdrs; }; static int kcore_copy__process_kallsyms(void *arg, const char *name, char type, @@ -1510,6 +1512,11 @@ static int kcore_copy__read_maps(struct kcore_copy_info *kci, Elf *elf) if (elf_read_maps(elf, true, kcore_copy__read_map, kci) < 0) return -1; + if (kci->kernel_map.len) + list_add_tail(&kci->kernel_map.node, &kci->phdrs); + if (kci->modules_map.len) + list_add_tail(&kci->modules_map.node, &kci->phdrs); + return 0; } @@ -1678,6 +1685,8 @@ int kcore_copy(const char *from_dir, const char *to_dir) char kcore_filename[PATH_MAX]; char extract_filename[PATH_MAX]; + INIT_LIST_HEAD(&kci.phdrs); + if (kcore_copy__copy_file(from_dir, to_dir, "kallsyms")) return -1;