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

Commit 8e0cf965 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf symbols: Add support for reading from /proc/kcore 



In the absence of vmlinux, perf tools uses kallsyms for symbols.  If the
user has access, now also map to /proc/kcore.

The dso data_type is now set to either DSO_BINARY_TYPE__KCORE or
DSO_BINARY_TYPE__GUEST_KCORE as approprite.

This patch breaks the "vmlinux symtab matches kallsyms" test.  That is
fixed in a following patch.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1375875537-4509-8-git-send-email-adrian.hunter@intel.com


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

tools/perf/util/dso.c

+5 −0
Original line number Diff line number Diff line
@@ -95,6 +95,11 @@ int dso__binary_type_file(struct dso *dso, enum dso_binary_type type, 
			 dso->long_name);

		break;



	case DSO_BINARY_TYPE__KCORE:

	case DSO_BINARY_TYPE__GUEST_KCORE:

		snprintf(file, size, "%s", dso->long_name);

		break;



	default:

	case DSO_BINARY_TYPE__KALLSYMS:

	case DSO_BINARY_TYPE__GUEST_KALLSYMS:

tools/perf/util/dso.h

+8 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ enum dso_binary_type { 
	DSO_BINARY_TYPE__SYSTEM_PATH_DSO,

	DSO_BINARY_TYPE__GUEST_KMODULE,

	DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE,

	DSO_BINARY_TYPE__KCORE,

	DSO_BINARY_TYPE__GUEST_KCORE,

	DSO_BINARY_TYPE__NOT_FOUND,

};
@@ -155,4 +157,10 @@ static inline bool dso__is_vmlinux(struct dso *dso) 
	       dso->data_type == DSO_BINARY_TYPE__GUEST_VMLINUX;

}



static inline bool dso__is_kcore(struct dso *dso)

{

	return dso->data_type == DSO_BINARY_TYPE__KCORE ||

	       dso->data_type == DSO_BINARY_TYPE__GUEST_KCORE;

}



#endif /* __PERF_DSO */

tools/perf/util/machine.c

+16 −0
Original line number Diff line number Diff line
@@ -856,6 +856,18 @@ static void machine__set_kernel_mmap_len(struct machine *machine, 
	}

}



static bool machine__uses_kcore(struct machine *machine)

{

	struct dso *dso;



	list_for_each_entry(dso, &machine->kernel_dsos, node) {

		if (dso__is_kcore(dso))

			return true;

	}



	return false;

}



static int machine__process_kernel_mmap_event(struct machine *machine,

					      union perf_event *event)

{
@@ -864,6 +876,10 @@ static int machine__process_kernel_mmap_event(struct machine *machine, 
	enum dso_kernel_type kernel_type;

	bool is_kernel_mmap;



	/* If we have maps from kcore then we do not need or want any others */

	if (machine__uses_kcore(machine))

		return 0;



	machine__mmap_name(machine, kmmap_prefix, sizeof(kmmap_prefix));

	if (machine__is_host(machine))

		kernel_type = DSO_TYPE_KERNEL;

tools/perf/util/map.c

+18 −0
Original line number Diff line number Diff line
@@ -555,3 +555,21 @@ struct map *maps__find(struct rb_root *maps, u64 ip) 


	return NULL;

}



struct map *maps__first(struct rb_root *maps)

{

	struct rb_node *first = rb_first(maps);



	if (first)

		return rb_entry(first, struct map, rb_node);

	return NULL;

}



struct map *maps__next(struct map *map)

{

	struct rb_node *next = rb_next(&map->rb_node);



	if (next)

		return rb_entry(next, struct map, rb_node);

	return NULL;

}

tools/perf/util/map.h

+13 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ size_t __map_groups__fprintf_maps(struct map_groups *mg, 
void maps__insert(struct rb_root *maps, struct map *map);

void maps__remove(struct rb_root *maps, struct map *map);

struct map *maps__find(struct rb_root *maps, u64 addr);

struct map *maps__first(struct rb_root *maps);

struct map *maps__next(struct map *map);

void map_groups__init(struct map_groups *mg);

void map_groups__exit(struct map_groups *mg);

int map_groups__clone(struct map_groups *mg,
@@ -139,6 +141,17 @@ static inline struct map *map_groups__find(struct map_groups *mg, 
	return maps__find(&mg->maps[type], addr);

}



static inline struct map *map_groups__first(struct map_groups *mg,

					    enum map_type type)

{

	return maps__first(&mg->maps[type]);

}



static inline struct map *map_groups__next(struct map *map)

{

	return maps__next(map);

}



struct symbol *map_groups__find_symbol(struct map_groups *mg,

				       enum map_type type, u64 addr,

				       struct map **mapp,