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

Commit 203d8a4a authored by Song Shan Gong's avatar Song Shan Gong Committed by Arnaldo Carvalho de Melo
Browse files

perf s390: Fix 'start' address of module's map 



At present, when creating module's map, perf gets 'start' address by
parsing '/proc/modules', but it's the module base address, it isn't the
start address of the '.text' section.

In most arches, it's OK. But for s390, it places 'GOT' and 'PLT'
relocations before '.text' section. So there exists an offset between
module base address and '.text' section, which will incur wrong symbol
resolution for modules.

Fix this bug by getting 'start' address of module's map from parsing
'/sys/module/[module name]/sections/.text', not from '/proc/modules'.

Signed-off-by: default avatarSong Shan Gong <gongss@linux.vnet.ibm.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Link: http://lkml.kernel.org/r/1469070651-6447-2-git-send-email-gongss@linux.vnet.ibm.com


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

tools/perf/arch/s390/util/Build

+2 −0
Original line number Original line Diff line number Diff line
@@ -2,3 +2,5 @@ libperf-y += header.o 
libperf-y += kvm-stat.o

libperf-y += kvm-stat.o





libperf-$(CONFIG_DWARF) += dwarf-regs.o

libperf-$(CONFIG_DWARF) += dwarf-regs.o



libperf-y += machine.o

tools/perf/arch/s390/util/machine.c

0 → 100644
+19 −0
Original line number Original line Diff line number Diff line 
#include <unistd.h>

#include <stdio.h>

#include <string.h>

#include "util.h"

#include "machine.h"

#include "api/fs/fs.h"



int arch__fix_module_text_start(u64 *start, const char *name)

{

	char path[PATH_MAX];



	snprintf(path, PATH_MAX, "module/%.*s/sections/.text",

				(int)strlen(name) - 2, name + 1);



	if (sysfs__read_ull(path, (unsigned long long *)start) < 0)

		return -1;



	return 0;

}

tools/perf/util/machine.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -1093,12 +1093,20 @@ static int machine__set_modules_path(struct machine *machine) 




	return map_groups__set_modules_path_dir(&machine->kmaps, modules_path, 0);

	return map_groups__set_modules_path_dir(&machine->kmaps, modules_path, 0);

}

}

int __weak arch__fix_module_text_start(u64 *start __maybe_unused,

				const char *name __maybe_unused)

{

	return 0;

}





static int machine__create_module(void *arg, const char *name, u64 start)

static int machine__create_module(void *arg, const char *name, u64 start)

{

{

	struct machine *machine = arg;

	struct machine *machine = arg;

	struct map *map;

	struct map *map;





	if (arch__fix_module_text_start(&start, name) < 0)

		return -1;



	map = machine__findnew_module_map(machine, start, name);

	map = machine__findnew_module_map(machine, start, name);

	if (map == NULL)

	if (map == NULL)

		return -1;

		return -1;

tools/perf/util/machine.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -216,6 +216,7 @@ struct symbol *machine__find_kernel_function_by_name(struct machine *machine, 




struct map *machine__findnew_module_map(struct machine *machine, u64 start,

struct map *machine__findnew_module_map(struct machine *machine, u64 start,

					const char *filename);

					const char *filename);

int arch__fix_module_text_start(u64 *start, const char *name);





int __machine__load_kallsyms(struct machine *machine, const char *filename,

int __machine__load_kallsyms(struct machine *machine, const char *filename,

			     enum map_type type, bool no_kcore, symbol_filter_t filter);

			     enum map_type type, bool no_kcore, symbol_filter_t filter);