Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2c95980 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf kcore_copy: Iterate phdrs 



In preparation to add more program headers, iterate phdrs instead of
assuming there is only one for the kernel text and one for the modules.

Signed-off-by: default avatarAdrian 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-15-git-send-email-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 15acef6c

tools/perf/util/symbol-elf.c

+10 −15
Original line number Diff line number Diff line
@@ -1701,10 +1701,11 @@ 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, sz, modules_offset = 0;

	off_t offset, sz;

	struct kcore_copy_info kci = { .stext = 0, };

	char kcore_filename[PATH_MAX];

	char extract_filename[PATH_MAX];

	struct phdr_data *p;



	INIT_LIST_HEAD(&kci.phdrs);
@@ -1733,14 +1734,10 @@ int kcore_copy(const char *from_dir, const char *to_dir) 
		 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;

	kcore_copy__for_each_phdr(&kci, p) {

		off_t offs = p->rel + offset;



	if (kci.modules_map.addr) {

		modules_offset = offset + kci.kernel_map.len;

		if (kcore__add_phdr(&extract, idx, modules_offset,

				    kci.modules_map.addr, kci.modules_map.len))

		if (kcore__add_phdr(&extract, idx++, offs, p->addr, p->len))

			goto out_extract_close;

	}
@@ -1748,14 +1745,12 @@ int kcore_copy(const char *from_dir, const char *to_dir) 
	if (sz < 0 || sz > offset)

		goto out_extract_close;



	if (copy_bytes(kcore.fd, kci.kernel_map.offset, extract.fd, offset,

		       kci.kernel_map.len))

		goto out_extract_close;

	kcore_copy__for_each_phdr(&kci, p) {

		off_t offs = p->rel + offset;



	if (modules_offset && copy_bytes(kcore.fd, kci.modules_map.offset,

					 extract.fd, modules_offset,

					 kci.modules_map.len))

		if (copy_bytes(kcore.fd, p->offset, extract.fd, offs, p->len))

			goto out_extract_close;

	}



	if (kcore_copy__compare_file(from_dir, to_dir, "modules"))

		goto out_extract_close;