Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Song Shan Gong <gongss@linux.vnet.ibm.com>
Acked-by: Jiri 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: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Song Shan Gong and committed by
Arnaldo Carvalho de Melo
203d8a4a 9b16137a

+30
+2
tools/perf/arch/s390/util/Build
··· 2 2 libperf-y += kvm-stat.o 3 3 4 4 libperf-$(CONFIG_DWARF) += dwarf-regs.o 5 + 6 + libperf-y += machine.o
+19
tools/perf/arch/s390/util/machine.c
··· 1 + #include <unistd.h> 2 + #include <stdio.h> 3 + #include <string.h> 4 + #include "util.h" 5 + #include "machine.h" 6 + #include "api/fs/fs.h" 7 + 8 + int arch__fix_module_text_start(u64 *start, const char *name) 9 + { 10 + char path[PATH_MAX]; 11 + 12 + snprintf(path, PATH_MAX, "module/%.*s/sections/.text", 13 + (int)strlen(name) - 2, name + 1); 14 + 15 + if (sysfs__read_ull(path, (unsigned long long *)start) < 0) 16 + return -1; 17 + 18 + return 0; 19 + }
+8
tools/perf/util/machine.c
··· 1093 1093 1094 1094 return map_groups__set_modules_path_dir(&machine->kmaps, modules_path, 0); 1095 1095 } 1096 + int __weak arch__fix_module_text_start(u64 *start __maybe_unused, 1097 + const char *name __maybe_unused) 1098 + { 1099 + return 0; 1100 + } 1096 1101 1097 1102 static int machine__create_module(void *arg, const char *name, u64 start) 1098 1103 { 1099 1104 struct machine *machine = arg; 1100 1105 struct map *map; 1106 + 1107 + if (arch__fix_module_text_start(&start, name) < 0) 1108 + return -1; 1101 1109 1102 1110 map = machine__findnew_module_map(machine, start, name); 1103 1111 if (map == NULL)
+1
tools/perf/util/machine.h
··· 216 216 217 217 struct map *machine__findnew_module_map(struct machine *machine, u64 start, 218 218 const char *filename); 219 + int arch__fix_module_text_start(u64 *start, const char *name); 219 220 220 221 int __machine__load_kallsyms(struct machine *machine, const char *filename, 221 222 enum map_type type, bool no_kcore, symbol_filter_t filter);