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

perf kcore_copy: Layout sections 



In preparation to add more program headers, layout the relative offset
of each section.

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-14-git-send-email-adrian.hunter@intel.com


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

tools/perf/util/symbol-elf.c

+22 −3
Original line number Diff line number Diff line
@@ -1386,6 +1386,7 @@ static off_t kcore__write(struct kcore *kcore) 


struct phdr_data {

	off_t offset;

	off_t rel;

	u64 addr;

	u64 len;

	struct list_head node;
@@ -1404,6 +1405,9 @@ struct kcore_copy_info { 
	struct list_head phdrs;

};



#define kcore_copy__for_each_phdr(k, p) \

	list_for_each_entry((p), &(k)->phdrs, node)



static int kcore_copy__process_kallsyms(void *arg, const char *name, char type,

					u64 start)

{
@@ -1518,11 +1522,21 @@ static int kcore_copy__read_maps(struct kcore_copy_info *kci, Elf *elf) 
	if (kci->modules_map.len)

		list_add_tail(&kci->modules_map.node, &kci->phdrs);



	kci->phnum = !!kci->kernel_map.len + !!kci->modules_map.len;



	return 0;

}



static void kcore_copy__layout(struct kcore_copy_info *kci)

{

	struct phdr_data *p;

	off_t rel = 0;



	kcore_copy__for_each_phdr(kci, p) {

		p->rel = rel;

		rel += p->len;

		kci->phnum += 1;

	}

}



static int kcore_copy__calc_maps(struct kcore_copy_info *kci, const char *dir,

				 Elf *elf)

{
@@ -1558,7 +1572,12 @@ static int kcore_copy__calc_maps(struct kcore_copy_info *kci, const char *dir, 
	if (kci->first_module && !kci->last_module_symbol)

		return -1;



	return kcore_copy__read_maps(kci, elf);

	if (kcore_copy__read_maps(kci, elf))

		return -1;



	kcore_copy__layout(kci);



	return 0;

}



static int kcore_copy__copy_file(const char *from_dir, const char *to_dir,

CRA Git | Maintained and supported by SUSTech CRA and CCSE