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

Commit b28503a3 authored by Thomas Richter's avatar Thomas Richter Committed by Arnaldo Carvalho de Melo
Browse files

perf test: Fix vmlinux failure on s390x 



On s390x perf test 1 failed. It turned out that commit 4a084ecf
("perf report: Fix module symbol adjustment for s390x") was incorrect.
The previous implementation in dso__load_sym() is also suitable for
s390x.

Therefore this patch undoes commit 4a084ecf.

Signed-off-by: default avatarThomas-Mich Richter <tmricht@linux.vnet.ibm.com>
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Zvonko Kosic <zvonko.kosic@de.ibm.com>
Fixes: 4a084ecf ("perf report: Fix module symbol adjustment for s390x")
LPU-Reference: 20170915071404.58398-1-tmricht@linux.vnet.ibm.com
Link: http://lkml.kernel.org/n/tip-5ani7ly57zji7s0hmzkx416l@git.kernel.org


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

tools/perf/arch/s390/util/sym-handling.c

+0 −8
Original line number Diff line number Diff line
@@ -18,12 +18,4 @@ bool elf__needs_adjust_symbols(GElf_Ehdr ehdr) 
		return false;

	return ehdr.e_type == ET_REL || ehdr.e_type == ET_DYN;

}



void arch__adjust_sym_map_offset(GElf_Sym *sym,

				 GElf_Shdr *shdr __maybe_unused,

				 struct map *map)

{

	if (map->type == MAP__FUNCTION)

		sym->st_value += map->start;

}

#endif

tools/perf/util/symbol-elf.c

+1 −7
Original line number Diff line number Diff line
@@ -810,12 +810,6 @@ static u64 ref_reloc(struct kmap *kmap) 
void __weak arch__sym_update(struct symbol *s __maybe_unused,

		GElf_Sym *sym __maybe_unused) { }



void __weak arch__adjust_sym_map_offset(GElf_Sym *sym, GElf_Shdr *shdr,

				       struct map *map __maybe_unused)

{

	sym->st_value -= shdr->sh_addr - shdr->sh_offset;

}



int dso__load_sym(struct dso *dso, struct map *map, struct symsrc *syms_ss,

		  struct symsrc *runtime_ss, int kmodule)

{
@@ -996,7 +990,7 @@ int dso__load_sym(struct dso *dso, struct map *map, struct symsrc *syms_ss, 


			/* Adjust symbol to map to file offset */

			if (adjust_kernel_syms)

				arch__adjust_sym_map_offset(&sym, &shdr, map);

				sym.st_value -= shdr.sh_addr - shdr.sh_offset;



			if (strcmp(section_name,

				   (curr_dso->short_name +

tools/perf/util/symbol.h

+0 −3
Original line number Diff line number Diff line
@@ -344,9 +344,6 @@ int setup_intlist(struct intlist **list, const char *list_str, 
#ifdef HAVE_LIBELF_SUPPORT

bool elf__needs_adjust_symbols(GElf_Ehdr ehdr);

void arch__sym_update(struct symbol *s, GElf_Sym *sym);

void arch__adjust_sym_map_offset(GElf_Sym *sym,

				 GElf_Shdr *shdr __maybe_unused,

				 struct map *map __maybe_unused);

#endif



#define SYMBOL_A 0