Commit c1529738 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf unwind: Use 'struct map_symbol' in 'struct unwind_entry' 

To help in passing that info around to callchain routines that, for the
same reason, are moving to use 'struct map_symbol'.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-epsiibeprpxa8qpwji47uskc@git.kernel.org


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

tools/perf/tests/dwarf-unwind.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ int test_dwarf_unwind__krava_1(struct thread *thread); 
static int unwind_entry(struct unwind_entry *entry, void *arg)

{

	unsigned long *cnt = (unsigned long *) arg;

	char *symbol = entry->sym ? entry->sym->name : NULL;

	char *symbol = entry->ms.sym ? entry->ms.sym->name : NULL;

	static const char *funcs[MAX_STACK] = {

		"test__arch_unwind_sample",

		"test_dwarf_unwind__thread",

tools/perf/util/machine.c

+9 −8
Original line number Diff line number Diff line
@@ -2448,9 +2448,10 @@ check_calls: 
	return 0;

}



static int append_inlines(struct callchain_cursor *cursor,

			  struct map *map, struct symbol *sym, u64 ip)

static int append_inlines(struct callchain_cursor *cursor, struct map_symbol *ms, u64 ip)

{

	struct symbol *sym = ms->sym;

	struct map *map = ms->map;

	struct inline_node *inline_node;

	struct inline_list *ilist;

	u64 addr;
@@ -2488,22 +2489,22 @@ static int unwind_entry(struct unwind_entry *entry, void *arg) 
	const char *srcline = NULL;

	u64 addr = entry->ip;



	if (symbol_conf.hide_unresolved && entry->sym == NULL)

	if (symbol_conf.hide_unresolved && entry->ms.sym == NULL)

		return 0;



	if (append_inlines(cursor, entry->map, entry->sym, entry->ip) == 0)

	if (append_inlines(cursor, &entry->ms, entry->ip) == 0)

		return 0;



	/*

	 * Convert entry->ip from a virtual address to an offset in

	 * its corresponding binary.

	 */

	if (entry->map)

		addr = map__map_ip(entry->map, entry->ip);

	if (entry->ms.map)

		addr = map__map_ip(entry->ms.map, entry->ip);



	srcline = callchain_srcline(entry->map, entry->sym, addr);

	srcline = callchain_srcline(entry->ms.map, entry->ms.sym, addr);

	return callchain_cursor_append(cursor, entry->ip,

				       entry->map, entry->sym,

				       entry->ms.map, entry->ms.sym,

				       false, NULL, 0, 0, 0, srcline);

}

tools/perf/util/unwind-libdw.c

+3 −3
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ static int entry(u64 ip, struct unwind_info *ui) 
		return -1;



	e->ip	  = ip;

	e->map = al.map;

	e->sym = al.sym;

	e->ms.map = al.map;

	e->ms.sym = al.sym;



	pr_debug("unwind: %s:ip = 0x%" PRIx64 " (0x%" PRIx64 ")\n",

		 al.sym ? al.sym->name : "''",

tools/perf/util/unwind-libunwind-local.c

+3 −3
Original line number Diff line number Diff line
@@ -575,9 +575,9 @@ static int entry(u64 ip, struct thread *thread, 
	struct unwind_entry e;

	struct addr_location al;



	e.sym = thread__find_symbol(thread, PERF_RECORD_MISC_USER, ip, &al);

	e.ms.sym = thread__find_symbol(thread, PERF_RECORD_MISC_USER, ip, &al);

	e.ip     = ip;

	e.map = al.map;

	e.ms.map = al.map;



	pr_debug("unwind: %s:ip = 0x%" PRIx64 " (0x%" PRIx64 ")\n",

		 al.sym ? al.sym->name : "''",

tools/perf/util/unwind.h

+3 −5
Original line number Diff line number Diff line
@@ -4,16 +4,14 @@ 


#include <linux/compiler.h>

#include <linux/types.h>

#include "util/map_symbol.h"



struct map;

struct map_groups;

struct perf_sample;

struct symbol;

struct thread;



struct unwind_entry {

	struct map	*map;

	struct symbol	*sym;

	struct map_symbol ms;

	u64		  ip;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE