perf fixes
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
# HEAD: 2737fce8bc8dea2852289df29b4f92e6a7fb7c91 Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Tooling fixes, mostly related to the KASLR fallout, but also other fixes.
Thanks,
Ingo
------------------>
Adrian Hunter (9):
perf symbols: Fix symbol annotation for relocated kernel perf tools: Add kallsyms__get_function_start()
perf machine: Add machine__get_kallsyms_filename()
perf machine: Set up ref_reloc_sym in machine__create_kernel_maps() perf record: Get ref_reloc_sym from kernel map
perf symbols: Prevent the use of kcore if the kernel has moved perf tests: No need to set up ref_reloc_sym
perf tools: Adjust kallsyms for relocated kernel
perf buildid-cache: Check relocation when checking for existing kcore
Avi Kivity (1):
perf tools: Demangle kernel and kernel module symbols too
Baruch Siach (1):
perf/doc: Remove mention of non-existent set_perf_event_pending() from design.txt
Francesco Fusco (1):
perf tools: Fix include for non x86 architectures
Peter Zijlstra (1):
perf tools: Fix AAAAARGH64 memory barriers
tools/perf/builtin-buildid-cache.c | 33 ++++++++++++++++--- tools/perf/builtin-record.c | 10 ++---- tools/perf/design.txt | 1 - tools/perf/perf.h | 4 +-- tools/perf/tests/vmlinux-kallsyms.c | 10 ------ tools/perf/util/event.c | 36 ++++++++++---------- tools/perf/util/event.h | 6 ++-- tools/perf/util/include/asm/hash.h | 6 ++++ tools/perf/util/machine.c | 42 +++++++++++++++++++----- tools/perf/util/machine.h | 2 ++ tools/perf/util/map.c | 5 +-- tools/perf/util/map.h | 1 + tools/perf/util/symbol-elf.c | 4 ++- tools/perf/util/symbol.c | 65 +++++++++++++++++++++++++++++++++---- 14 files changed, 162 insertions(+), 63 deletions(-) create mode 100644 tools/perf/util/include/asm/hash.h
tools/perf/builtin-buildid-cache.c +29 -4
@@ -63,11 +63,35 @@ static int build_id_cache__kcore_dir(char *dir, size_t sz)return 0 ; } +static bool same_kallsyms_reloc (const char *from_dir,char *to_dir) +{ +char from[PATH_MAX ]; +char to[PATH_MAX ]; +const char *name; +u64 addr1 =0 , addr2 =0 ; +int i; + +scnprintf (from,sizeof (from),"%s/kallsyms" , from_dir); +scnprintf (to,sizeof (to),"%s/kallsyms" , to_dir); + +for (i =0 ; (name = ref_reloc_sym_names[i]) !=NULL ; i++) { + addr1 =kallsyms__get_function_start (from, name); +if (addr1) +break ; + } + +if (name) + addr2 =kallsyms__get_function_start (to, name); + +return addr1 == addr2; +} +static int build_id_cache__kcore_existing (const char *from_dir,char *to_dir,size_t to_dir_sz) {char from[PATH_MAX ];char to[PATH_MAX ]; +char to_subdir[PATH_MAX ];struct dirent *dent;int ret =-1 ;DIR *d;
@@ -86,10 +110,11 @@ static int build_id_cache__kcore_existing(const char *from_dir, char *to_dir,continue ;scnprintf (to,sizeof (to),"%s/%s/modules" , to_dir, dent->d_name); -if (!compare_proc_modules (from, to)) { -scnprintf (to,sizeof (to),"%s/%s" , to_dir, - dent->d_name); -strlcpy (to_dir, to, to_dir_sz); +scnprintf (to_subdir,sizeof (to_subdir),"%s/%s" , + to_dir, dent->d_name); +if (!compare_proc_modules (from, to) && +same_kallsyms_reloc (from_dir, to_subdir)) { +strlcpy (to_dir, to_subdir, to_dir_sz); ret =0 ;break ; }
tools/perf/builtin-record.c +2 -8
@@ -287,10 +287,7 @@ static void perf_event__synthesize_guest_os(struct machine *machine, void *data)* have no _text sometimes. */ err =perf_event__synthesize_kernel_mmap (tool, process_synthesized_event, - machine,"_text" ); -if (err <0 ) - err =perf_event__synthesize_kernel_mmap (tool, process_synthesized_event, - machine,"_stext" ); + machine);if (err <0 )pr_err ("Couldn't record guest kernel [%d]'s reference" " relocation symbol.\n" , machine->pid);
@@ -457,10 +454,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) } err =perf_event__synthesize_kernel_mmap (tool, process_synthesized_event, - machine,"_text" ); -if (err <0 ) - err =perf_event__synthesize_kernel_mmap (tool, process_synthesized_event, - machine,"_stext" ); + machine);if (err <0 )pr_err ("Couldn't record kernel reference relocation symbol\n" "Symbol resolution may be skewed if relocation was used (e.g. kexec).\n"
tools/perf/design.txt +0 -1
@@ -454,7 +454,6 @@ So to start with, in order to add HAVE_PERF_EVENTS to your Kconfig, you will need at least this: - asm/perf_event.h - a basic stub will suffice at first - support for atomic64 types (and associated helper functions) - - set_perf_event_pending() implemented If your architecture does have hardware capabilities, you can override the weak stub hw_perf_event_init() to register hardware counters.
tools/perf/perf.h +2 -2
@@ -100,8 +100,8 @@#ifdef __aarch64__#define mb () asm volatile("dmb ish" ::: "memory") -#define wmb () asm volatile("dmb ishld" ::: "memory") -#define rmb () asm volatile("dmb ishst" ::: "memory") +#define wmb () asm volatile("dmb ishst" ::: "memory") +#define rmb () asm volatile("dmb ishld" ::: "memory")#define cpu_relax () asm volatile("yield" ::: "memory")#endif
tools/perf/tests/vmlinux-kallsyms.c +0 -10
@@ -26,7 +26,6 @@ int test__vmlinux_matches_kallsyms(void)struct map *kallsyms_map, *vmlinux_map;struct machine kallsyms, vmlinux;enum map_type type =MAP__FUNCTION ; -struct ref_reloc_sym ref_reloc_sym = { .name ="_stext" , };u64 mem_start, mem_end;/*
@@ -70,14 +69,6 @@ int test__vmlinux_matches_kallsyms(void)*/ kallsyms_map =machine__kernel_map (&kallsyms, type); - sym =map__find_symbol_by_name (kallsyms_map, ref_reloc_sym.name,NULL ); -if (sym ==NULL ) { -pr_debug ("dso__find_symbol_by_name " ); - goto out; - } - - ref_reloc_sym.addr =UM (sym->start); -/* * Step 5: *
@@ -89,7 +80,6 @@ int test__vmlinux_matches_kallsyms(void) } vmlinux_map =machine__kernel_map (&vmlinux, type); -map__kmap (vmlinux_map)->ref_reloc_sym = &ref_reloc_sym;/* * Step 6:
tools/perf/util/event.c +17 -19
@@ -470,23 +470,32 @@ static int find_symbol_cb(void *arg, const char *name, char type,return 1 ; } +u64 kallsyms__get_function_start (const char *kallsyms_filename, +const char *symbol_name) +{ +struct process_symbol_args args = { .name = symbol_name, }; + +if (kallsyms__parse (kallsyms_filename, &args, find_symbol_cb) <=0 ) +return 0 ; + +return args.start; +} +int perf_event__synthesize_kernel_mmap (struct perf_tool *tool,perf_event__handler_t process, -struct machine *machine, -const char *symbol_name) +struct machine *machine) {size_t size; -const char *filename, *mmap_name; -char path[PATH_MAX ]; +const char *mmap_name;char name_buff[PATH_MAX ];struct map *map; +struct kmap *kmap;int err;/* * We should get this from /sys/kernel/sections/.text, but till that is * available use this, and after it is use this as a fallback for older * kernels. */ -struct process_symbol_args args = { .name = symbol_name, };union perf_event *event =zalloc ((sizeof (event->mmap) + machine->id_hdr_size));if (event ==NULL ) {
@@ -502,30 +511,19 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,* see kernel/perf_event.c __perf_event_mmap */ event->header.misc =PERF_RECORD_MISC_KERNEL ; - filename ="/proc/kallsyms" ; }else { event->header.misc =PERF_RECORD_MISC_GUEST_KERNEL ; -if (machine__is_default_guest (machine)) - filename = (char *) symbol_conf.default_guest_kallsyms; -else { -sprintf (path,"%s/proc/kallsyms" , machine->root_dir); - filename = path; - } - } - -if (kallsyms__parse (filename, &args, find_symbol_cb) <=0 ) { -free (event); -return -ENOENT ; } map = machine->vmlinux_maps[MAP__FUNCTION ]; + kmap =map__kmap (map); size =snprintf (event->mmap.filename,sizeof (event->mmap.filename), -"%s%s" , mmap_name, symbol_name) +1 ; +"%s%s" , mmap_name, kmap->ref_reloc_sym->name) +1 ; size =PERF_ALIGN (size,sizeof (u64)); event->mmap.header.type =PERF_RECORD_MMAP ; event->mmap.header.size = (sizeof (event->mmap) - (sizeof (event->mmap.filename) - size) + machine->id_hdr_size); - event->mmap.pgoff = args.start; + event->mmap.pgoff = kmap->ref_reloc_sym->addr; event->mmap.start = map->start; event->mmap.len = map->end - event->mmap.start; event->mmap.pid = machine->pid;
tools/perf/util/event.h +4 -2
@@ -214,8 +214,7 @@ int perf_event__synthesize_threads(struct perf_tool *tool, struct machine *machine, bool mmap_data);int perf_event__synthesize_kernel_mmap (struct perf_tool *tool,perf_event__handler_t process, -struct machine *machine, -const char *symbol_name); +struct machine *machine); int perf_event__synthesize_modules(struct perf_tool *tool, perf_event__handler_t process,
@@ -279,4 +278,7 @@ size_t perf_event__fprintf_mmap2(union perf_event *event, FILE *fp);size_t perf_event__fprintf_task (union perf_event *event,FILE *fp);size_t perf_event__fprintf (union perf_event *event,FILE *fp); +u64 kallsyms__get_function_start (const char *kallsyms_filename, +const char *symbol_name); +#endif /* __PERF_RECORD_H */
tools/perf/util/include/asm/hash.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef __ASM_GENERIC_HASH_H +#define __ASM_GENERIC_HASH_H + +/* Stub */ + +#endif /* __ASM_GENERIC_HASH_H */
tools/perf/util/machine.c +34 -8
68 lines not on this page · raw message
tools/perf/util/machine.h +2 -0
@@ -18,6 +18,8 @@ union perf_event;#define HOST_KERNEL_ID (-1)#define DEFAULT_GUEST_KERNEL_ID (0) +extern const char *ref_reloc_sym_names[]; +struct machine {struct rb_node rb_node;pid_t pid;
tools/perf/util/map.c +3 -2
@@ -39,6 +39,7 @@ void map__init(struct map *map, enum map_type type, map->start = start; map->end = end; map->pgoff = pgoff; + map->reloc =0 ; map->dso = dso; map->map_ip = map__map_ip; map->unmap_ip = map__unmap_ip;
@@ -288,7 +289,7 @@ u64 map__rip_2objdump(struct map *map, u64 rip)if (map->dso->rel)return rip - map->pgoff; -return map->unmap_ip (map, rip); +return map->unmap_ip (map, rip) - map->reloc; }/**
@@ -311,7 +312,7 @@ u64 map__objdump_2mem(struct map *map, u64 ip)if (map->dso->rel)return map->unmap_ip (map, ip + map->pgoff); -return ip; +return ip + map->reloc; }void map_groups__init (struct map_groups *mg)
tools/perf/util/map.h +1 -0
@@ -36,6 +36,7 @@ struct map {bool erange_warned;u32 priv;u64 pgoff; +u64 reloc;u32 maj, min;/* only valid for MMAP2 record */ u64 ino;/* only valid for MMAP2 record */ u64 ino_generation;/* only valid for MMAP2 record */
tools/perf/util/symbol-elf.c +3 -1
@@ -751,6 +751,8 @@ int dso__load_sym(struct dso *dso, struct map *map,if (strcmp (elf_name, kmap->ref_reloc_sym->name))continue ; kmap->ref_reloc_sym->unrelocated_addr = sym.st_value; + map->reloc = kmap->ref_reloc_sym->addr - + kmap->ref_reloc_sym->unrelocated_addr;break ; } }
@@ -922,6 +924,7 @@ int dso__load_sym(struct dso *dso, struct map *map, (u64)shdr.sh_offset); sym.st_value -= shdr.sh_addr - shdr.sh_offset; } +new_symbol:/* * We need to figure out if the object was created from C++ sources * DWARF DW_compile_unit has this, but we don't always have access
@@ -933,7 +936,6 @@ int dso__load_sym(struct dso *dso, struct map *map,if (demangled !=NULL ) elf_name = demangled; } -new_symbol: f =symbol__new (sym.st_value, sym.st_size,GELF_ST_BIND (sym.st_info), elf_name);free (demangled);
tools/perf/util/symbol.c +59 -6
128 lines not on this page · raw message