perf kcore_copy: Keep a count of phdrs
In preparation to add more program headers, keep a count of phdrs. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Joerg Roedel <joro@8bytes.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: x86@kernel.org Link: http://lkml.kernel.org/r/1526986485-6562-12-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
f683820948
commit
6e97957d3d
|
@ -1398,6 +1398,7 @@ struct kcore_copy_info {
|
||||||
u64 last_symbol;
|
u64 last_symbol;
|
||||||
u64 first_module;
|
u64 first_module;
|
||||||
u64 last_module_symbol;
|
u64 last_module_symbol;
|
||||||
|
size_t phnum;
|
||||||
struct phdr_data kernel_map;
|
struct phdr_data kernel_map;
|
||||||
struct phdr_data modules_map;
|
struct phdr_data modules_map;
|
||||||
struct list_head phdrs;
|
struct list_head phdrs;
|
||||||
|
@ -1517,6 +1518,8 @@ static int kcore_copy__read_maps(struct kcore_copy_info *kci, Elf *elf)
|
||||||
if (kci->modules_map.len)
|
if (kci->modules_map.len)
|
||||||
list_add_tail(&kci->modules_map.node, &kci->phdrs);
|
list_add_tail(&kci->modules_map.node, &kci->phdrs);
|
||||||
|
|
||||||
|
kci->phnum = !!kci->kernel_map.len + !!kci->modules_map.len;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1678,7 +1681,6 @@ int kcore_copy(const char *from_dir, const char *to_dir)
|
||||||
{
|
{
|
||||||
struct kcore kcore;
|
struct kcore kcore;
|
||||||
struct kcore extract;
|
struct kcore extract;
|
||||||
size_t count = 2;
|
|
||||||
int idx = 0, err = -1;
|
int idx = 0, err = -1;
|
||||||
off_t offset = page_size, sz, modules_offset = 0;
|
off_t offset = page_size, sz, modules_offset = 0;
|
||||||
struct kcore_copy_info kci = { .stext = 0, };
|
struct kcore_copy_info kci = { .stext = 0, };
|
||||||
|
@ -1705,10 +1707,7 @@ int kcore_copy(const char *from_dir, const char *to_dir)
|
||||||
if (kcore__init(&extract, extract_filename, kcore.elfclass, false))
|
if (kcore__init(&extract, extract_filename, kcore.elfclass, false))
|
||||||
goto out_kcore_close;
|
goto out_kcore_close;
|
||||||
|
|
||||||
if (!kci.modules_map.addr)
|
if (kcore__copy_hdr(&kcore, &extract, kci.phnum))
|
||||||
count -= 1;
|
|
||||||
|
|
||||||
if (kcore__copy_hdr(&kcore, &extract, count))
|
|
||||||
goto out_extract_close;
|
goto out_extract_close;
|
||||||
|
|
||||||
if (kcore__add_phdr(&extract, idx++, offset, kci.kernel_map.addr,
|
if (kcore__add_phdr(&extract, idx++, offset, kci.kernel_map.addr,
|
||||||
|
|
Loading…
Reference in a new issue