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

Commit 439d473b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar
Browse files

perf tools: Rewrite and improve support for kernel modules 



Representing modules as struct map entries, backed by a DSO, etc,
using /proc/modules to find where the module is loaded.

DSOs now can have a short and long name, so that in verbose mode we
can show exactly which .ko or vmlinux image was used.

As kernel modules now are a DSO separate from the kernel, we can
ask for just the hits for a particular set of kernel modules, just
like we can do with shared libraries:

[root@doppio linux-2.6-tip]# perf report -n --vmlinux
/home/acme/git/build/tip-recvmmsg/vmlinux --modules --dsos \[drm\] | head -15
    84.58%      13266             Xorg  [k] drm_clflush_pages
     4.02%        630             Xorg  [k] trace_kmalloc.clone.0
     3.95%        619             Xorg  [k] drm_ioctl
     2.07%        324             Xorg  [k] drm_addbufs
     1.68%        263             Xorg  [k] drm_gem_close_ioctl
     0.77%        120             Xorg  [k] drm_setmaster_ioctl
     0.70%        110             Xorg  [k] drm_lastclose
     0.68%        106             Xorg  [k] drm_open
     0.54%         85             Xorg  [k] drm_mm_search_free
[root@doppio linux-2.6-tip]#

Specifying --dsos /lib/modules/2.6.31-tip/kernel/drivers/gpu/drm/drm.ko
would have the same effect. Allowing specifying just 'drm.ko' is left
for another patch.

Processing kallsyms so that per kernel module struct map are
instantiated was also left for another patch. That will allow
removing the module name from each of its symbols.

struct symbol was reduced by removing the ->module backpointer and
moving it (well now the map) to struct symbol_entry in perf top,
that is its only user right now.

The total linecount went down by ~500 lines.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Avi Kivity <avi@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2ccdc450

tools/perf/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -336,7 +336,6 @@ LIB_H += util/strlist.h 
LIB_H += util/run-command.h

LIB_H += util/sigchain.h

LIB_H += util/symbol.h

LIB_H += util/module.h

LIB_H += util/color.h

LIB_H += util/values.h

LIB_H += util/sort.h
@@ -364,7 +363,6 @@ LIB_OBJS += util/usage.o 
LIB_OBJS += util/wrapper.o

LIB_OBJS += util/sigchain.o

LIB_OBJS += util/symbol.o

LIB_OBJS += util/module.o

LIB_OBJS += util/color.o

LIB_OBJS += util/pager.o

LIB_OBJS += util/header.o

tools/perf/builtin-annotate.c

+32 −41
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ static void hist_hit(struct hist_entry *he, u64 ip) 
		return;



	sym_size = sym->end - sym->start;

	ip = he->map->map_ip(he->map, ip);

	offset = ip - sym->start;



	if (offset >= sym_size)
@@ -80,7 +81,7 @@ static void hist_hit(struct hist_entry *he, u64 ip) 
}



static int

hist_entry__add(struct thread *thread, struct map *map, struct dso *dso,

hist_entry__add(struct thread *thread, struct map *map,

		struct symbol *sym, u64 ip, char level)

{

	struct rb_node **p = &hist.rb_node;
@@ -89,7 +90,6 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso, 
	struct hist_entry entry = {

		.thread	= thread,

		.map	= map,

		.dso	= dso,

		.sym	= sym,

		.ip	= ip,

		.level	= level,
@@ -130,10 +130,10 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head) 
{

	char level;

	int show = 0;

	struct dso *dso = NULL;

	struct thread *thread;

	u64 ip = event->ip.ip;

	struct map *map = NULL;

	struct symbol *sym = NULL;



	thread = threads__findnew(event->ip.pid, &threads, &last_match);
@@ -155,32 +155,35 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head) 
	if (event->header.misc & PERF_RECORD_MISC_KERNEL) {

		show = SHOW_KERNEL;

		level = 'k';



		dso = kernel_dso;



		dump_printf(" ...... dso: %s\n", dso->name);



		sym = kernel_maps__find_symbol(ip, &map);

		dump_printf(" ...... dso: %s\n",

			    map ? map->dso->long_name : "<not found>");

	} else if (event->header.misc & PERF_RECORD_MISC_USER) {



		show = SHOW_USER;

		level = '.';



		map = thread__find_map(thread, ip);

		if (map != NULL) {

got_map:

			ip = map->map_ip(map, ip);

			dso = map->dso;

			sym = map->dso->find_symbol(map->dso, ip);

		} else {

			/*

			 * If this is outside of all known maps,

			 * and is a negative address, try to look it

			 * up in the kernel dso, as it might be a

			 * vsyscall (which executes in user-mode):

			 * vsyscall or vdso (which executes in user-mode).

			 *

			 * XXX This is nasty, we should have a symbol list in

			 * the "[vdso]" dso, but for now lets use the old

			 * trick of looking in the whole kernel symbol list.

			 */

			if ((long long)ip < 0)

				dso = kernel_dso;

			if ((long long)ip < 0) {

				map = kernel_map;

				goto got_map;

			}

		dump_printf(" ...... dso: %s\n", dso ? dso->name : "<not found>");



		}

		dump_printf(" ...... dso: %s\n",

			    map ? map->dso->long_name : "<not found>");

	} else {

		show = SHOW_HV;

		level = 'H';
@@ -188,12 +191,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head) 
	}



	if (show & show_mask) {

		struct symbol *sym = NULL;



		if (dso)

			sym = dso->find_symbol(dso, ip);



		if (hist_entry__add(thread, map, dso, sym, ip, level)) {

		if (hist_entry__add(thread, map, sym, ip, level)) {

			fprintf(stderr,

		"problem incrementing symbol count, skipping event\n");

			return -1;
@@ -313,7 +311,7 @@ process_event(event_t *event, unsigned long offset, unsigned long head) 
}



static int

parse_line(FILE *file, struct symbol *sym, u64 start, u64 len)

parse_line(FILE *file, struct symbol *sym, u64 len)

{

	char *line = NULL, *tmp, *tmp2;

	static const char *prev_line;
@@ -363,7 +361,7 @@ parse_line(FILE *file, struct symbol *sym, u64 start, u64 len) 
		const char *color;

		struct sym_ext *sym_ext = sym->priv;



		offset = line_ip - start;

		offset = line_ip - sym->start;

		if (offset < len)

			hits = sym->hist[offset];
@@ -442,7 +440,7 @@ static void free_source_line(struct symbol *sym, int len) 


/* Get the filename:line for the colored entries */

static void

get_source_line(struct symbol *sym, u64 start, int len, const char *filename)

get_source_line(struct symbol *sym, int len, const char *filename)

{

	int i;

	char cmd[PATH_MAX * 2];
@@ -467,7 +465,7 @@ get_source_line(struct symbol *sym, u64 start, int len, const char *filename) 
		if (sym_ext[i].percent <= 0.5)

			continue;



		offset = start + i;

		offset = sym->start + i;

		sprintf(cmd, "addr2line -e %s %016llx", filename, offset);

		fp = popen(cmd, "r");

		if (!fp)
@@ -519,31 +517,23 @@ static void print_summary(const char *filename) 


static void annotate_sym(struct dso *dso, struct symbol *sym)

{

	const char *filename = dso->name, *d_filename;

	u64 start, end, len;

	const char *filename = dso->long_name, *d_filename;

	u64 len;

	char command[PATH_MAX*2];

	FILE *file;



	if (!filename)

		return;

	if (sym->module)

		filename = sym->module->path;

	else if (dso == kernel_dso)

		filename = vmlinux_name;



	start = sym->obj_start;

	if (!start)

		start = sym->start;



	if (full_paths)

		d_filename = filename;

	else

		d_filename = basename(filename);



	end = start + sym->end - sym->start + 1;

	len = sym->end - sym->start;



	if (print_line) {

		get_source_line(sym, start, len, filename);

		get_source_line(sym, len, filename);

		print_summary(filename);

	}
@@ -552,10 +542,11 @@ static void annotate_sym(struct dso *dso, struct symbol *sym) 
	printf("------------------------------------------------\n");



	if (verbose >= 2)

		printf("annotating [%p] %30s : [%p] %30s\n", dso, dso->name, sym, sym->name);

		printf("annotating [%p] %30s : [%p] %30s\n",

		       dso, dso->long_name, sym, sym->name);



	sprintf(command, "objdump --start-address=0x%016Lx --stop-address=0x%016Lx -dS %s|grep -v %s",

			(u64)start, (u64)end, filename, filename);

		sym->start, sym->end, filename, filename);



	if (verbose >= 3)

		printf("doing: %s\n", command);
@@ -565,7 +556,7 @@ static void annotate_sym(struct dso *dso, struct symbol *sym) 
		return;



	while (!feof(file)) {

		if (parse_line(file, sym, start, len) < 0)

		if (parse_line(file, sym, len) < 0)

			break;

	}

tools/perf/builtin-report.c

+35 −44
Original line number Diff line number Diff line
@@ -349,22 +349,17 @@ static int thread__set_comm_adjust(struct thread *self, const char *comm) 




static struct symbol *

resolve_symbol(struct thread *thread, struct map **mapp,

	       struct dso **dsop, u64 *ipp)

resolve_symbol(struct thread *thread, struct map **mapp, u64 *ipp)

{

	struct dso *dso = dsop ? *dsop : NULL;

	struct map *map = mapp ? *mapp : NULL;

	u64 ip = *ipp;



	if (!thread)

		return NULL;



	if (dso)

		goto got_dso;



	if (map)

		goto got_map;



	if (!thread)

		return NULL;



	map = thread__find_map(thread, ip);

	if (map != NULL) {

		/*
@@ -379,29 +374,29 @@ resolve_symbol(struct thread *thread, struct map **mapp, 
			*mapp = map;

got_map:

		ip = map->map_ip(map, ip);



		dso = map->dso;

	} else {

		/*

		 * If this is outside of all known maps,

		 * and is a negative address, try to look it

		 * up in the kernel dso, as it might be a

		 * vsyscall (which executes in user-mode):

		 * vsyscall or vdso (which executes in user-mode).

		 *

		 * XXX This is nasty, we should have a symbol list in

		 * the "[vdso]" dso, but for now lets use the old

		 * trick of looking in the whole kernel symbol list.

		 */

		if ((long long)ip < 0)

		dso = kernel_dso;

		if ((long long)ip < 0) {

			map = kernel_map;

			if (mapp)

				*mapp = map;

		}

	}

	dump_printf(" ...... dso: %s\n", dso ? dso->name : "<not found>");

	dump_printf(" ...... dso: %s\n",

		    map ? map->dso->long_name : "<not found>");

	dump_printf(" ...... map: %Lx -> %Lx\n", *ipp, ip);

	*ipp  = ip;



	if (dsop)

		*dsop = dso;



	if (!dso)

		return NULL;

got_dso:

	return dso->find_symbol(dso, ip);

	return map ? map->dso->find_symbol(map->dso, ip) : NULL;

}



static int call__match(struct symbol *sym)
@@ -413,7 +408,7 @@ static int call__match(struct symbol *sym) 
}



static struct symbol **

resolve_callchain(struct thread *thread, struct map *map __used,

resolve_callchain(struct thread *thread, struct map *map,

		    struct ip_callchain *chain, struct hist_entry *entry)

{

	u64 context = PERF_CONTEXT_MAX;
@@ -430,8 +425,7 @@ resolve_callchain(struct thread *thread, struct map *map __used, 


	for (i = 0; i < chain->nr; i++) {

		u64 ip = chain->ips[i];

		struct dso *dso = NULL;

		struct symbol *sym;

		struct symbol *sym = NULL;



		if (ip >= PERF_CONTEXT_MAX) {

			context = ip;
@@ -440,17 +434,15 @@ resolve_callchain(struct thread *thread, struct map *map __used, 


		switch (context) {

		case PERF_CONTEXT_HV:

			dso = hypervisor_dso;

			break;

		case PERF_CONTEXT_KERNEL:

			dso = kernel_dso;

			sym = kernel_maps__find_symbol(ip, &map);

			break;

		default:

			sym = resolve_symbol(thread, &map, &ip);

			break;

		}



		sym = resolve_symbol(thread, NULL, &dso, &ip);



		if (sym) {

			if (sort__has_parent && call__match(sym) &&

			    !entry->parent)
@@ -469,7 +461,7 @@ resolve_callchain(struct thread *thread, struct map *map __used, 
 */



static int

hist_entry__add(struct thread *thread, struct map *map, struct dso *dso,

hist_entry__add(struct thread *thread, struct map *map,

		struct symbol *sym, u64 ip, struct ip_callchain *chain,

		char level, u64 count)

{
@@ -480,7 +472,6 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso, 
	struct hist_entry entry = {

		.thread	= thread,

		.map	= map,

		.dso	= dso,

		.sym	= sym,

		.ip	= ip,

		.level	= level,
@@ -641,7 +632,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head) 
{

	char level;

	int show = 0;

	struct dso *dso = NULL;

	struct symbol *sym = NULL;

	struct thread *thread;

	u64 ip = event->ip.ip;

	u64 period = 1;
@@ -700,35 +691,35 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head) 
		show = SHOW_KERNEL;

		level = 'k';



		dso = kernel_dso;



		dump_printf(" ...... dso: %s\n", dso->name);



		sym = kernel_maps__find_symbol(ip, &map);

		dump_printf(" ...... dso: %s\n",

			    map ? map->dso->long_name : "<not found>");

	} else if (cpumode == PERF_RECORD_MISC_USER) {



		show = SHOW_USER;

		level = '.';

		sym = resolve_symbol(thread, &map, &ip);



	} else {

		show = SHOW_HV;

		level = 'H';



		dso = hypervisor_dso;



		dump_printf(" ...... dso: [hypervisor]\n");

	}



	if (show & show_mask) {

		struct symbol *sym = resolve_symbol(thread, &map, &dso, &ip);



		if (dso_list && (!dso || !dso->name ||

				 !strlist__has_entry(dso_list, dso->name)))

		if (dso_list &&

		    (!map || !map->dso ||

		     !(strlist__has_entry(dso_list, map->dso->short_name) ||

		       (map->dso->short_name != map->dso->long_name &&

			strlist__has_entry(dso_list, map->dso->long_name)))))

			return 0;



		if (sym_list && (!sym || !strlist__has_entry(sym_list, sym->name)))

		if (sym_list && sym && !strlist__has_entry(sym_list, sym->name))

			return 0;



		if (hist_entry__add(thread, map, dso, sym, ip, chain, level, period)) {

		if (hist_entry__add(thread, map, sym, ip,

				    chain, level, period)) {

			eprintf("problem incrementing symbol count, skipping event\n");

			return -1;

		}

tools/perf/builtin-top.c

+24 −50
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


#include "util/symbol.h"

#include "util/color.h"

#include "util/thread.h"

#include "util/util.h"

#include <linux/rbtree.h>

#include "util/parse-options.h"
@@ -103,6 +104,7 @@ struct sym_entry { 
	unsigned long		snap_count;

	double			weight;

	int			skip;

	struct map		*map;

	struct source_line	*source;

	struct source_line	*lines;

	struct source_line	**lines_tail;
@@ -116,12 +118,11 @@ struct sym_entry { 
static void parse_source(struct sym_entry *syme)

{

	struct symbol *sym;

	struct module *module;

	struct section *section = NULL;

	struct map *map;

	FILE *file;

	char command[PATH_MAX*2];

	const char *path = vmlinux_name;

	u64 start, end, len;

	const char *path;

	u64 len;



	if (!syme)

		return;
@@ -132,27 +133,15 @@ static void parse_source(struct sym_entry *syme) 
	}



	sym = (struct symbol *)(syme + 1);

	module = sym->module;

	map = syme->map;

	path = map->dso->long_name;



	if (module)

		path = module->path;

	if (!path)

		return;



	start = sym->obj_start;

	if (!start)

		start = sym->start;



	if (module) {

		section = module->sections->find_section(module->sections, ".text");

		if (section)

			start -= section->vma;

	}



	end = start + sym->end - sym->start + 1;

	len = sym->end - sym->start;



	sprintf(command, "objdump --start-address=0x%016Lx --stop-address=0x%016Lx -dS %s", start, end, path);

	sprintf(command,

		"objdump --start-address=0x%016Lx "

			 "--stop-address=0x%016Lx -dS %s",

		sym->start, sym->end, path);



	file = popen(command, "r");

	if (!file)
@@ -184,13 +173,11 @@ static void parse_source(struct sym_entry *syme) 


		if (strlen(src->line)>8 && src->line[8] == ':') {

			src->eip = strtoull(src->line, NULL, 16);

			if (section)

				src->eip += section->vma;

			src->eip += map->start;

		}

		if (strlen(src->line)>8 && src->line[16] == ':') {

			src->eip = strtoull(src->line, NULL, 16);

			if (section)

				src->eip += section->vma;

			src->eip += map->start;

		}

	}

	pclose(file);
@@ -242,16 +229,9 @@ static void lookup_sym_source(struct sym_entry *syme) 
	struct symbol *symbol = (struct symbol *)(syme + 1);

	struct source_line *line;

	char pattern[PATH_MAX];

	char *idx;



	sprintf(pattern, "<%s>:", symbol->name);



	if (symbol->module) {

		idx = strstr(pattern, "\t");

		if (idx)

			*idx = 0;

	}



	pthread_mutex_lock(&syme->source_lock);

	for (line = syme->lines; line; line = line->next) {

		if (strstr(line->line, pattern)) {
@@ -513,8 +493,8 @@ static void print_sym_table(void) 
		if (verbose)

			printf(" - %016llx", sym->start);

		printf(" : %s", sym->name);

		if (sym->module)

			printf("\t[%s]", sym->module->name);

		if (syme->map->dso->name[0] == '[')

			printf(" \t%s", syme->map->dso->name);

		printf("\n");

	}

}
@@ -784,7 +764,7 @@ static const char *skip_symbols[] = { 
	NULL

};



static int symbol_filter(struct dso *self, struct symbol *sym)

static int symbol_filter(struct map *map, struct symbol *sym)

{

	struct sym_entry *syme;

	const char *name = sym->name;
@@ -806,7 +786,8 @@ static int symbol_filter(struct dso *self, struct symbol *sym) 
	    strstr(name, "_text_end"))

		return 1;



	syme = dso__sym_priv(self, sym);

	syme = dso__sym_priv(map->dso, sym);

	syme->map = map;

	pthread_mutex_init(&syme->source_lock, NULL);

	if (!sym_filter_entry && sym_filter && !strcmp(name, sym_filter))

		sym_filter_entry = syme;
@@ -825,22 +806,14 @@ static int parse_symbols(void) 
{

	int use_modules = vmlinux_name ? 1 : 0;



	kernel_dso = dso__new("[kernel]", sizeof(struct sym_entry));

	if (kernel_dso == NULL)

	if (dsos__load_kernel(vmlinux_name, sizeof(struct sym_entry),

			      symbol_filter, verbose, use_modules) <= 0)

		return -1;



	if (dso__load_kernel(kernel_dso, vmlinux_name, symbol_filter, verbose, use_modules) <= 0)

		goto out_delete_dso;



	if (dump_symtab)

		dso__fprintf(kernel_dso, stderr);

		dsos__fprintf(stderr);



	return 0;



out_delete_dso:

	dso__delete(kernel_dso);

	kernel_dso = NULL;

	return -1;

}



/*
@@ -848,10 +821,11 @@ static int parse_symbols(void) 
 */

static void record_ip(u64 ip, int counter)

{

	struct symbol *sym = dso__find_symbol(kernel_dso, ip);

	struct map *map;

	struct symbol *sym = kernel_maps__find_symbol(ip, &map);



	if (sym != NULL) {

		struct sym_entry *syme = dso__sym_priv(kernel_dso, sym);

		struct sym_entry *syme = dso__sym_priv(map->dso, sym);



		if (!syme->skip) {

			syme->count[counter]++;

tools/perf/util/event.h

+5 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include "../perf.h"

#include "util.h"

#include <linux/list.h>

#include <linux/rbtree.h>



enum {
@@ -79,7 +80,10 @@ typedef union event_union { 
} event_t;



struct map {

	union {

		struct rb_node	rb_node;

		struct list_head node;

	};

	u64			start;

	u64			end;

	u64			pgoff;