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

Commit 0db64dd0 authored by Jin Yao's avatar Jin Yao Committed by Arnaldo Carvalho de Melo
Browse files

perf report: Show inline stack for stdio mode 



If the address belongs to an inlined function, the source information
back to the first non-inlined function will be printed.

For example:

1. Show inlined function name
   perf report --stdio -g function --inline

     0.69%     0.00%  inline   ld-2.23.so           [.] dl_main
            |
            ---dl_main
               |
                --0.56%--_dl_relocate_object
                          _dl_relocate_object (inline)
                          elf_dynamic_do_Rela (inline)

2. Show the file/line information
   perf report --stdio -g address --inline

     0.69%     0.00%  inline   ld-2.23.so           [.] _dl_start_user
            |
            ---_dl_start_user .:0
               _dl_start rtld.c:307
               /build/glibc-GKVZIf/glibc-2.23/elf/rtld.c:413 (inline)
               _dl_sysdep_start dl-sysdep.c:250
               |
                --0.56%--dl_main rtld.c:2076

Committer tests:

  # perf record --call-graph dwarf ~/bin/perf stat usleep 1

 Performance counter stats for 'usleep 1':

          0.443020      task-clock (msec)         #    0.449 CPUs utilized
                 1      context-switches          #    0.002 M/sec
                 0      cpu-migrations            #    0.000 K/sec
                52      page-faults               #    0.117 M/sec
         1,049,423      cycles                    #    2.369 GHz
           801,456      instructions              #    0.76  insn per cycle
           155,609      branches                  #  351.246 M/sec
             7,026      branch-misses             #    4.52% of all branches

       0.000987570 seconds time elapsed

  [ perf record: Woken up 2 times to write data ]
  [ perf record: Captured and wrote 0.553 MB perf.data (66 samples) ]
  # perf report --stdio --inline fs__get_mountpoint
  <SNIP>
     1.73%     0.00%  perf     perf           [.] fs__get_mountpoint
            |
            ---fs__get_mountpoint
               fs__get_mountpoint (inline)
               fs__check_mounts (inline)
               __statfs
               entry_SYSCALL_64
               sys_statfs
               SYSC_statfs
               user_statfs
               user_path_at_empty
               filename_lookup
               path_lookupat
               link_path_walk
               inode_permission
               __inode_permission
               kernfs_iop_permission
               kernfs_refresh_inode
               security_inode_notifysecctx
               selinux_inode_notifysecctx
               selinux_inode_setsecurity
               security_context_to_sid
               security_context_to_sid_core
               string_to_context_struct
               symcmp

Signed-off-by: default avatarYao Jin <yao.jin@linux.intel.com>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Tested-by: default avatarMilian Wolff <milian.wolff@kdab.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@intel.com>
Link: http://lkml.kernel.org/r/1490474069-15823-5-git-send-email-yao.jin@linux.intel.com


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

tools/perf/ui/stdio/hist.c

+84 −1
Original line number Diff line number Diff line
@@ -17,6 +17,66 @@ static size_t callchain__fprintf_left_margin(FILE *fp, int left_margin) 
	return ret;

}



static size_t inline__fprintf(struct map *map, u64 ip, int left_margin,

			      int depth, int depth_mask, FILE *fp)

{

	struct dso *dso;

	struct inline_node *node;

	struct inline_list *ilist;

	int ret = 0, i;



	if (map == NULL)

		return 0;



	dso = map->dso;

	if (dso == NULL)

		return 0;



	if (dso->kernel != DSO_TYPE_USER)

		return 0;



	node = dso__parse_addr_inlines(dso,

				       map__rip_2objdump(map, ip));

	if (node == NULL)

		return 0;



	list_for_each_entry(ilist, &node->val, list) {

		if ((ilist->filename != NULL) || (ilist->funcname != NULL)) {

			ret += callchain__fprintf_left_margin(fp, left_margin);



			for (i = 0; i < depth; i++) {

				if (depth_mask & (1 << i))

					ret += fprintf(fp, "|");

				else

					ret += fprintf(fp, " ");

				ret += fprintf(fp, "          ");

			}



			if (callchain_param.key == CCKEY_ADDRESS) {

				if (ilist->filename != NULL)

					ret += fprintf(fp, "%s:%d (inline)",

						       ilist->filename,

						       ilist->line_nr);

				else

					ret += fprintf(fp, "??");

			} else if (ilist->funcname != NULL)

				ret += fprintf(fp, "%s (inline)",

					       ilist->funcname);

			else if (ilist->filename != NULL)

				ret += fprintf(fp, "%s:%d (inline)",

					       ilist->filename,

					       ilist->line_nr);

			else

				ret += fprintf(fp, "??");



			ret += fprintf(fp, "\n");

		}

	}



	inline_node__delete(node);

	return ret;

}



static size_t ipchain__fprintf_graph_line(FILE *fp, int depth, int depth_mask,

					  int left_margin)

{
@@ -78,6 +138,10 @@ static size_t ipchain__fprintf_graph(FILE *fp, struct callchain_node *node, 
	fputs(str, fp);

	fputc('\n', fp);

	free(alloc_str);



	if (symbol_conf.inline_name)

		ret += inline__fprintf(chain->ms.map, chain->ip,

				       left_margin, depth, depth_mask, fp);

	return ret;

}
@@ -229,6 +293,7 @@ static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root, 
			if (!i++ && field_order == NULL &&

			    sort_order && !prefixcmp(sort_order, "sym"))

				continue;



			if (!printed) {

				ret += callchain__fprintf_left_margin(fp, left_margin);

				ret += fprintf(fp, "|\n");
@@ -251,6 +316,13 @@ static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root, 


			if (++entries_printed == callchain_param.print_limit)

				break;



			if (symbol_conf.inline_name)

				ret += inline__fprintf(chain->ms.map,

						       chain->ip,

						       left_margin,

						       0, 0,

						       fp);

		}

		root = &cnode->rb_root;

	}
@@ -529,6 +601,8 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size, 
			       bool use_callchain)

{

	int ret;

	int callchain_ret = 0;

	int inline_ret = 0;

	struct perf_hpp hpp = {

		.buf		= bf,

		.size		= size,
@@ -547,7 +621,16 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size, 
	ret = fprintf(fp, "%s\n", bf);



	if (use_callchain)

		ret += hist_entry_callchain__fprintf(he, total_period, 0, fp);

		callchain_ret = hist_entry_callchain__fprintf(he, total_period,

							      0, fp);



	if (callchain_ret == 0 && symbol_conf.inline_name) {

		inline_ret = inline__fprintf(he->ms.map, he->ip, 0, 0, 0, fp);

		ret += inline_ret;

		if (inline_ret > 0)

			ret += fprintf(fp, "\n");

	} else

		ret += callchain_ret;



	return ret;

}