License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 21:07:57 +07:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2009-06-26 21:28:00 +07:00
|
|
|
/*
|
2011-01-14 10:51:58 +07:00
|
|
|
* Copyright (C) 2009-2011, Frederic Weisbecker <fweisbec@gmail.com>
|
2009-06-26 21:28:00 +07:00
|
|
|
*
|
|
|
|
* Handle the callchains from the stream in an ad-hoc radix tree and then
|
|
|
|
* sort them in an rbtree.
|
|
|
|
*
|
2009-07-01 10:35:15 +07:00
|
|
|
* Using a radix for code path provides a fast retrieval and factorizes
|
|
|
|
* memory use. Also that lets us use the paths in a hierarchical graph view.
|
|
|
|
*
|
2009-06-26 21:28:00 +07:00
|
|
|
*/
|
|
|
|
|
2017-04-18 01:23:08 +07:00
|
|
|
#include <inttypes.h>
|
2009-06-26 21:28:00 +07:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include <errno.h>
|
2009-08-09 09:19:15 +07:00
|
|
|
#include <math.h>
|
2019-08-30 02:18:59 +07:00
|
|
|
#include <linux/string.h>
|
2019-07-04 21:32:27 +07:00
|
|
|
#include <linux/zalloc.h>
|
2009-06-26 21:28:00 +07:00
|
|
|
|
2014-01-14 22:37:15 +07:00
|
|
|
#include "asm/bug.h"
|
|
|
|
|
2019-08-23 03:11:39 +07:00
|
|
|
#include "debug.h"
|
2019-08-30 21:11:01 +07:00
|
|
|
#include "dso.h"
|
2019-09-18 21:36:13 +07:00
|
|
|
#include "event.h"
|
2013-07-19 05:33:57 +07:00
|
|
|
#include "hist.h"
|
2014-01-14 12:25:35 +07:00
|
|
|
#include "sort.h"
|
|
|
|
#include "machine.h"
|
2019-01-27 19:42:37 +07:00
|
|
|
#include "map.h"
|
2009-06-26 21:28:00 +07:00
|
|
|
#include "callchain.h"
|
2017-07-18 19:13:15 +07:00
|
|
|
#include "branch.h"
|
2019-01-27 20:10:31 +07:00
|
|
|
#include "symbol.h"
|
2019-08-30 01:20:59 +07:00
|
|
|
#include "../perf.h"
|
2009-06-26 21:28:00 +07:00
|
|
|
|
2017-04-20 04:38:33 +07:00
|
|
|
#define CALLCHAIN_PARAM_DEFAULT \
|
|
|
|
.mode = CHAIN_GRAPH_ABS, \
|
|
|
|
.min_percent = 0.5, \
|
|
|
|
.order = ORDER_CALLEE, \
|
|
|
|
.key = CCKEY_FUNCTION, \
|
|
|
|
.value = CCVAL_PERCENT, \
|
|
|
|
|
|
|
|
struct callchain_param callchain_param = {
|
|
|
|
CALLCHAIN_PARAM_DEFAULT
|
|
|
|
};
|
|
|
|
|
perf unwind: Do not look just at the global callchain_param.record_mode
When setting up DWARF callchains on specific events, without using
'record' or 'trace' --call-graph, but instead doing it like:
perf trace -e cycles/call-graph=dwarf/
The unwind__prepare_access() call in thread__insert_map() when we
process PERF_RECORD_MMAP(2) metadata events were not being performed,
precluding us from using per-event DWARF callchains, handling them just
when we asked for all events to be DWARF, using "--call-graph dwarf".
We do it in the PERF_RECORD_MMAP because we have to look at one of the
executable maps to figure out the executable type (64-bit, 32-bit) of
the DSO laid out in that mmap. Also to look at the architecture where
the perf.data file was recorded.
All this probably should be deferred to when we process a sample for
some thread that has callchains, so that we do this processing only for
the threads with samples, not for all of them.
For now, fix using DWARF on specific events.
Before:
# perf trace --no-syscalls -e probe_libc:inet_pton/call-graph=dwarf/ ping -6 -c 1 ::1
PING ::1(::1) 56 data bytes
64 bytes from ::1: icmp_seq=1 ttl=64 time=0.048 ms
--- ::1 ping statistics ---
1 packets transmitted, 1 received, 0% packet loss, time 0ms
rtt min/avg/max/mdev = 0.048/0.048/0.048/0.000 ms
0.000 probe_libc:inet_pton:(7fe9597bb350))
Problem processing probe_libc:inet_pton callchain, skipping...
#
After:
# perf trace --no-syscalls -e probe_libc:inet_pton/call-graph=dwarf/ ping -6 -c 1 ::1
PING ::1(::1) 56 data bytes
64 bytes from ::1: icmp_seq=1 ttl=64 time=0.060 ms
--- ::1 ping statistics ---
1 packets transmitted, 1 received, 0% packet loss, time 0ms
rtt min/avg/max/mdev = 0.060/0.060/0.060/0.000 ms
0.000 probe_libc:inet_pton:(7fd4aa930350))
__inet_pton (inlined)
gaih_inet.constprop.7 (/usr/lib64/libc-2.26.so)
__GI_getaddrinfo (inlined)
[0xffffaa804e51af3f] (/usr/bin/ping)
__libc_start_main (/usr/lib64/libc-2.26.so)
[0xffffaa804e51b379] (/usr/bin/ping)
#
# perf trace --call-graph=dwarf --no-syscalls -e probe_libc:inet_pton/call-graph=dwarf/ ping -6 -c 1 ::1
PING ::1(::1) 56 data bytes
64 bytes from ::1: icmp_seq=1 ttl=64 time=0.057 ms
--- ::1 ping statistics ---
1 packets transmitted, 1 received, 0% packet loss, time 0ms
rtt min/avg/max/mdev = 0.057/0.057/0.057/0.000 ms
0.000 probe_libc:inet_pton:(7f9363b9e350))
__inet_pton (inlined)
gaih_inet.constprop.7 (/usr/lib64/libc-2.26.so)
__GI_getaddrinfo (inlined)
[0xffffa9e8a14e0f3f] (/usr/bin/ping)
__libc_start_main (/usr/lib64/libc-2.26.so)
[0xffffa9e8a14e1379] (/usr/bin/ping)
#
# perf trace --call-graph=fp --no-syscalls -e probe_libc:inet_pton/call-graph=dwarf/ ping -6 -c 1 ::1
PING ::1(::1) 56 data bytes
64 bytes from ::1: icmp_seq=1 ttl=64 time=0.077 ms
--- ::1 ping statistics ---
1 packets transmitted, 1 received, 0% packet loss, time 0ms
rtt min/avg/max/mdev = 0.077/0.077/0.077/0.000 ms
0.000 probe_libc:inet_pton:(7f4947e1c350))
__inet_pton (inlined)
gaih_inet.constprop.7 (/usr/lib64/libc-2.26.so)
__GI_getaddrinfo (inlined)
[0xffffaa716d88ef3f] (/usr/bin/ping)
__libc_start_main (/usr/lib64/libc-2.26.so)
[0xffffaa716d88f379] (/usr/bin/ping)
#
# perf trace --no-syscalls -e probe_libc:inet_pton/call-graph=fp/ ping -6 -c 1 ::1
PING ::1(::1) 56 data bytes
64 bytes from ::1: icmp_seq=1 ttl=64 time=0.078 ms
--- ::1 ping statistics ---
1 packets transmitted, 1 received, 0% packet loss, time 0ms
rtt min/avg/max/mdev = 0.078/0.078/0.078/0.000 ms
0.000 probe_libc:inet_pton:(7fa157696350))
__GI___inet_pton (/usr/lib64/libc-2.26.so)
getaddrinfo (/usr/lib64/libc-2.26.so)
[0xffffa9ba39c74f40] (/usr/bin/ping)
#
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Hendrick Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Thomas Richter <tmricht@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/r/20180116182650.GE16107@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2018-01-16 02:48:46 +07:00
|
|
|
/*
|
|
|
|
* Are there any events usind DWARF callchains?
|
|
|
|
*
|
|
|
|
* I.e.
|
|
|
|
*
|
|
|
|
* -e cycles/call-graph=dwarf/
|
|
|
|
*/
|
|
|
|
bool dwarf_callchain_users;
|
|
|
|
|
2017-04-20 04:38:33 +07:00
|
|
|
struct callchain_param callchain_param_default = {
|
|
|
|
CALLCHAIN_PARAM_DEFAULT
|
|
|
|
};
|
|
|
|
|
2012-05-31 12:43:26 +07:00
|
|
|
__thread struct callchain_cursor callchain_cursor;
|
|
|
|
|
2015-08-04 15:30:20 +07:00
|
|
|
int parse_callchain_record_opt(const char *arg, struct callchain_param *param)
|
2014-09-23 08:01:42 +07:00
|
|
|
{
|
2015-08-07 02:44:52 +07:00
|
|
|
return parse_callchain_record(arg, param);
|
2014-09-23 08:01:42 +07:00
|
|
|
}
|
|
|
|
|
2014-09-23 08:01:43 +07:00
|
|
|
static int parse_callchain_mode(const char *value)
|
|
|
|
{
|
|
|
|
if (!strncmp(value, "graph", strlen(value))) {
|
|
|
|
callchain_param.mode = CHAIN_GRAPH_ABS;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!strncmp(value, "flat", strlen(value))) {
|
|
|
|
callchain_param.mode = CHAIN_FLAT;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!strncmp(value, "fractal", strlen(value))) {
|
|
|
|
callchain_param.mode = CHAIN_GRAPH_REL;
|
|
|
|
return 0;
|
|
|
|
}
|
2015-11-09 12:45:37 +07:00
|
|
|
if (!strncmp(value, "folded", strlen(value))) {
|
|
|
|
callchain_param.mode = CHAIN_FOLDED;
|
|
|
|
return 0;
|
|
|
|
}
|
2014-09-23 08:01:43 +07:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int parse_callchain_order(const char *value)
|
|
|
|
{
|
|
|
|
if (!strncmp(value, "caller", strlen(value))) {
|
|
|
|
callchain_param.order = ORDER_CALLER;
|
2015-10-22 14:45:46 +07:00
|
|
|
callchain_param.order_set = true;
|
2014-09-23 08:01:43 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!strncmp(value, "callee", strlen(value))) {
|
|
|
|
callchain_param.order = ORDER_CALLEE;
|
2015-10-22 14:45:46 +07:00
|
|
|
callchain_param.order_set = true;
|
2014-09-23 08:01:43 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int parse_callchain_sort_key(const char *value)
|
|
|
|
{
|
|
|
|
if (!strncmp(value, "function", strlen(value))) {
|
|
|
|
callchain_param.key = CCKEY_FUNCTION;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!strncmp(value, "address", strlen(value))) {
|
|
|
|
callchain_param.key = CCKEY_ADDRESS;
|
|
|
|
return 0;
|
|
|
|
}
|
2017-03-19 04:49:28 +07:00
|
|
|
if (!strncmp(value, "srcline", strlen(value))) {
|
|
|
|
callchain_param.key = CCKEY_SRCLINE;
|
|
|
|
return 0;
|
|
|
|
}
|
perf callchain: Support handling complete branch stacks as histograms
Currently branch stacks can be only shown as edge histograms for
individual branches. I never found this display particularly useful.
This implements an alternative mode that creates histograms over
complete branch traces, instead of individual branches, similar to how
normal callgraphs are handled. This is done by putting it in front of
the normal callgraph and then using the normal callgraph histogram
infrastructure to unify them.
This way in complex functions we can understand the control flow that
lead to a particular sample, and may even see some control flow in the
caller for short functions.
Example (simplified, of course for such simple code this is usually not
needed), please run this after the whole patchkit is in, as at this
point in the patch order there is no --branch-history, that will be
added in a patch after this one:
tcall.c:
volatile a = 10000, b = 100000, c;
__attribute__((noinline)) f2()
{
c = a / b;
}
__attribute__((noinline)) f1()
{
f2();
f2();
}
main()
{
int i;
for (i = 0; i < 1000000; i++)
f1();
}
% perf record -b -g ./tsrc/tcall
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.044 MB perf.data (~1923 samples) ]
% perf report --no-children --branch-history
...
54.91% tcall.c:6 [.] f2 tcall
|
|--65.53%-- f2 tcall.c:5
| |
| |--70.83%-- f1 tcall.c:11
| | f1 tcall.c:10
| | main tcall.c:18
| | main tcall.c:18
| | main tcall.c:17
| | main tcall.c:17
| | f1 tcall.c:13
| | f1 tcall.c:13
| | f2 tcall.c:7
| | f2 tcall.c:5
| | f1 tcall.c:12
| | f1 tcall.c:12
| | f2 tcall.c:7
| | f2 tcall.c:5
| | f1 tcall.c:11
| |
| --29.17%-- f1 tcall.c:12
| f1 tcall.c:12
| f2 tcall.c:7
| f2 tcall.c:5
| f1 tcall.c:11
| f1 tcall.c:10
| main tcall.c:18
| main tcall.c:18
| main tcall.c:17
| main tcall.c:17
| f1 tcall.c:13
| f1 tcall.c:13
| f2 tcall.c:7
| f2 tcall.c:5
| f1 tcall.c:12
The default output is unchanged.
This is only implemented in perf report, no change to record or anywhere
else.
This adds the basic code to report:
- add a new "branch" option to the -g option parser to enable this mode
- when the flag is set include the LBR into the callstack in machine.c.
The rest of the history code is unchanged and doesn't know the
difference between LBR entry and normal call entry.
- detect overlaps with the callchain
- remove small loop duplicates in the LBR
Current limitations:
- The LBR flags (mispredict etc.) are not shown in the history
and LBR entries have no special marker.
- It would be nice if annotate marked the LBR entries somehow
(e.g. with arrows)
v2: Various fixes.
v3: Merge further patches into this one. Fix white space.
v4: Improve manpage. Address review feedback.
v5: Rename functions. Better error message without -g. Fix crash without
-b.
v6: Rebase
v7: Rebase. Use NO_ENTRY in memset.
v8: Port to latest tip. Move add_callchain_ip to separate
patch. Skip initial entries in callchain. Minor cleanups.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1415844328-4884-3-git-send-email-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-11-13 09:05:20 +07:00
|
|
|
if (!strncmp(value, "branch", strlen(value))) {
|
|
|
|
callchain_param.branch_callstack = 1;
|
|
|
|
return 0;
|
|
|
|
}
|
2014-09-23 08:01:43 +07:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2015-11-09 12:45:41 +07:00
|
|
|
static int parse_callchain_value(const char *value)
|
|
|
|
{
|
|
|
|
if (!strncmp(value, "percent", strlen(value))) {
|
|
|
|
callchain_param.value = CCVAL_PERCENT;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!strncmp(value, "period", strlen(value))) {
|
|
|
|
callchain_param.value = CCVAL_PERIOD;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!strncmp(value, "count", strlen(value))) {
|
|
|
|
callchain_param.value = CCVAL_COUNT;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2017-04-20 04:38:33 +07:00
|
|
|
static int get_stack_size(const char *str, unsigned long *_size)
|
|
|
|
{
|
|
|
|
char *endptr;
|
|
|
|
unsigned long size;
|
|
|
|
unsigned long max_size = round_down(USHRT_MAX, sizeof(u64));
|
|
|
|
|
|
|
|
size = strtoul(str, &endptr, 0);
|
|
|
|
|
|
|
|
do {
|
|
|
|
if (*endptr)
|
|
|
|
break;
|
|
|
|
|
|
|
|
size = round_up(size, sizeof(u64));
|
|
|
|
if (!size || size > max_size)
|
|
|
|
break;
|
|
|
|
|
|
|
|
*_size = size;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
} while (0);
|
|
|
|
|
|
|
|
pr_err("callchain: Incorrect stack dump size (max %ld): %s\n",
|
|
|
|
max_size, str);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
perf top: Support call-graph display options also
Currently 'perf top --call-graph' option is same as 'perf record'. But
'perf top' also need to receive display options in 'perf report'. To do
that, change parse_callchain_report_opt() to allow record options too.
Now perf top can receive display options like below:
$ perf top --call-graph
Error: option `call-graph' requires a value
Usage: perf top [<options>]
--call-graph
<mode[,dump_size],output_type,min_percent[,print_limit],call_order[,branch]>
setup and enables call-graph (stack chain/backtrace)
recording: fp dwarf lbr, output_type (graph, flat,
fractal, or none), min percent threshold, optional
print limit, callchain order, key (function or
address), add branches
$ perf top --call-graph callee,graph,fp
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Chandler Carruth <chandlerc@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1445495330-25416-2-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-10-22 13:28:49 +07:00
|
|
|
static int
|
|
|
|
__parse_callchain_report_opt(const char *arg, bool allow_record_opt)
|
2014-04-08 01:55:24 +07:00
|
|
|
{
|
2014-08-14 13:01:38 +07:00
|
|
|
char *tok;
|
2017-04-05 21:38:10 +07:00
|
|
|
char *endptr, *saveptr = NULL;
|
2014-08-14 13:01:38 +07:00
|
|
|
bool minpcnt_set = false;
|
perf top: Support call-graph display options also
Currently 'perf top --call-graph' option is same as 'perf record'. But
'perf top' also need to receive display options in 'perf report'. To do
that, change parse_callchain_report_opt() to allow record options too.
Now perf top can receive display options like below:
$ perf top --call-graph
Error: option `call-graph' requires a value
Usage: perf top [<options>]
--call-graph
<mode[,dump_size],output_type,min_percent[,print_limit],call_order[,branch]>
setup and enables call-graph (stack chain/backtrace)
recording: fp dwarf lbr, output_type (graph, flat,
fractal, or none), min percent threshold, optional
print limit, callchain order, key (function or
address), add branches
$ perf top --call-graph callee,graph,fp
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Chandler Carruth <chandlerc@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1445495330-25416-2-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-10-22 13:28:49 +07:00
|
|
|
bool record_opt_set = false;
|
|
|
|
bool try_stack_size = false;
|
2014-04-08 01:55:24 +07:00
|
|
|
|
2016-04-18 21:53:07 +07:00
|
|
|
callchain_param.enabled = true;
|
2014-04-08 01:55:24 +07:00
|
|
|
symbol_conf.use_callchain = true;
|
|
|
|
|
|
|
|
if (!arg)
|
|
|
|
return 0;
|
|
|
|
|
2017-04-05 21:38:10 +07:00
|
|
|
while ((tok = strtok_r((char *)arg, ",", &saveptr)) != NULL) {
|
2014-08-14 13:01:38 +07:00
|
|
|
if (!strncmp(tok, "none", strlen(tok))) {
|
|
|
|
callchain_param.mode = CHAIN_NONE;
|
2016-04-18 21:53:07 +07:00
|
|
|
callchain_param.enabled = false;
|
2014-08-14 13:01:38 +07:00
|
|
|
symbol_conf.use_callchain = false;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-09-23 08:01:43 +07:00
|
|
|
if (!parse_callchain_mode(tok) ||
|
|
|
|
!parse_callchain_order(tok) ||
|
2015-11-09 12:45:41 +07:00
|
|
|
!parse_callchain_sort_key(tok) ||
|
|
|
|
!parse_callchain_value(tok)) {
|
2014-09-23 08:01:43 +07:00
|
|
|
/* parsing ok - move on to the next */
|
perf top: Support call-graph display options also
Currently 'perf top --call-graph' option is same as 'perf record'. But
'perf top' also need to receive display options in 'perf report'. To do
that, change parse_callchain_report_opt() to allow record options too.
Now perf top can receive display options like below:
$ perf top --call-graph
Error: option `call-graph' requires a value
Usage: perf top [<options>]
--call-graph
<mode[,dump_size],output_type,min_percent[,print_limit],call_order[,branch]>
setup and enables call-graph (stack chain/backtrace)
recording: fp dwarf lbr, output_type (graph, flat,
fractal, or none), min percent threshold, optional
print limit, callchain order, key (function or
address), add branches
$ perf top --call-graph callee,graph,fp
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Chandler Carruth <chandlerc@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1445495330-25416-2-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-10-22 13:28:49 +07:00
|
|
|
try_stack_size = false;
|
|
|
|
goto next;
|
|
|
|
} else if (allow_record_opt && !record_opt_set) {
|
|
|
|
if (parse_callchain_record(tok, &callchain_param))
|
|
|
|
goto try_numbers;
|
|
|
|
|
|
|
|
/* assume that number followed by 'dwarf' is stack size */
|
|
|
|
if (callchain_param.record_mode == CALLCHAIN_DWARF)
|
|
|
|
try_stack_size = true;
|
|
|
|
|
|
|
|
record_opt_set = true;
|
|
|
|
goto next;
|
|
|
|
}
|
|
|
|
|
|
|
|
try_numbers:
|
|
|
|
if (try_stack_size) {
|
|
|
|
unsigned long size = 0;
|
|
|
|
|
|
|
|
if (get_stack_size(tok, &size) < 0)
|
|
|
|
return -1;
|
|
|
|
callchain_param.dump_size = size;
|
|
|
|
try_stack_size = false;
|
2014-09-23 08:01:43 +07:00
|
|
|
} else if (!minpcnt_set) {
|
|
|
|
/* try to get the min percent */
|
2014-08-14 13:01:38 +07:00
|
|
|
callchain_param.min_percent = strtod(tok, &endptr);
|
|
|
|
if (tok == endptr)
|
|
|
|
return -1;
|
|
|
|
minpcnt_set = true;
|
|
|
|
} else {
|
|
|
|
/* try print limit at last */
|
|
|
|
callchain_param.print_limit = strtoul(tok, &endptr, 0);
|
|
|
|
if (tok == endptr)
|
|
|
|
return -1;
|
|
|
|
}
|
perf top: Support call-graph display options also
Currently 'perf top --call-graph' option is same as 'perf record'. But
'perf top' also need to receive display options in 'perf report'. To do
that, change parse_callchain_report_opt() to allow record options too.
Now perf top can receive display options like below:
$ perf top --call-graph
Error: option `call-graph' requires a value
Usage: perf top [<options>]
--call-graph
<mode[,dump_size],output_type,min_percent[,print_limit],call_order[,branch]>
setup and enables call-graph (stack chain/backtrace)
recording: fp dwarf lbr, output_type (graph, flat,
fractal, or none), min percent threshold, optional
print limit, callchain order, key (function or
address), add branches
$ perf top --call-graph callee,graph,fp
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Chandler Carruth <chandlerc@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1445495330-25416-2-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-10-22 13:28:49 +07:00
|
|
|
next:
|
2014-08-14 13:01:38 +07:00
|
|
|
arg = NULL;
|
2014-04-08 01:55:24 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
if (callchain_register_param(&callchain_param) < 0) {
|
|
|
|
pr_err("Can't register callchain params\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
perf top: Support call-graph display options also
Currently 'perf top --call-graph' option is same as 'perf record'. But
'perf top' also need to receive display options in 'perf report'. To do
that, change parse_callchain_report_opt() to allow record options too.
Now perf top can receive display options like below:
$ perf top --call-graph
Error: option `call-graph' requires a value
Usage: perf top [<options>]
--call-graph
<mode[,dump_size],output_type,min_percent[,print_limit],call_order[,branch]>
setup and enables call-graph (stack chain/backtrace)
recording: fp dwarf lbr, output_type (graph, flat,
fractal, or none), min percent threshold, optional
print limit, callchain order, key (function or
address), add branches
$ perf top --call-graph callee,graph,fp
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Chandler Carruth <chandlerc@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1445495330-25416-2-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2015-10-22 13:28:49 +07:00
|
|
|
int parse_callchain_report_opt(const char *arg)
|
|
|
|
{
|
|
|
|
return __parse_callchain_report_opt(arg, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
int parse_callchain_top_opt(const char *arg)
|
|
|
|
{
|
|
|
|
return __parse_callchain_report_opt(arg, true);
|
|
|
|
}
|
|
|
|
|
2017-04-20 04:38:33 +07:00
|
|
|
int parse_callchain_record(const char *arg, struct callchain_param *param)
|
|
|
|
{
|
|
|
|
char *tok, *name, *saveptr = NULL;
|
|
|
|
char *buf;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
/* We need buffer that we know we can write to. */
|
|
|
|
buf = malloc(strlen(arg) + 1);
|
|
|
|
if (!buf)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
strcpy(buf, arg);
|
|
|
|
|
|
|
|
tok = strtok_r((char *)buf, ",", &saveptr);
|
|
|
|
name = tok ? : (char *)buf;
|
|
|
|
|
|
|
|
do {
|
|
|
|
/* Framepointer style */
|
|
|
|
if (!strncmp(name, "fp", sizeof("fp"))) {
|
|
|
|
if (!strtok_r(NULL, ",", &saveptr)) {
|
|
|
|
param->record_mode = CALLCHAIN_FP;
|
|
|
|
ret = 0;
|
|
|
|
} else
|
|
|
|
pr_err("callchain: No more arguments "
|
|
|
|
"needed for --call-graph fp\n");
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Dwarf style */
|
|
|
|
} else if (!strncmp(name, "dwarf", sizeof("dwarf"))) {
|
|
|
|
const unsigned long default_stack_dump_size = 8192;
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
param->record_mode = CALLCHAIN_DWARF;
|
|
|
|
param->dump_size = default_stack_dump_size;
|
perf unwind: Do not look just at the global callchain_param.record_mode
When setting up DWARF callchains on specific events, without using
'record' or 'trace' --call-graph, but instead doing it like:
perf trace -e cycles/call-graph=dwarf/
The unwind__prepare_access() call in thread__insert_map() when we
process PERF_RECORD_MMAP(2) metadata events were not being performed,
precluding us from using per-event DWARF callchains, handling them just
when we asked for all events to be DWARF, using "--call-graph dwarf".
We do it in the PERF_RECORD_MMAP because we have to look at one of the
executable maps to figure out the executable type (64-bit, 32-bit) of
the DSO laid out in that mmap. Also to look at the architecture where
the perf.data file was recorded.
All this probably should be deferred to when we process a sample for
some thread that has callchains, so that we do this processing only for
the threads with samples, not for all of them.
For now, fix using DWARF on specific events.
Before:
# perf trace --no-syscalls -e probe_libc:inet_pton/call-graph=dwarf/ ping -6 -c 1 ::1
PING ::1(::1) 56 data bytes
64 bytes from ::1: icmp_seq=1 ttl=64 time=0.048 ms
--- ::1 ping statistics ---
1 packets transmitted, 1 received, 0% packet loss, time 0ms
rtt min/avg/max/mdev = 0.048/0.048/0.048/0.000 ms
0.000 probe_libc:inet_pton:(7fe9597bb350))
Problem processing probe_libc:inet_pton callchain, skipping...
#
After:
# perf trace --no-syscalls -e probe_libc:inet_pton/call-graph=dwarf/ ping -6 -c 1 ::1
PING ::1(::1) 56 data bytes
64 bytes from ::1: icmp_seq=1 ttl=64 time=0.060 ms
--- ::1 ping statistics ---
1 packets transmitted, 1 received, 0% packet loss, time 0ms
rtt min/avg/max/mdev = 0.060/0.060/0.060/0.000 ms
0.000 probe_libc:inet_pton:(7fd4aa930350))
__inet_pton (inlined)
gaih_inet.constprop.7 (/usr/lib64/libc-2.26.so)
__GI_getaddrinfo (inlined)
[0xffffaa804e51af3f] (/usr/bin/ping)
__libc_start_main (/usr/lib64/libc-2.26.so)
[0xffffaa804e51b379] (/usr/bin/ping)
#
# perf trace --call-graph=dwarf --no-syscalls -e probe_libc:inet_pton/call-graph=dwarf/ ping -6 -c 1 ::1
PING ::1(::1) 56 data bytes
64 bytes from ::1: icmp_seq=1 ttl=64 time=0.057 ms
--- ::1 ping statistics ---
1 packets transmitted, 1 received, 0% packet loss, time 0ms
rtt min/avg/max/mdev = 0.057/0.057/0.057/0.000 ms
0.000 probe_libc:inet_pton:(7f9363b9e350))
__inet_pton (inlined)
gaih_inet.constprop.7 (/usr/lib64/libc-2.26.so)
__GI_getaddrinfo (inlined)
[0xffffa9e8a14e0f3f] (/usr/bin/ping)
__libc_start_main (/usr/lib64/libc-2.26.so)
[0xffffa9e8a14e1379] (/usr/bin/ping)
#
# perf trace --call-graph=fp --no-syscalls -e probe_libc:inet_pton/call-graph=dwarf/ ping -6 -c 1 ::1
PING ::1(::1) 56 data bytes
64 bytes from ::1: icmp_seq=1 ttl=64 time=0.077 ms
--- ::1 ping statistics ---
1 packets transmitted, 1 received, 0% packet loss, time 0ms
rtt min/avg/max/mdev = 0.077/0.077/0.077/0.000 ms
0.000 probe_libc:inet_pton:(7f4947e1c350))
__inet_pton (inlined)
gaih_inet.constprop.7 (/usr/lib64/libc-2.26.so)
__GI_getaddrinfo (inlined)
[0xffffaa716d88ef3f] (/usr/bin/ping)
__libc_start_main (/usr/lib64/libc-2.26.so)
[0xffffaa716d88f379] (/usr/bin/ping)
#
# perf trace --no-syscalls -e probe_libc:inet_pton/call-graph=fp/ ping -6 -c 1 ::1
PING ::1(::1) 56 data bytes
64 bytes from ::1: icmp_seq=1 ttl=64 time=0.078 ms
--- ::1 ping statistics ---
1 packets transmitted, 1 received, 0% packet loss, time 0ms
rtt min/avg/max/mdev = 0.078/0.078/0.078/0.000 ms
0.000 probe_libc:inet_pton:(7fa157696350))
__GI___inet_pton (/usr/lib64/libc-2.26.so)
getaddrinfo (/usr/lib64/libc-2.26.so)
[0xffffa9ba39c74f40] (/usr/bin/ping)
#
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Hendrick Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Thomas Richter <tmricht@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/r/20180116182650.GE16107@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2018-01-16 02:48:46 +07:00
|
|
|
dwarf_callchain_users = true;
|
2017-04-20 04:38:33 +07:00
|
|
|
|
|
|
|
tok = strtok_r(NULL, ",", &saveptr);
|
|
|
|
if (tok) {
|
|
|
|
unsigned long size = 0;
|
|
|
|
|
|
|
|
ret = get_stack_size(tok, &size);
|
|
|
|
param->dump_size = size;
|
|
|
|
}
|
|
|
|
} else if (!strncmp(name, "lbr", sizeof("lbr"))) {
|
|
|
|
if (!strtok_r(NULL, ",", &saveptr)) {
|
|
|
|
param->record_mode = CALLCHAIN_LBR;
|
|
|
|
ret = 0;
|
|
|
|
} else
|
|
|
|
pr_err("callchain: No more arguments "
|
|
|
|
"needed for --call-graph lbr\n");
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
pr_err("callchain: Unknown --call-graph option "
|
|
|
|
"value: %s\n", arg);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
} while (0);
|
|
|
|
|
|
|
|
free(buf);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-09-23 08:01:43 +07:00
|
|
|
int perf_callchain_config(const char *var, const char *value)
|
|
|
|
{
|
|
|
|
char *endptr;
|
|
|
|
|
2017-07-21 01:27:39 +07:00
|
|
|
if (!strstarts(var, "call-graph."))
|
2014-09-23 08:01:43 +07:00
|
|
|
return 0;
|
|
|
|
var += sizeof("call-graph.") - 1;
|
|
|
|
|
|
|
|
if (!strcmp(var, "record-mode"))
|
2015-08-04 15:30:20 +07:00
|
|
|
return parse_callchain_record_opt(value, &callchain_param);
|
2014-09-23 08:01:43 +07:00
|
|
|
if (!strcmp(var, "dump-size")) {
|
|
|
|
unsigned long size = 0;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = get_stack_size(value, &size);
|
|
|
|
callchain_param.dump_size = size;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
perf report: Fix debug messages with --call-graph option
With --call-graph option, perf report can display call chains using
type, min percent threshold, optional print limit and order. And the
default call-graph parameter is 'graph,0.5,caller,function,percent'.
Before this patch, 'perf report --call-graph' shows incorrect debug
messages as below:
# perf report --call-graph
Invalid callchain mode: 0.5
Invalid callchain order: 0.5
Invalid callchain sort key: 0.5
Invalid callchain config key: 0.5
Invalid callchain mode: caller
Invalid callchain mode: function
Invalid callchain order: function
Invalid callchain mode: percent
Invalid callchain order: percent
Invalid callchain sort key: percent
That is because in function __parse_callchain_report_opt(),each field of
the call-graph parameter is passed to parse_callchain_{mode,order,
sort_key,value} in turn until it meets the matching value.
For example, the order field "caller" is passed to
parse_callchain_mode() firstly and obviously it doesn't match any mode
field. Therefore parse_callchain_mode() will shows the debug message
"Invalid callchain mode: caller", which could confuse users.
The patch fixes this issue by moving the warning out of the function
parse_callchain_{mode,order,sort_key,value}.
Signed-off-by: Mengting Zhang <zhangmengting@huawei.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Krister Johansen <kjlx@templeofstupid.com>
Cc: Li Bin <huawei.libin@huawei.com>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Cc: Yao Jin <yao.jin@linux.intel.com>
Link: http://lkml.kernel.org/r/1506154694-39691-1-git-send-email-zhangmengting@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2017-09-23 15:18:14 +07:00
|
|
|
if (!strcmp(var, "print-type")){
|
|
|
|
int ret;
|
|
|
|
ret = parse_callchain_mode(value);
|
|
|
|
if (ret == -1)
|
|
|
|
pr_err("Invalid callchain mode: %s\n", value);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
if (!strcmp(var, "order")){
|
|
|
|
int ret;
|
|
|
|
ret = parse_callchain_order(value);
|
|
|
|
if (ret == -1)
|
|
|
|
pr_err("Invalid callchain order: %s\n", value);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
if (!strcmp(var, "sort-key")){
|
|
|
|
int ret;
|
|
|
|
ret = parse_callchain_sort_key(value);
|
|
|
|
if (ret == -1)
|
|
|
|
pr_err("Invalid callchain sort key: %s\n", value);
|
|
|
|
return ret;
|
|
|
|
}
|
2014-09-23 08:01:43 +07:00
|
|
|
if (!strcmp(var, "threshold")) {
|
|
|
|
callchain_param.min_percent = strtod(value, &endptr);
|
2017-01-24 23:44:10 +07:00
|
|
|
if (value == endptr) {
|
|
|
|
pr_err("Invalid callchain threshold: %s\n", value);
|
2014-09-23 08:01:43 +07:00
|
|
|
return -1;
|
2017-01-24 23:44:10 +07:00
|
|
|
}
|
2014-09-23 08:01:43 +07:00
|
|
|
}
|
|
|
|
if (!strcmp(var, "print-limit")) {
|
|
|
|
callchain_param.print_limit = strtod(value, &endptr);
|
2017-01-24 23:44:10 +07:00
|
|
|
if (value == endptr) {
|
|
|
|
pr_err("Invalid callchain print limit: %s\n", value);
|
2014-09-23 08:01:43 +07:00
|
|
|
return -1;
|
2017-01-24 23:44:10 +07:00
|
|
|
}
|
2014-09-23 08:01:43 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-07-01 10:35:15 +07:00
|
|
|
static void
|
2009-07-02 22:58:21 +07:00
|
|
|
rb_insert_callchain(struct rb_root *root, struct callchain_node *chain,
|
|
|
|
enum chain_mode mode)
|
2009-06-26 21:28:00 +07:00
|
|
|
{
|
|
|
|
struct rb_node **p = &root->rb_node;
|
|
|
|
struct rb_node *parent = NULL;
|
|
|
|
struct callchain_node *rnode;
|
2011-01-14 10:51:59 +07:00
|
|
|
u64 chain_cumul = callchain_cumul_hits(chain);
|
2009-06-26 21:28:00 +07:00
|
|
|
|
|
|
|
while (*p) {
|
2009-08-07 12:11:05 +07:00
|
|
|
u64 rnode_cumul;
|
|
|
|
|
2009-06-26 21:28:00 +07:00
|
|
|
parent = *p;
|
|
|
|
rnode = rb_entry(parent, struct callchain_node, rb_node);
|
2011-01-14 10:51:59 +07:00
|
|
|
rnode_cumul = callchain_cumul_hits(rnode);
|
2009-06-26 21:28:00 +07:00
|
|
|
|
2009-07-02 22:58:21 +07:00
|
|
|
switch (mode) {
|
2009-07-05 12:39:21 +07:00
|
|
|
case CHAIN_FLAT:
|
2015-11-09 12:45:37 +07:00
|
|
|
case CHAIN_FOLDED:
|
2009-07-02 22:58:21 +07:00
|
|
|
if (rnode->hit < chain->hit)
|
|
|
|
p = &(*p)->rb_left;
|
|
|
|
else
|
|
|
|
p = &(*p)->rb_right;
|
|
|
|
break;
|
2009-07-05 12:39:21 +07:00
|
|
|
case CHAIN_GRAPH_ABS: /* Falldown */
|
|
|
|
case CHAIN_GRAPH_REL:
|
2009-08-07 12:11:05 +07:00
|
|
|
if (rnode_cumul < chain_cumul)
|
2009-07-02 22:58:21 +07:00
|
|
|
p = &(*p)->rb_left;
|
|
|
|
else
|
|
|
|
p = &(*p)->rb_right;
|
|
|
|
break;
|
2009-08-15 17:26:57 +07:00
|
|
|
case CHAIN_NONE:
|
2009-07-02 22:58:21 +07:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2009-06-26 21:28:00 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
rb_link_node(&chain->rb_node, parent, p);
|
|
|
|
rb_insert_color(&chain->rb_node, root);
|
|
|
|
}
|
|
|
|
|
2009-07-05 12:39:21 +07:00
|
|
|
static void
|
|
|
|
__sort_chain_flat(struct rb_root *rb_root, struct callchain_node *node,
|
|
|
|
u64 min_hit)
|
|
|
|
{
|
2013-10-11 12:15:36 +07:00
|
|
|
struct rb_node *n;
|
2009-07-05 12:39:21 +07:00
|
|
|
struct callchain_node *child;
|
|
|
|
|
2013-10-11 12:15:36 +07:00
|
|
|
n = rb_first(&node->rb_root_in);
|
|
|
|
while (n) {
|
|
|
|
child = rb_entry(n, struct callchain_node, rb_node_in);
|
|
|
|
n = rb_next(n);
|
|
|
|
|
2009-07-05 12:39:21 +07:00
|
|
|
__sort_chain_flat(rb_root, child, min_hit);
|
2013-10-11 12:15:36 +07:00
|
|
|
}
|
2009-07-05 12:39:21 +07:00
|
|
|
|
|
|
|
if (node->hit && node->hit >= min_hit)
|
|
|
|
rb_insert_callchain(rb_root, node, CHAIN_FLAT);
|
|
|
|
}
|
|
|
|
|
2009-06-26 21:28:00 +07:00
|
|
|
/*
|
|
|
|
* Once we get every callchains from the stream, we can now
|
|
|
|
* sort them by hit
|
|
|
|
*/
|
2009-07-05 12:39:21 +07:00
|
|
|
static void
|
2010-08-23 01:05:22 +07:00
|
|
|
sort_chain_flat(struct rb_root *rb_root, struct callchain_root *root,
|
2012-09-11 05:15:03 +07:00
|
|
|
u64 min_hit, struct callchain_param *param __maybe_unused)
|
2009-07-05 12:39:21 +07:00
|
|
|
{
|
2015-11-26 14:08:18 +07:00
|
|
|
*rb_root = RB_ROOT;
|
2010-08-23 01:05:22 +07:00
|
|
|
__sort_chain_flat(rb_root, &root->node, min_hit);
|
2009-07-05 12:39:21 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void __sort_chain_graph_abs(struct callchain_node *node,
|
|
|
|
u64 min_hit)
|
2009-06-26 21:28:00 +07:00
|
|
|
{
|
2013-10-11 12:15:36 +07:00
|
|
|
struct rb_node *n;
|
2009-06-26 21:28:00 +07:00
|
|
|
struct callchain_node *child;
|
|
|
|
|
2009-07-05 12:39:21 +07:00
|
|
|
node->rb_root = RB_ROOT;
|
2013-10-11 12:15:36 +07:00
|
|
|
n = rb_first(&node->rb_root_in);
|
|
|
|
|
|
|
|
while (n) {
|
|
|
|
child = rb_entry(n, struct callchain_node, rb_node_in);
|
|
|
|
n = rb_next(n);
|
2009-06-26 21:28:00 +07:00
|
|
|
|
2009-07-05 12:39:21 +07:00
|
|
|
__sort_chain_graph_abs(child, min_hit);
|
2011-01-14 10:51:59 +07:00
|
|
|
if (callchain_cumul_hits(child) >= min_hit)
|
2009-07-05 12:39:21 +07:00
|
|
|
rb_insert_callchain(&node->rb_root, child,
|
|
|
|
CHAIN_GRAPH_ABS);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2010-08-23 01:05:22 +07:00
|
|
|
sort_chain_graph_abs(struct rb_root *rb_root, struct callchain_root *chain_root,
|
2012-09-11 05:15:03 +07:00
|
|
|
u64 min_hit, struct callchain_param *param __maybe_unused)
|
2009-07-05 12:39:21 +07:00
|
|
|
{
|
2010-08-23 01:05:22 +07:00
|
|
|
__sort_chain_graph_abs(&chain_root->node, min_hit);
|
|
|
|
rb_root->rb_node = chain_root->node.rb_root.rb_node;
|
2009-07-02 22:58:21 +07:00
|
|
|
}
|
|
|
|
|
2009-07-05 12:39:21 +07:00
|
|
|
static void __sort_chain_graph_rel(struct callchain_node *node,
|
|
|
|
double min_percent)
|
2009-07-02 22:58:21 +07:00
|
|
|
{
|
2013-10-11 12:15:36 +07:00
|
|
|
struct rb_node *n;
|
2009-07-02 22:58:21 +07:00
|
|
|
struct callchain_node *child;
|
2009-07-05 12:39:21 +07:00
|
|
|
u64 min_hit;
|
2009-07-02 22:58:21 +07:00
|
|
|
|
|
|
|
node->rb_root = RB_ROOT;
|
2009-08-09 09:19:15 +07:00
|
|
|
min_hit = ceil(node->children_hit * min_percent);
|
2009-07-02 22:58:21 +07:00
|
|
|
|
2013-10-11 12:15:36 +07:00
|
|
|
n = rb_first(&node->rb_root_in);
|
|
|
|
while (n) {
|
|
|
|
child = rb_entry(n, struct callchain_node, rb_node_in);
|
|
|
|
n = rb_next(n);
|
|
|
|
|
2009-07-05 12:39:21 +07:00
|
|
|
__sort_chain_graph_rel(child, min_percent);
|
2011-01-14 10:51:59 +07:00
|
|
|
if (callchain_cumul_hits(child) >= min_hit)
|
2009-07-05 12:39:21 +07:00
|
|
|
rb_insert_callchain(&node->rb_root, child,
|
|
|
|
CHAIN_GRAPH_REL);
|
2009-07-02 22:58:21 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-05 12:39:21 +07:00
|
|
|
static void
|
2010-08-23 01:05:22 +07:00
|
|
|
sort_chain_graph_rel(struct rb_root *rb_root, struct callchain_root *chain_root,
|
2012-09-11 05:15:03 +07:00
|
|
|
u64 min_hit __maybe_unused, struct callchain_param *param)
|
2009-07-02 22:58:21 +07:00
|
|
|
{
|
2010-08-23 01:05:22 +07:00
|
|
|
__sort_chain_graph_rel(&chain_root->node, param->min_percent / 100.0);
|
|
|
|
rb_root->rb_node = chain_root->node.rb_root.rb_node;
|
2009-06-26 21:28:00 +07:00
|
|
|
}
|
|
|
|
|
2011-01-14 10:52:00 +07:00
|
|
|
int callchain_register_param(struct callchain_param *param)
|
2009-07-05 12:39:21 +07:00
|
|
|
{
|
|
|
|
switch (param->mode) {
|
|
|
|
case CHAIN_GRAPH_ABS:
|
|
|
|
param->sort = sort_chain_graph_abs;
|
|
|
|
break;
|
|
|
|
case CHAIN_GRAPH_REL:
|
|
|
|
param->sort = sort_chain_graph_rel;
|
|
|
|
break;
|
|
|
|
case CHAIN_FLAT:
|
2015-11-09 12:45:37 +07:00
|
|
|
case CHAIN_FOLDED:
|
2009-07-05 12:39:21 +07:00
|
|
|
param->sort = sort_chain_flat;
|
|
|
|
break;
|
2009-08-15 17:26:57 +07:00
|
|
|
case CHAIN_NONE:
|
2009-07-05 12:39:21 +07:00
|
|
|
default:
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-07-01 10:35:15 +07:00
|
|
|
/*
|
|
|
|
* Create a child for a parent. If inherit_children, then the new child
|
|
|
|
* will become the new parent of it's parent children
|
|
|
|
*/
|
|
|
|
static struct callchain_node *
|
|
|
|
create_child(struct callchain_node *parent, bool inherit_children)
|
2009-06-26 21:28:00 +07:00
|
|
|
{
|
|
|
|
struct callchain_node *new;
|
|
|
|
|
2010-05-10 20:56:50 +07:00
|
|
|
new = zalloc(sizeof(*new));
|
2009-06-26 21:28:00 +07:00
|
|
|
if (!new) {
|
|
|
|
perror("not enough memory to create child for code path tree");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
new->parent = parent;
|
|
|
|
INIT_LIST_HEAD(&new->val);
|
2015-11-09 12:45:43 +07:00
|
|
|
INIT_LIST_HEAD(&new->parent_val);
|
2009-07-01 10:35:15 +07:00
|
|
|
|
|
|
|
if (inherit_children) {
|
2013-10-11 12:15:36 +07:00
|
|
|
struct rb_node *n;
|
|
|
|
struct callchain_node *child;
|
|
|
|
|
|
|
|
new->rb_root_in = parent->rb_root_in;
|
|
|
|
parent->rb_root_in = RB_ROOT;
|
2009-07-01 10:35:15 +07:00
|
|
|
|
2013-10-11 12:15:36 +07:00
|
|
|
n = rb_first(&new->rb_root_in);
|
|
|
|
while (n) {
|
|
|
|
child = rb_entry(n, struct callchain_node, rb_node_in);
|
|
|
|
child->parent = new;
|
|
|
|
n = rb_next(n);
|
|
|
|
}
|
2009-07-01 10:35:15 +07:00
|
|
|
|
2013-10-11 12:15:36 +07:00
|
|
|
/* make it the first child */
|
|
|
|
rb_link_node(&new->rb_node_in, NULL, &parent->rb_root_in.rb_node);
|
|
|
|
rb_insert_color(&new->rb_node_in, &parent->rb_root_in);
|
2009-07-01 10:35:15 +07:00
|
|
|
}
|
2009-06-26 21:28:00 +07:00
|
|
|
|
|
|
|
return new;
|
|
|
|
}
|
|
|
|
|
2010-03-22 23:09:33 +07:00
|
|
|
|
2009-07-01 10:35:15 +07:00
|
|
|
/*
|
|
|
|
* Fill the node with callchain values
|
|
|
|
*/
|
2016-02-16 21:08:21 +07:00
|
|
|
static int
|
2011-01-14 10:51:58 +07:00
|
|
|
fill_node(struct callchain_node *node, struct callchain_cursor *cursor)
|
2009-06-26 21:28:00 +07:00
|
|
|
{
|
2011-01-14 10:51:58 +07:00
|
|
|
struct callchain_cursor_node *cursor_node;
|
|
|
|
|
|
|
|
node->val_nr = cursor->nr - cursor->pos;
|
|
|
|
if (!node->val_nr)
|
|
|
|
pr_warning("Warning: empty node in callchain tree\n");
|
2009-06-26 21:28:00 +07:00
|
|
|
|
2011-01-14 10:51:58 +07:00
|
|
|
cursor_node = callchain_cursor_current(cursor);
|
|
|
|
|
|
|
|
while (cursor_node) {
|
2009-06-26 21:28:00 +07:00
|
|
|
struct callchain_list *call;
|
|
|
|
|
2010-05-10 20:56:50 +07:00
|
|
|
call = zalloc(sizeof(*call));
|
2009-06-26 21:28:00 +07:00
|
|
|
if (!call) {
|
|
|
|
perror("not enough memory for the code path tree");
|
2016-02-16 21:08:21 +07:00
|
|
|
return -1;
|
2009-06-26 21:28:00 +07:00
|
|
|
}
|
2011-01-14 10:51:58 +07:00
|
|
|
call->ip = cursor_node->ip;
|
2019-11-04 22:14:32 +07:00
|
|
|
call->ms = cursor_node->ms;
|
|
|
|
map__get(call->ms.map);
|
2017-10-10 03:32:56 +07:00
|
|
|
call->srcline = cursor_node->srcline;
|
2016-10-31 08:19:51 +07:00
|
|
|
|
|
|
|
if (cursor_node->branch) {
|
|
|
|
call->branch_count = 1;
|
|
|
|
|
2017-07-24 18:09:07 +07:00
|
|
|
if (cursor_node->branch_from) {
|
|
|
|
/*
|
|
|
|
* branch_from is set with value somewhere else
|
|
|
|
* to imply it's "to" of a branch.
|
|
|
|
*/
|
|
|
|
call->brtype_stat.branch_to = true;
|
|
|
|
|
|
|
|
if (cursor_node->branch_flags.predicted)
|
|
|
|
call->predicted_count = 1;
|
|
|
|
|
|
|
|
if (cursor_node->branch_flags.abort)
|
|
|
|
call->abort_count = 1;
|
|
|
|
|
|
|
|
branch_type_count(&call->brtype_stat,
|
|
|
|
&cursor_node->branch_flags,
|
|
|
|
cursor_node->branch_from,
|
|
|
|
cursor_node->ip);
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* It's "from" of a branch
|
|
|
|
*/
|
|
|
|
call->brtype_stat.branch_to = false;
|
|
|
|
call->cycles_count =
|
|
|
|
cursor_node->branch_flags.cycles;
|
|
|
|
call->iter_count = cursor_node->nr_loop_iter;
|
2017-08-07 20:05:15 +07:00
|
|
|
call->iter_cycles = cursor_node->iter_cycles;
|
2017-07-24 18:09:07 +07:00
|
|
|
}
|
2016-10-31 08:19:51 +07:00
|
|
|
}
|
|
|
|
|
2009-06-26 21:28:00 +07:00
|
|
|
list_add_tail(&call->list, &node->val);
|
2011-01-14 10:51:58 +07:00
|
|
|
|
|
|
|
callchain_cursor_advance(cursor);
|
|
|
|
cursor_node = callchain_cursor_current(cursor);
|
2009-06-26 21:28:00 +07:00
|
|
|
}
|
2016-02-16 21:08:21 +07:00
|
|
|
return 0;
|
2009-06-26 21:28:00 +07:00
|
|
|
}
|
|
|
|
|
2013-10-11 12:15:36 +07:00
|
|
|
static struct callchain_node *
|
2011-01-14 10:51:58 +07:00
|
|
|
add_child(struct callchain_node *parent,
|
|
|
|
struct callchain_cursor *cursor,
|
|
|
|
u64 period)
|
2009-06-26 21:28:00 +07:00
|
|
|
{
|
|
|
|
struct callchain_node *new;
|
|
|
|
|
2009-07-01 10:35:15 +07:00
|
|
|
new = create_child(parent, false);
|
2016-02-16 21:08:20 +07:00
|
|
|
if (new == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2016-02-16 21:08:21 +07:00
|
|
|
if (fill_node(new, cursor) < 0) {
|
|
|
|
struct callchain_list *call, *tmp;
|
|
|
|
|
|
|
|
list_for_each_entry_safe(call, tmp, &new->val, list) {
|
2019-07-04 22:13:46 +07:00
|
|
|
list_del_init(&call->list);
|
2017-01-06 13:23:31 +07:00
|
|
|
map__zput(call->ms.map);
|
2016-02-16 21:08:21 +07:00
|
|
|
free(call);
|
|
|
|
}
|
|
|
|
free(new);
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-06-26 21:28:00 +07:00
|
|
|
|
2009-08-07 12:11:05 +07:00
|
|
|
new->children_hit = 0;
|
2010-07-08 08:41:46 +07:00
|
|
|
new->hit = period;
|
2015-11-09 12:45:40 +07:00
|
|
|
new->children_count = 0;
|
|
|
|
new->count = 1;
|
2013-10-11 12:15:36 +07:00
|
|
|
return new;
|
|
|
|
}
|
|
|
|
|
2016-02-16 21:08:22 +07:00
|
|
|
enum match_result {
|
|
|
|
MATCH_ERROR = -1,
|
|
|
|
MATCH_EQ,
|
|
|
|
MATCH_LT,
|
|
|
|
MATCH_GT,
|
|
|
|
};
|
|
|
|
|
2017-10-10 03:33:00 +07:00
|
|
|
static enum match_result match_chain_strings(const char *left,
|
|
|
|
const char *right)
|
2017-03-19 04:49:28 +07:00
|
|
|
{
|
2017-05-24 13:21:23 +07:00
|
|
|
enum match_result ret = MATCH_EQ;
|
|
|
|
int cmp;
|
|
|
|
|
2017-03-19 04:49:28 +07:00
|
|
|
if (left && right)
|
|
|
|
cmp = strcmp(left, right);
|
|
|
|
else if (!left && right)
|
|
|
|
cmp = 1;
|
|
|
|
else if (left && !right)
|
|
|
|
cmp = -1;
|
|
|
|
else
|
2017-10-10 03:33:00 +07:00
|
|
|
return MATCH_ERROR;
|
2017-03-19 04:49:28 +07:00
|
|
|
|
|
|
|
if (cmp != 0)
|
|
|
|
ret = cmp < 0 ? MATCH_LT : MATCH_GT;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2017-10-20 22:14:47 +07:00
|
|
|
/*
|
|
|
|
* We need to always use relative addresses because we're aggregating
|
|
|
|
* callchains from multiple threads, i.e. different address spaces, so
|
|
|
|
* comparing absolute addresses make no sense as a symbol in a DSO may end up
|
|
|
|
* in a different address when used in a different binary or even the same
|
|
|
|
* binary but with some sort of address randomization technique, thus we need
|
|
|
|
* to compare just relative addresses. -acme
|
|
|
|
*/
|
|
|
|
static enum match_result match_chain_dso_addresses(struct map *left_map, u64 left_ip,
|
|
|
|
struct map *right_map, u64 right_ip)
|
2013-10-11 12:15:36 +07:00
|
|
|
{
|
2017-10-20 22:14:47 +07:00
|
|
|
struct dso *left_dso = left_map ? left_map->dso : NULL;
|
|
|
|
struct dso *right_dso = right_map ? right_map->dso : NULL;
|
2013-10-11 12:15:36 +07:00
|
|
|
|
2017-10-20 22:14:47 +07:00
|
|
|
if (left_dso != right_dso)
|
|
|
|
return left_dso < right_dso ? MATCH_LT : MATCH_GT;
|
2017-10-10 03:33:00 +07:00
|
|
|
|
2017-10-20 22:14:47 +07:00
|
|
|
if (left_ip != right_ip)
|
|
|
|
return left_ip < right_ip ? MATCH_LT : MATCH_GT;
|
2017-03-19 04:49:28 +07:00
|
|
|
|
2017-10-20 22:14:47 +07:00
|
|
|
return MATCH_EQ;
|
|
|
|
}
|
2017-03-19 04:49:28 +07:00
|
|
|
|
2017-10-20 22:14:47 +07:00
|
|
|
static enum match_result match_chain(struct callchain_cursor_node *node,
|
|
|
|
struct callchain_list *cnode)
|
|
|
|
{
|
|
|
|
enum match_result match = MATCH_ERROR;
|
perf callchain: Compare symbol name for inlined frames when matching
The fake symbols we create for inlined frames will represent different
functions but can use the symbol start address. This leads to issues
when different inline branches all lead to the same function.
Before:
~~~~~
$ perf report -s sym -i perf.inlining.data --inline --stdio -g function
...
--38.86%--_start
__libc_start_main
main
|
--37.57%--std::norm<double> (inlined)
std::_Norm_helper<true>::_S_do_it<double> (inlined)
|
--36.36%--std::abs<double> (inlined)
std::__complex_abs (inlined)
|
--12.24%--std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul>::operator() (inlined)
std::__detail::__mod<unsigned long, 2147483647ul, 16807ul, 0ul> (inlined)
std::__detail::_Mod<unsigned long, 2147483647ul, 16807ul, 0ul, true, true>::__calc (inlined)
~~~~~
Note that this backtrace representation is completely bogus.
Complex abs does not call the linear congruential engine! It
is just a side-effect of a longer inlined stack being appended
to a shorter, different inlined stack, both of which originate
in the same function (main).
This patch fixes the issue:
~~~~~
$ perf report -s sym -i perf.inlining.data --inline --stdio -g function
...
--38.86%--_start
__libc_start_main
main
|
|--35.59%--std::uniform_real_distribution<double>::operator()<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul> > (inlined)
| std::uniform_real_distribution<double>::operator()<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul> > (inlined)
| |
| --34.37%--std::__detail::_Adaptor<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul>, double>::operator() (inlined)
| std::generate_canonical<double, 53ul, std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul> > (inlined)
| |
| --12.24%--std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul>::operator() (inlined)
| std::__detail::__mod<unsigned long, 2147483647ul, 16807ul, 0ul> (inlined)
| std::__detail::_Mod<unsigned long, 2147483647ul, 16807ul, 0ul, true, true>::__calc (inlined)
|
--1.99%--std::norm<double> (inlined)
std::_Norm_helper<true>::_S_do_it<double> (inlined)
std::abs<double> (inlined)
std::__complex_abs (inlined)
~~~~~
Signed-off-by: Milian Wolff <milian.wolff@kdab.com>
Reviewed-by: Jiri Olsa <jolsa@redhat.com>
Reviewed-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Cc: Yao Jin <yao.jin@linux.intel.com>
Link: http://lkml.kernel.org/r/20171009203310.17362-10-milian.wolff@kdab.com
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
[ Fix up conflict with c1fbc0cf81f1 ("perf callchain: Compare dsos (as well) for CCKEY_FUNCTION"), remove unneeded hunk ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2017-10-10 03:33:03 +07:00
|
|
|
|
2017-10-20 22:14:47 +07:00
|
|
|
switch (callchain_param.key) {
|
|
|
|
case CCKEY_SRCLINE:
|
|
|
|
match = match_chain_strings(cnode->srcline, node->srcline);
|
|
|
|
if (match != MATCH_ERROR)
|
|
|
|
break;
|
|
|
|
/* otherwise fall-back to symbol-based comparison below */
|
|
|
|
__fallthrough;
|
|
|
|
case CCKEY_FUNCTION:
|
2019-11-04 22:14:32 +07:00
|
|
|
if (node->ms.sym && cnode->ms.sym) {
|
2017-10-20 22:14:47 +07:00
|
|
|
/*
|
|
|
|
* Compare inlined frames based on their symbol name
|
|
|
|
* because different inlined frames will have the same
|
|
|
|
* symbol start. Otherwise do a faster comparison based
|
|
|
|
* on the symbol start address.
|
|
|
|
*/
|
2019-11-04 22:14:32 +07:00
|
|
|
if (cnode->ms.sym->inlined || node->ms.sym->inlined) {
|
2017-10-20 22:14:47 +07:00
|
|
|
match = match_chain_strings(cnode->ms.sym->name,
|
2019-11-04 22:14:32 +07:00
|
|
|
node->ms.sym->name);
|
2017-10-20 22:14:47 +07:00
|
|
|
if (match != MATCH_ERROR)
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
match = match_chain_dso_addresses(cnode->ms.map, cnode->ms.sym->start,
|
2019-11-04 22:14:32 +07:00
|
|
|
node->ms.map, node->ms.sym->start);
|
2017-10-20 22:14:47 +07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* otherwise fall-back to IP-based comparison below */
|
|
|
|
__fallthrough;
|
|
|
|
case CCKEY_ADDRESS:
|
|
|
|
default:
|
2019-11-04 22:14:32 +07:00
|
|
|
match = match_chain_dso_addresses(cnode->ms.map, cnode->ip, node->ms.map, node->ip);
|
2017-10-20 22:14:47 +07:00
|
|
|
break;
|
2016-02-16 21:08:22 +07:00
|
|
|
}
|
|
|
|
|
2017-10-20 22:14:47 +07:00
|
|
|
if (match == MATCH_EQ && node->branch) {
|
|
|
|
cnode->branch_count++;
|
2016-10-31 08:19:51 +07:00
|
|
|
|
2017-10-20 22:14:47 +07:00
|
|
|
if (node->branch_from) {
|
|
|
|
/*
|
|
|
|
* It's "to" of a branch
|
|
|
|
*/
|
|
|
|
cnode->brtype_stat.branch_to = true;
|
2017-07-24 18:09:07 +07:00
|
|
|
|
2017-10-20 22:14:47 +07:00
|
|
|
if (node->branch_flags.predicted)
|
|
|
|
cnode->predicted_count++;
|
2017-07-24 18:09:07 +07:00
|
|
|
|
2017-10-20 22:14:47 +07:00
|
|
|
if (node->branch_flags.abort)
|
|
|
|
cnode->abort_count++;
|
2017-07-24 18:09:07 +07:00
|
|
|
|
2017-10-20 22:14:47 +07:00
|
|
|
branch_type_count(&cnode->brtype_stat,
|
|
|
|
&node->branch_flags,
|
|
|
|
node->branch_from,
|
|
|
|
node->ip);
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* It's "from" of a branch
|
|
|
|
*/
|
|
|
|
cnode->brtype_stat.branch_to = false;
|
|
|
|
cnode->cycles_count += node->branch_flags.cycles;
|
|
|
|
cnode->iter_count += node->nr_loop_iter;
|
|
|
|
cnode->iter_cycles += node->iter_cycles;
|
2019-01-04 13:10:30 +07:00
|
|
|
cnode->from_count++;
|
2016-10-31 08:19:51 +07:00
|
|
|
}
|
|
|
|
}
|
2016-02-16 21:08:22 +07:00
|
|
|
|
2017-10-20 22:14:47 +07:00
|
|
|
return match;
|
2009-06-26 21:28:00 +07:00
|
|
|
}
|
|
|
|
|
2009-07-01 10:35:15 +07:00
|
|
|
/*
|
|
|
|
* Split the parent in two parts (a new child is created) and
|
|
|
|
* give a part of its callchain to the created child.
|
|
|
|
* Then create another child to host the given callchain of new branch
|
|
|
|
*/
|
2016-02-16 21:08:23 +07:00
|
|
|
static int
|
2011-01-14 10:51:58 +07:00
|
|
|
split_add_child(struct callchain_node *parent,
|
|
|
|
struct callchain_cursor *cursor,
|
|
|
|
struct callchain_list *to_split,
|
|
|
|
u64 idx_parents, u64 idx_local, u64 period)
|
2009-06-26 21:28:00 +07:00
|
|
|
{
|
|
|
|
struct callchain_node *new;
|
2009-07-01 10:35:15 +07:00
|
|
|
struct list_head *old_tail;
|
2009-07-01 17:37:06 +07:00
|
|
|
unsigned int idx_total = idx_parents + idx_local;
|
2009-06-26 21:28:00 +07:00
|
|
|
|
|
|
|
/* split */
|
2009-07-01 10:35:15 +07:00
|
|
|
new = create_child(parent, true);
|
2016-02-16 21:08:23 +07:00
|
|
|
if (new == NULL)
|
|
|
|
return -1;
|
2009-07-01 10:35:15 +07:00
|
|
|
|
|
|
|
/* split the callchain and move a part to the new child */
|
|
|
|
old_tail = parent->val.prev;
|
|
|
|
list_del_range(&to_split->list, old_tail);
|
|
|
|
new->val.next = &to_split->list;
|
|
|
|
new->val.prev = old_tail;
|
|
|
|
to_split->list.prev = &new->val;
|
|
|
|
old_tail->next = &new->val;
|
2009-06-26 21:28:00 +07:00
|
|
|
|
2009-07-01 10:35:15 +07:00
|
|
|
/* split the hits */
|
|
|
|
new->hit = parent->hit;
|
2009-08-07 12:11:05 +07:00
|
|
|
new->children_hit = parent->children_hit;
|
2011-01-14 10:51:59 +07:00
|
|
|
parent->children_hit = callchain_cumul_hits(new);
|
2009-07-01 10:35:15 +07:00
|
|
|
new->val_nr = parent->val_nr - idx_local;
|
|
|
|
parent->val_nr = idx_local;
|
2015-11-09 12:45:40 +07:00
|
|
|
new->count = parent->count;
|
|
|
|
new->children_count = parent->children_count;
|
|
|
|
parent->children_count = callchain_cumul_counts(new);
|
2009-07-01 10:35:15 +07:00
|
|
|
|
|
|
|
/* create a new child for the new branch if any */
|
2011-01-14 10:51:58 +07:00
|
|
|
if (idx_total < cursor->nr) {
|
2013-10-11 12:15:36 +07:00
|
|
|
struct callchain_node *first;
|
|
|
|
struct callchain_list *cnode;
|
|
|
|
struct callchain_cursor_node *node;
|
|
|
|
struct rb_node *p, **pp;
|
|
|
|
|
2009-07-01 10:35:15 +07:00
|
|
|
parent->hit = 0;
|
2010-07-08 08:41:46 +07:00
|
|
|
parent->children_hit += period;
|
2015-11-09 12:45:40 +07:00
|
|
|
parent->count = 0;
|
|
|
|
parent->children_count += 1;
|
2013-10-11 12:15:36 +07:00
|
|
|
|
|
|
|
node = callchain_cursor_current(cursor);
|
|
|
|
new = add_child(parent, cursor, period);
|
2016-02-16 21:08:20 +07:00
|
|
|
if (new == NULL)
|
2016-02-16 21:08:23 +07:00
|
|
|
return -1;
|
2013-10-11 12:15:36 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This is second child since we moved parent's children
|
|
|
|
* to new (first) child above.
|
|
|
|
*/
|
|
|
|
p = parent->rb_root_in.rb_node;
|
|
|
|
first = rb_entry(p, struct callchain_node, rb_node_in);
|
|
|
|
cnode = list_first_entry(&first->val, struct callchain_list,
|
|
|
|
list);
|
|
|
|
|
2016-02-16 21:08:22 +07:00
|
|
|
if (match_chain(node, cnode) == MATCH_LT)
|
2013-10-11 12:15:36 +07:00
|
|
|
pp = &p->rb_left;
|
|
|
|
else
|
|
|
|
pp = &p->rb_right;
|
|
|
|
|
|
|
|
rb_link_node(&new->rb_node_in, p, pp);
|
|
|
|
rb_insert_color(&new->rb_node_in, &parent->rb_root_in);
|
2009-07-01 10:35:15 +07:00
|
|
|
} else {
|
2010-07-08 08:41:46 +07:00
|
|
|
parent->hit = period;
|
2015-11-09 12:45:40 +07:00
|
|
|
parent->count = 1;
|
2009-07-01 10:35:15 +07:00
|
|
|
}
|
2016-02-16 21:08:23 +07:00
|
|
|
return 0;
|
2009-06-26 21:28:00 +07:00
|
|
|
}
|
|
|
|
|
2016-02-16 21:08:22 +07:00
|
|
|
static enum match_result
|
2011-01-14 10:51:58 +07:00
|
|
|
append_chain(struct callchain_node *root,
|
|
|
|
struct callchain_cursor *cursor,
|
|
|
|
u64 period);
|
2009-06-26 21:28:00 +07:00
|
|
|
|
2016-02-16 21:08:24 +07:00
|
|
|
static int
|
2011-01-14 10:51:58 +07:00
|
|
|
append_chain_children(struct callchain_node *root,
|
|
|
|
struct callchain_cursor *cursor,
|
|
|
|
u64 period)
|
2009-06-26 21:28:00 +07:00
|
|
|
{
|
|
|
|
struct callchain_node *rnode;
|
2013-10-11 12:15:36 +07:00
|
|
|
struct callchain_cursor_node *node;
|
|
|
|
struct rb_node **p = &root->rb_root_in.rb_node;
|
|
|
|
struct rb_node *parent = NULL;
|
|
|
|
|
|
|
|
node = callchain_cursor_current(cursor);
|
|
|
|
if (!node)
|
2016-02-16 21:08:24 +07:00
|
|
|
return -1;
|
2009-06-26 21:28:00 +07:00
|
|
|
|
|
|
|
/* lookup in childrens */
|
2013-10-11 12:15:36 +07:00
|
|
|
while (*p) {
|
2016-02-16 21:08:22 +07:00
|
|
|
enum match_result ret;
|
2009-07-01 17:37:06 +07:00
|
|
|
|
2013-10-11 12:15:36 +07:00
|
|
|
parent = *p;
|
|
|
|
rnode = rb_entry(parent, struct callchain_node, rb_node_in);
|
|
|
|
|
2014-01-14 22:37:15 +07:00
|
|
|
/* If at least first entry matches, rely to children */
|
|
|
|
ret = append_chain(rnode, cursor, period);
|
2016-02-16 21:08:22 +07:00
|
|
|
if (ret == MATCH_EQ)
|
2009-08-07 12:11:05 +07:00
|
|
|
goto inc_children_hit;
|
2016-02-16 21:08:24 +07:00
|
|
|
if (ret == MATCH_ERROR)
|
|
|
|
return -1;
|
2013-10-11 12:15:36 +07:00
|
|
|
|
2016-02-16 21:08:22 +07:00
|
|
|
if (ret == MATCH_LT)
|
2013-10-11 12:15:36 +07:00
|
|
|
p = &parent->rb_left;
|
|
|
|
else
|
|
|
|
p = &parent->rb_right;
|
2009-06-26 21:28:00 +07:00
|
|
|
}
|
2009-07-01 10:35:15 +07:00
|
|
|
/* nothing in children, add to the current node */
|
2013-10-11 12:15:36 +07:00
|
|
|
rnode = add_child(root, cursor, period);
|
2016-02-16 21:08:20 +07:00
|
|
|
if (rnode == NULL)
|
2016-02-16 21:08:24 +07:00
|
|
|
return -1;
|
2016-02-16 21:08:20 +07:00
|
|
|
|
2013-10-11 12:15:36 +07:00
|
|
|
rb_link_node(&rnode->rb_node_in, parent, p);
|
|
|
|
rb_insert_color(&rnode->rb_node_in, &root->rb_root_in);
|
2009-07-05 12:39:20 +07:00
|
|
|
|
2009-08-07 12:11:05 +07:00
|
|
|
inc_children_hit:
|
2010-07-08 08:41:46 +07:00
|
|
|
root->children_hit += period;
|
2015-11-09 12:45:40 +07:00
|
|
|
root->children_count++;
|
2016-02-16 21:08:24 +07:00
|
|
|
return 0;
|
2009-06-26 21:28:00 +07:00
|
|
|
}
|
|
|
|
|
2016-02-16 21:08:22 +07:00
|
|
|
static enum match_result
|
2011-01-14 10:51:58 +07:00
|
|
|
append_chain(struct callchain_node *root,
|
|
|
|
struct callchain_cursor *cursor,
|
|
|
|
u64 period)
|
2009-06-26 21:28:00 +07:00
|
|
|
{
|
|
|
|
struct callchain_list *cnode;
|
2011-01-14 10:51:58 +07:00
|
|
|
u64 start = cursor->pos;
|
2009-06-26 21:28:00 +07:00
|
|
|
bool found = false;
|
2011-01-14 10:51:58 +07:00
|
|
|
u64 matches;
|
2016-02-16 21:08:22 +07:00
|
|
|
enum match_result cmp = MATCH_ERROR;
|
2009-06-26 21:28:00 +07:00
|
|
|
|
2009-07-01 10:35:15 +07:00
|
|
|
/*
|
|
|
|
* Lookup in the current node
|
|
|
|
* If we have a symbol, then compare the start to match
|
2013-07-19 05:33:57 +07:00
|
|
|
* anywhere inside a function, unless function
|
|
|
|
* mode is disabled.
|
2009-07-01 10:35:15 +07:00
|
|
|
*/
|
2009-06-26 21:28:00 +07:00
|
|
|
list_for_each_entry(cnode, &root->val, list) {
|
2011-01-14 10:51:58 +07:00
|
|
|
struct callchain_cursor_node *node;
|
2010-03-22 23:09:33 +07:00
|
|
|
|
2011-01-14 10:51:58 +07:00
|
|
|
node = callchain_cursor_current(cursor);
|
|
|
|
if (!node)
|
2009-07-01 10:35:15 +07:00
|
|
|
break;
|
2010-03-22 23:09:33 +07:00
|
|
|
|
2014-01-14 22:37:15 +07:00
|
|
|
cmp = match_chain(node, cnode);
|
2016-02-16 21:08:22 +07:00
|
|
|
if (cmp != MATCH_EQ)
|
2009-06-26 21:28:00 +07:00
|
|
|
break;
|
2010-03-22 23:09:33 +07:00
|
|
|
|
2013-10-11 12:15:36 +07:00
|
|
|
found = true;
|
2011-01-14 10:51:58 +07:00
|
|
|
|
|
|
|
callchain_cursor_advance(cursor);
|
2009-06-26 21:28:00 +07:00
|
|
|
}
|
|
|
|
|
2013-10-11 12:15:36 +07:00
|
|
|
/* matches not, relay no the parent */
|
2011-01-14 10:51:58 +07:00
|
|
|
if (!found) {
|
2016-02-16 21:08:22 +07:00
|
|
|
WARN_ONCE(cmp == MATCH_ERROR, "Chain comparison error\n");
|
2014-01-14 22:37:15 +07:00
|
|
|
return cmp;
|
2011-01-14 10:51:58 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
matches = cursor->pos - start;
|
2009-06-26 21:28:00 +07:00
|
|
|
|
|
|
|
/* we match only a part of the node. Split it and add the new chain */
|
2011-01-14 10:51:58 +07:00
|
|
|
if (matches < root->val_nr) {
|
2016-02-16 21:08:23 +07:00
|
|
|
if (split_add_child(root, cursor, cnode, start, matches,
|
|
|
|
period) < 0)
|
|
|
|
return MATCH_ERROR;
|
|
|
|
|
2016-02-16 21:08:22 +07:00
|
|
|
return MATCH_EQ;
|
2009-06-26 21:28:00 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* we match 100% of the path, increment the hit */
|
2011-01-14 10:51:58 +07:00
|
|
|
if (matches == root->val_nr && cursor->pos == cursor->nr) {
|
2010-07-08 08:41:46 +07:00
|
|
|
root->hit += period;
|
2015-11-09 12:45:40 +07:00
|
|
|
root->count++;
|
2016-02-16 21:08:22 +07:00
|
|
|
return MATCH_EQ;
|
2009-06-26 21:28:00 +07:00
|
|
|
}
|
|
|
|
|
2009-07-01 10:35:15 +07:00
|
|
|
/* We match the node and still have a part remaining */
|
2016-02-16 21:08:24 +07:00
|
|
|
if (append_chain_children(root, cursor, period) < 0)
|
|
|
|
return MATCH_ERROR;
|
2009-07-01 10:35:15 +07:00
|
|
|
|
2016-02-16 21:08:22 +07:00
|
|
|
return MATCH_EQ;
|
2009-06-26 21:28:00 +07:00
|
|
|
}
|
|
|
|
|
2011-01-14 10:51:58 +07:00
|
|
|
int callchain_append(struct callchain_root *root,
|
|
|
|
struct callchain_cursor *cursor,
|
|
|
|
u64 period)
|
2009-06-26 21:28:00 +07:00
|
|
|
{
|
2011-01-14 10:51:58 +07:00
|
|
|
if (!cursor->nr)
|
2010-03-22 23:09:33 +07:00
|
|
|
return 0;
|
|
|
|
|
2011-01-14 10:51:58 +07:00
|
|
|
callchain_cursor_commit(cursor);
|
2010-03-22 23:09:33 +07:00
|
|
|
|
2016-02-16 21:08:24 +07:00
|
|
|
if (append_chain_children(&root->node, cursor, period) < 0)
|
|
|
|
return -1;
|
2010-08-23 01:05:22 +07:00
|
|
|
|
2011-01-14 10:51:58 +07:00
|
|
|
if (cursor->nr > root->max_depth)
|
|
|
|
root->max_depth = cursor->nr;
|
2010-03-22 23:09:33 +07:00
|
|
|
|
|
|
|
return 0;
|
2009-06-26 21:28:00 +07:00
|
|
|
}
|
perf: Support for callchains merge
If we sort the histograms by comm, which is the default,
we need to merge some of them, typically different thread
histograms of a same process, or just same comm. But during
this merge, we forgot to merge callchains.
So imagine we have three threads (tids: 1000, 1001, 1002) that
belong to comm "foo".
tid 1000 got 100 events
tid 1001 got 10 events
tid 1002 got 3 events
Once we merge these histograms to get a per comm result, we'll
finally get:
"foo" got 113 events
The problem is if we merge 1000 and 1001 histograms into 1002, then
the end merge result, wrt callchains, will be only callchains that
belong to 1002.
This is because we haven't handled callchains in the merge. Only those
from one of the threads inside a common comm survive.
It means during this merge, we can lose a lot of callchains.
Fix this by implementing callchains merge and apply it on histograms
that collapse.
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
2010-08-23 02:10:35 +07:00
|
|
|
|
|
|
|
static int
|
2011-01-14 10:51:58 +07:00
|
|
|
merge_chain_branch(struct callchain_cursor *cursor,
|
|
|
|
struct callchain_node *dst, struct callchain_node *src)
|
perf: Support for callchains merge
If we sort the histograms by comm, which is the default,
we need to merge some of them, typically different thread
histograms of a same process, or just same comm. But during
this merge, we forgot to merge callchains.
So imagine we have three threads (tids: 1000, 1001, 1002) that
belong to comm "foo".
tid 1000 got 100 events
tid 1001 got 10 events
tid 1002 got 3 events
Once we merge these histograms to get a per comm result, we'll
finally get:
"foo" got 113 events
The problem is if we merge 1000 and 1001 histograms into 1002, then
the end merge result, wrt callchains, will be only callchains that
belong to 1002.
This is because we haven't handled callchains in the merge. Only those
from one of the threads inside a common comm survive.
It means during this merge, we can lose a lot of callchains.
Fix this by implementing callchains merge and apply it on histograms
that collapse.
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
2010-08-23 02:10:35 +07:00
|
|
|
{
|
2011-01-14 10:51:58 +07:00
|
|
|
struct callchain_cursor_node **old_last = cursor->last;
|
2013-10-11 12:15:36 +07:00
|
|
|
struct callchain_node *child;
|
perf: Support for callchains merge
If we sort the histograms by comm, which is the default,
we need to merge some of them, typically different thread
histograms of a same process, or just same comm. But during
this merge, we forgot to merge callchains.
So imagine we have three threads (tids: 1000, 1001, 1002) that
belong to comm "foo".
tid 1000 got 100 events
tid 1001 got 10 events
tid 1002 got 3 events
Once we merge these histograms to get a per comm result, we'll
finally get:
"foo" got 113 events
The problem is if we merge 1000 and 1001 histograms into 1002, then
the end merge result, wrt callchains, will be only callchains that
belong to 1002.
This is because we haven't handled callchains in the merge. Only those
from one of the threads inside a common comm survive.
It means during this merge, we can lose a lot of callchains.
Fix this by implementing callchains merge and apply it on histograms
that collapse.
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
2010-08-23 02:10:35 +07:00
|
|
|
struct callchain_list *list, *next_list;
|
2013-10-11 12:15:36 +07:00
|
|
|
struct rb_node *n;
|
2011-01-14 10:51:58 +07:00
|
|
|
int old_pos = cursor->nr;
|
perf: Support for callchains merge
If we sort the histograms by comm, which is the default,
we need to merge some of them, typically different thread
histograms of a same process, or just same comm. But during
this merge, we forgot to merge callchains.
So imagine we have three threads (tids: 1000, 1001, 1002) that
belong to comm "foo".
tid 1000 got 100 events
tid 1001 got 10 events
tid 1002 got 3 events
Once we merge these histograms to get a per comm result, we'll
finally get:
"foo" got 113 events
The problem is if we merge 1000 and 1001 histograms into 1002, then
the end merge result, wrt callchains, will be only callchains that
belong to 1002.
This is because we haven't handled callchains in the merge. Only those
from one of the threads inside a common comm survive.
It means during this merge, we can lose a lot of callchains.
Fix this by implementing callchains merge and apply it on histograms
that collapse.
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
2010-08-23 02:10:35 +07:00
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
list_for_each_entry_safe(list, next_list, &src->val, list) {
|
2019-11-04 22:14:32 +07:00
|
|
|
callchain_cursor_append(cursor, list->ip, &list->ms,
|
2017-10-10 03:32:56 +07:00
|
|
|
false, NULL, 0, 0, 0, list->srcline);
|
2019-07-04 22:13:46 +07:00
|
|
|
list_del_init(&list->list);
|
2017-01-06 13:23:31 +07:00
|
|
|
map__zput(list->ms.map);
|
perf: Support for callchains merge
If we sort the histograms by comm, which is the default,
we need to merge some of them, typically different thread
histograms of a same process, or just same comm. But during
this merge, we forgot to merge callchains.
So imagine we have three threads (tids: 1000, 1001, 1002) that
belong to comm "foo".
tid 1000 got 100 events
tid 1001 got 10 events
tid 1002 got 3 events
Once we merge these histograms to get a per comm result, we'll
finally get:
"foo" got 113 events
The problem is if we merge 1000 and 1001 histograms into 1002, then
the end merge result, wrt callchains, will be only callchains that
belong to 1002.
This is because we haven't handled callchains in the merge. Only those
from one of the threads inside a common comm survive.
It means during this merge, we can lose a lot of callchains.
Fix this by implementing callchains merge and apply it on histograms
that collapse.
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
2010-08-23 02:10:35 +07:00
|
|
|
free(list);
|
|
|
|
}
|
|
|
|
|
2011-01-14 10:51:58 +07:00
|
|
|
if (src->hit) {
|
|
|
|
callchain_cursor_commit(cursor);
|
2016-02-16 21:08:24 +07:00
|
|
|
if (append_chain_children(dst, cursor, src->hit) < 0)
|
|
|
|
return -1;
|
2011-01-14 10:51:58 +07:00
|
|
|
}
|
perf: Support for callchains merge
If we sort the histograms by comm, which is the default,
we need to merge some of them, typically different thread
histograms of a same process, or just same comm. But during
this merge, we forgot to merge callchains.
So imagine we have three threads (tids: 1000, 1001, 1002) that
belong to comm "foo".
tid 1000 got 100 events
tid 1001 got 10 events
tid 1002 got 3 events
Once we merge these histograms to get a per comm result, we'll
finally get:
"foo" got 113 events
The problem is if we merge 1000 and 1001 histograms into 1002, then
the end merge result, wrt callchains, will be only callchains that
belong to 1002.
This is because we haven't handled callchains in the merge. Only those
from one of the threads inside a common comm survive.
It means during this merge, we can lose a lot of callchains.
Fix this by implementing callchains merge and apply it on histograms
that collapse.
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
2010-08-23 02:10:35 +07:00
|
|
|
|
2013-10-11 12:15:36 +07:00
|
|
|
n = rb_first(&src->rb_root_in);
|
|
|
|
while (n) {
|
|
|
|
child = container_of(n, struct callchain_node, rb_node_in);
|
|
|
|
n = rb_next(n);
|
|
|
|
rb_erase(&child->rb_node_in, &src->rb_root_in);
|
|
|
|
|
2011-01-14 10:51:58 +07:00
|
|
|
err = merge_chain_branch(cursor, dst, child);
|
perf: Support for callchains merge
If we sort the histograms by comm, which is the default,
we need to merge some of them, typically different thread
histograms of a same process, or just same comm. But during
this merge, we forgot to merge callchains.
So imagine we have three threads (tids: 1000, 1001, 1002) that
belong to comm "foo".
tid 1000 got 100 events
tid 1001 got 10 events
tid 1002 got 3 events
Once we merge these histograms to get a per comm result, we'll
finally get:
"foo" got 113 events
The problem is if we merge 1000 and 1001 histograms into 1002, then
the end merge result, wrt callchains, will be only callchains that
belong to 1002.
This is because we haven't handled callchains in the merge. Only those
from one of the threads inside a common comm survive.
It means during this merge, we can lose a lot of callchains.
Fix this by implementing callchains merge and apply it on histograms
that collapse.
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
2010-08-23 02:10:35 +07:00
|
|
|
if (err)
|
|
|
|
break;
|
|
|
|
|
|
|
|
free(child);
|
|
|
|
}
|
|
|
|
|
2011-01-14 10:51:58 +07:00
|
|
|
cursor->nr = old_pos;
|
|
|
|
cursor->last = old_last;
|
perf: Support for callchains merge
If we sort the histograms by comm, which is the default,
we need to merge some of them, typically different thread
histograms of a same process, or just same comm. But during
this merge, we forgot to merge callchains.
So imagine we have three threads (tids: 1000, 1001, 1002) that
belong to comm "foo".
tid 1000 got 100 events
tid 1001 got 10 events
tid 1002 got 3 events
Once we merge these histograms to get a per comm result, we'll
finally get:
"foo" got 113 events
The problem is if we merge 1000 and 1001 histograms into 1002, then
the end merge result, wrt callchains, will be only callchains that
belong to 1002.
This is because we haven't handled callchains in the merge. Only those
from one of the threads inside a common comm survive.
It means during this merge, we can lose a lot of callchains.
Fix this by implementing callchains merge and apply it on histograms
that collapse.
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
2010-08-23 02:10:35 +07:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2011-01-14 10:51:58 +07:00
|
|
|
int callchain_merge(struct callchain_cursor *cursor,
|
|
|
|
struct callchain_root *dst, struct callchain_root *src)
|
|
|
|
{
|
|
|
|
return merge_chain_branch(cursor, &dst->node, &src->node);
|
|
|
|
}
|
|
|
|
|
|
|
|
int callchain_cursor_append(struct callchain_cursor *cursor,
|
2019-11-04 22:14:32 +07:00
|
|
|
u64 ip, struct map_symbol *ms,
|
perf report: Add branch flag to callchain cursor node
Since the branch ip has been added to call stack for easier browsing,
this patch adds more branch information. For example, add a flag to
indicate if this ip is a branch, and also add with the branch flag.
Then we can know if the cursor node represents a branch and know what
the branch flag it has.
The branch history code has a loop detection pass that removes loops. It
would be nice for knowing how many loops were removed then in next
steps, we can compute out the average number of iterations.
For example:
Before remove_loops(),
entry0: from = 0x100, to = 0x200
entry1: from = 0x300, to = 0x250
entry2: from = 0x300, to = 0x250
entry3: from = 0x300, to = 0x250
entry4: from = 0x700, to = 0x800
After remove_loops()
entry0: from = 0x100, to = 0x200
entry1: from = 0x300, to = 0x250
entry2: from = 0x700, to = 0x800
The original entry2 and entry3 are removed. So the number of iterations
(from = 0x300, to = 0x250) is equal to removed number + 1 (2 + 1).
iterations = removed number + 1;
average iteractions = Sum(iteractions) / number of samples
This formula ignores other cases, for example, iterations cross multiple
buffers and one buffer contains 2+ loops. Because in practice, it's good
enough.
Signed-off-by: Yao Jin <yao.jin@linux.intel.com>
Acked-by: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Linux-kernel@vger.kernel.org
Cc: Yao Jin <yao.jin@linux.intel.com>
Link: http://lkml.kernel.org/n/1477876794-30749-2-git-send-email-yao.jin@linux.intel.com
[ Renamed 'iter' to 'nr_loop_iter' for clarity ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2016-10-31 08:19:49 +07:00
|
|
|
bool branch, struct branch_flags *flags,
|
2017-10-10 03:32:56 +07:00
|
|
|
int nr_loop_iter, u64 iter_cycles, u64 branch_from,
|
|
|
|
const char *srcline)
|
perf: Support for callchains merge
If we sort the histograms by comm, which is the default,
we need to merge some of them, typically different thread
histograms of a same process, or just same comm. But during
this merge, we forgot to merge callchains.
So imagine we have three threads (tids: 1000, 1001, 1002) that
belong to comm "foo".
tid 1000 got 100 events
tid 1001 got 10 events
tid 1002 got 3 events
Once we merge these histograms to get a per comm result, we'll
finally get:
"foo" got 113 events
The problem is if we merge 1000 and 1001 histograms into 1002, then
the end merge result, wrt callchains, will be only callchains that
belong to 1002.
This is because we haven't handled callchains in the merge. Only those
from one of the threads inside a common comm survive.
It means during this merge, we can lose a lot of callchains.
Fix this by implementing callchains merge and apply it on histograms
that collapse.
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
2010-08-23 02:10:35 +07:00
|
|
|
{
|
2011-01-14 10:51:58 +07:00
|
|
|
struct callchain_cursor_node *node = *cursor->last;
|
perf: Support for callchains merge
If we sort the histograms by comm, which is the default,
we need to merge some of them, typically different thread
histograms of a same process, or just same comm. But during
this merge, we forgot to merge callchains.
So imagine we have three threads (tids: 1000, 1001, 1002) that
belong to comm "foo".
tid 1000 got 100 events
tid 1001 got 10 events
tid 1002 got 3 events
Once we merge these histograms to get a per comm result, we'll
finally get:
"foo" got 113 events
The problem is if we merge 1000 and 1001 histograms into 1002, then
the end merge result, wrt callchains, will be only callchains that
belong to 1002.
This is because we haven't handled callchains in the merge. Only those
from one of the threads inside a common comm survive.
It means during this merge, we can lose a lot of callchains.
Fix this by implementing callchains merge and apply it on histograms
that collapse.
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
2010-08-23 02:10:35 +07:00
|
|
|
|
2011-01-14 10:51:58 +07:00
|
|
|
if (!node) {
|
2013-01-31 08:05:49 +07:00
|
|
|
node = calloc(1, sizeof(*node));
|
2011-01-14 10:51:58 +07:00
|
|
|
if (!node)
|
|
|
|
return -ENOMEM;
|
perf: Support for callchains merge
If we sort the histograms by comm, which is the default,
we need to merge some of them, typically different thread
histograms of a same process, or just same comm. But during
this merge, we forgot to merge callchains.
So imagine we have three threads (tids: 1000, 1001, 1002) that
belong to comm "foo".
tid 1000 got 100 events
tid 1001 got 10 events
tid 1002 got 3 events
Once we merge these histograms to get a per comm result, we'll
finally get:
"foo" got 113 events
The problem is if we merge 1000 and 1001 histograms into 1002, then
the end merge result, wrt callchains, will be only callchains that
belong to 1002.
This is because we haven't handled callchains in the merge. Only those
from one of the threads inside a common comm survive.
It means during this merge, we can lose a lot of callchains.
Fix this by implementing callchains merge and apply it on histograms
that collapse.
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
2010-08-23 02:10:35 +07:00
|
|
|
|
2011-01-14 10:51:58 +07:00
|
|
|
*cursor->last = node;
|
|
|
|
}
|
perf: Support for callchains merge
If we sort the histograms by comm, which is the default,
we need to merge some of them, typically different thread
histograms of a same process, or just same comm. But during
this merge, we forgot to merge callchains.
So imagine we have three threads (tids: 1000, 1001, 1002) that
belong to comm "foo".
tid 1000 got 100 events
tid 1001 got 10 events
tid 1002 got 3 events
Once we merge these histograms to get a per comm result, we'll
finally get:
"foo" got 113 events
The problem is if we merge 1000 and 1001 histograms into 1002, then
the end merge result, wrt callchains, will be only callchains that
belong to 1002.
This is because we haven't handled callchains in the merge. Only those
from one of the threads inside a common comm survive.
It means during this merge, we can lose a lot of callchains.
Fix this by implementing callchains merge and apply it on histograms
that collapse.
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
2010-08-23 02:10:35 +07:00
|
|
|
|
2011-01-14 10:51:58 +07:00
|
|
|
node->ip = ip;
|
2019-11-04 22:14:32 +07:00
|
|
|
map__zput(node->ms.map);
|
|
|
|
node->ms = *ms;
|
|
|
|
map__get(node->ms.map);
|
perf report: Add branch flag to callchain cursor node
Since the branch ip has been added to call stack for easier browsing,
this patch adds more branch information. For example, add a flag to
indicate if this ip is a branch, and also add with the branch flag.
Then we can know if the cursor node represents a branch and know what
the branch flag it has.
The branch history code has a loop detection pass that removes loops. It
would be nice for knowing how many loops were removed then in next
steps, we can compute out the average number of iterations.
For example:
Before remove_loops(),
entry0: from = 0x100, to = 0x200
entry1: from = 0x300, to = 0x250
entry2: from = 0x300, to = 0x250
entry3: from = 0x300, to = 0x250
entry4: from = 0x700, to = 0x800
After remove_loops()
entry0: from = 0x100, to = 0x200
entry1: from = 0x300, to = 0x250
entry2: from = 0x700, to = 0x800
The original entry2 and entry3 are removed. So the number of iterations
(from = 0x300, to = 0x250) is equal to removed number + 1 (2 + 1).
iterations = removed number + 1;
average iteractions = Sum(iteractions) / number of samples
This formula ignores other cases, for example, iterations cross multiple
buffers and one buffer contains 2+ loops. Because in practice, it's good
enough.
Signed-off-by: Yao Jin <yao.jin@linux.intel.com>
Acked-by: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Linux-kernel@vger.kernel.org
Cc: Yao Jin <yao.jin@linux.intel.com>
Link: http://lkml.kernel.org/n/1477876794-30749-2-git-send-email-yao.jin@linux.intel.com
[ Renamed 'iter' to 'nr_loop_iter' for clarity ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2016-10-31 08:19:49 +07:00
|
|
|
node->branch = branch;
|
|
|
|
node->nr_loop_iter = nr_loop_iter;
|
2017-08-07 20:05:15 +07:00
|
|
|
node->iter_cycles = iter_cycles;
|
2017-10-10 03:32:56 +07:00
|
|
|
node->srcline = srcline;
|
perf report: Add branch flag to callchain cursor node
Since the branch ip has been added to call stack for easier browsing,
this patch adds more branch information. For example, add a flag to
indicate if this ip is a branch, and also add with the branch flag.
Then we can know if the cursor node represents a branch and know what
the branch flag it has.
The branch history code has a loop detection pass that removes loops. It
would be nice for knowing how many loops were removed then in next
steps, we can compute out the average number of iterations.
For example:
Before remove_loops(),
entry0: from = 0x100, to = 0x200
entry1: from = 0x300, to = 0x250
entry2: from = 0x300, to = 0x250
entry3: from = 0x300, to = 0x250
entry4: from = 0x700, to = 0x800
After remove_loops()
entry0: from = 0x100, to = 0x200
entry1: from = 0x300, to = 0x250
entry2: from = 0x700, to = 0x800
The original entry2 and entry3 are removed. So the number of iterations
(from = 0x300, to = 0x250) is equal to removed number + 1 (2 + 1).
iterations = removed number + 1;
average iteractions = Sum(iteractions) / number of samples
This formula ignores other cases, for example, iterations cross multiple
buffers and one buffer contains 2+ loops. Because in practice, it's good
enough.
Signed-off-by: Yao Jin <yao.jin@linux.intel.com>
Acked-by: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Linux-kernel@vger.kernel.org
Cc: Yao Jin <yao.jin@linux.intel.com>
Link: http://lkml.kernel.org/n/1477876794-30749-2-git-send-email-yao.jin@linux.intel.com
[ Renamed 'iter' to 'nr_loop_iter' for clarity ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2016-10-31 08:19:49 +07:00
|
|
|
|
|
|
|
if (flags)
|
|
|
|
memcpy(&node->branch_flags, flags,
|
|
|
|
sizeof(struct branch_flags));
|
perf: Support for callchains merge
If we sort the histograms by comm, which is the default,
we need to merge some of them, typically different thread
histograms of a same process, or just same comm. But during
this merge, we forgot to merge callchains.
So imagine we have three threads (tids: 1000, 1001, 1002) that
belong to comm "foo".
tid 1000 got 100 events
tid 1001 got 10 events
tid 1002 got 3 events
Once we merge these histograms to get a per comm result, we'll
finally get:
"foo" got 113 events
The problem is if we merge 1000 and 1001 histograms into 1002, then
the end merge result, wrt callchains, will be only callchains that
belong to 1002.
This is because we haven't handled callchains in the merge. Only those
from one of the threads inside a common comm survive.
It means during this merge, we can lose a lot of callchains.
Fix this by implementing callchains merge and apply it on histograms
that collapse.
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
2010-08-23 02:10:35 +07:00
|
|
|
|
2017-07-18 19:13:15 +07:00
|
|
|
node->branch_from = branch_from;
|
2011-01-14 10:51:58 +07:00
|
|
|
cursor->nr++;
|
perf: Support for callchains merge
If we sort the histograms by comm, which is the default,
we need to merge some of them, typically different thread
histograms of a same process, or just same comm. But during
this merge, we forgot to merge callchains.
So imagine we have three threads (tids: 1000, 1001, 1002) that
belong to comm "foo".
tid 1000 got 100 events
tid 1001 got 10 events
tid 1002 got 3 events
Once we merge these histograms to get a per comm result, we'll
finally get:
"foo" got 113 events
The problem is if we merge 1000 and 1001 histograms into 1002, then
the end merge result, wrt callchains, will be only callchains that
belong to 1002.
This is because we haven't handled callchains in the merge. Only those
from one of the threads inside a common comm survive.
It means during this merge, we can lose a lot of callchains.
Fix this by implementing callchains merge and apply it on histograms
that collapse.
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
2010-08-23 02:10:35 +07:00
|
|
|
|
2011-01-14 10:51:58 +07:00
|
|
|
cursor->last = &node->next;
|
|
|
|
|
|
|
|
return 0;
|
perf: Support for callchains merge
If we sort the histograms by comm, which is the default,
we need to merge some of them, typically different thread
histograms of a same process, or just same comm. But during
this merge, we forgot to merge callchains.
So imagine we have three threads (tids: 1000, 1001, 1002) that
belong to comm "foo".
tid 1000 got 100 events
tid 1001 got 10 events
tid 1002 got 3 events
Once we merge these histograms to get a per comm result, we'll
finally get:
"foo" got 113 events
The problem is if we merge 1000 and 1001 histograms into 1002, then
the end merge result, wrt callchains, will be only callchains that
belong to 1002.
This is because we haven't handled callchains in the merge. Only those
from one of the threads inside a common comm survive.
It means during this merge, we can lose a lot of callchains.
Fix this by implementing callchains merge and apply it on histograms
that collapse.
Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
2010-08-23 02:10:35 +07:00
|
|
|
}
|
2014-01-14 12:25:35 +07:00
|
|
|
|
2016-04-15 00:48:07 +07:00
|
|
|
int sample__resolve_callchain(struct perf_sample *sample,
|
|
|
|
struct callchain_cursor *cursor, struct symbol **parent,
|
2019-07-21 18:23:51 +07:00
|
|
|
struct evsel *evsel, struct addr_location *al,
|
2014-01-14 12:25:35 +07:00
|
|
|
int max_stack)
|
|
|
|
{
|
perf report: Make --branch-history work without callgraphs(-g) option in perf record
perf record -b -g <command>
perf report --branch-history
This merges the LBRs with the callgraphs.
However it would be nice if it also works without callgraphs (-g) set in
perf record, so that only the LBRs are displayed. But currently perf
report errors in this case. For example,
perf record -b <command>
perf report --branch-history
Error:
Selected -g or --branch-history but no callchain data. Did
you call 'perf record' without -g?
This patch displays the LBRs only even if callgraphs(-g) is not enabled
in perf record.
Change log:
v2: According to Milian Wolff's comment, change the obsolete error
message. Now the error message is:
┌─Error:─────────────────────────────────────┐
│Selected -g or --branch-history. │
│But no callchain or branch data. │
│Did you call 'perf record' without -g or -b?│
│ │
│ │
│Press any key... │
└────────────────────────────────────────────┘
When passing the last parameter to hists__fprintf,
changes "|" to "||".
hists__fprintf(hists, !quiet, 0, 0, rep->min_percent, stdout,
symbol_conf.use_callchain || symbol_conf.show_branchflag_count);
Signed-off-by: Yao Jin <yao.jin@linux.intel.com>
Reviewed-by: Andi Kleen <ak@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1494240182-28899-1-git-send-email-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2017-05-08 17:43:02 +07:00
|
|
|
if (sample->callchain == NULL && !symbol_conf.show_branchflag_count)
|
2014-01-14 12:25:35 +07:00
|
|
|
return 0;
|
|
|
|
|
2012-09-11 12:13:04 +07:00
|
|
|
if (symbol_conf.use_callchain || symbol_conf.cumulate_callchain ||
|
perf report: Make --branch-history work without callgraphs(-g) option in perf record
perf record -b -g <command>
perf report --branch-history
This merges the LBRs with the callgraphs.
However it would be nice if it also works without callgraphs (-g) set in
perf record, so that only the LBRs are displayed. But currently perf
report errors in this case. For example,
perf record -b <command>
perf report --branch-history
Error:
Selected -g or --branch-history but no callchain data. Did
you call 'perf record' without -g?
This patch displays the LBRs only even if callgraphs(-g) is not enabled
in perf record.
Change log:
v2: According to Milian Wolff's comment, change the obsolete error
message. Now the error message is:
┌─Error:─────────────────────────────────────┐
│Selected -g or --branch-history. │
│But no callchain or branch data. │
│Did you call 'perf record' without -g or -b?│
│ │
│ │
│Press any key... │
└────────────────────────────────────────────┘
When passing the last parameter to hists__fprintf,
changes "|" to "||".
hists__fprintf(hists, !quiet, 0, 0, rep->min_percent, stdout,
symbol_conf.use_callchain || symbol_conf.show_branchflag_count);
Signed-off-by: Yao Jin <yao.jin@linux.intel.com>
Reviewed-by: Andi Kleen <ak@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1494240182-28899-1-git-send-email-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2017-05-08 17:43:02 +07:00
|
|
|
perf_hpp_list.parent || symbol_conf.show_branchflag_count) {
|
2016-04-15 00:48:07 +07:00
|
|
|
return thread__resolve_callchain(al->thread, cursor, evsel, sample,
|
2014-10-24 01:26:17 +07:00
|
|
|
parent, al, max_stack);
|
2014-01-14 12:25:35 +07:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int hist_entry__append_callchain(struct hist_entry *he, struct perf_sample *sample)
|
|
|
|
{
|
perf report: Make --branch-history work without callgraphs(-g) option in perf record
perf record -b -g <command>
perf report --branch-history
This merges the LBRs with the callgraphs.
However it would be nice if it also works without callgraphs (-g) set in
perf record, so that only the LBRs are displayed. But currently perf
report errors in this case. For example,
perf record -b <command>
perf report --branch-history
Error:
Selected -g or --branch-history but no callchain data. Did
you call 'perf record' without -g?
This patch displays the LBRs only even if callgraphs(-g) is not enabled
in perf record.
Change log:
v2: According to Milian Wolff's comment, change the obsolete error
message. Now the error message is:
┌─Error:─────────────────────────────────────┐
│Selected -g or --branch-history. │
│But no callchain or branch data. │
│Did you call 'perf record' without -g or -b?│
│ │
│ │
│Press any key... │
└────────────────────────────────────────────┘
When passing the last parameter to hists__fprintf,
changes "|" to "||".
hists__fprintf(hists, !quiet, 0, 0, rep->min_percent, stdout,
symbol_conf.use_callchain || symbol_conf.show_branchflag_count);
Signed-off-by: Yao Jin <yao.jin@linux.intel.com>
Reviewed-by: Andi Kleen <ak@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1494240182-28899-1-git-send-email-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2017-05-08 17:43:02 +07:00
|
|
|
if ((!symbol_conf.use_callchain || sample->callchain == NULL) &&
|
|
|
|
!symbol_conf.show_branchflag_count)
|
2014-01-14 12:25:35 +07:00
|
|
|
return 0;
|
|
|
|
return callchain_append(he->callchain, &callchain_cursor, sample->period);
|
|
|
|
}
|
2013-10-31 11:58:30 +07:00
|
|
|
|
|
|
|
int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node *node,
|
|
|
|
bool hide_unresolved)
|
|
|
|
{
|
2019-11-26 08:15:35 +07:00
|
|
|
al->maps = node->ms.maps;
|
2019-11-04 22:14:32 +07:00
|
|
|
al->map = node->ms.map;
|
|
|
|
al->sym = node->ms.sym;
|
perf report: Use srcline from callchain for hist entries
This also removes the symbol name from the srcline column, more on this
below.
This ensures we use the correct srcline, which could originate from a
potentially inlined function. The hist entries used to query for the
srcline based purely on the IP, which leads to wrong results for inlined
entries.
Before:
~~~~~
perf report --inline -s srcline -g none --stdio
...
# Children Self Source:Line
# ........ ........ ..................................................................................................................................
#
94.23% 0.00% __libc_start_main+18446603487898210537
94.23% 0.00% _start+41
44.58% 0.00% main+100
44.58% 0.00% std::_Norm_helper<true>::_S_do_it<double>+100
44.58% 0.00% std::__complex_abs+100
44.58% 0.00% std::abs<double>+100
44.58% 0.00% std::norm<double>+100
36.01% 0.00% hypot+18446603487892193300
25.81% 0.00% main+41
25.81% 0.00% std::__detail::_Adaptor<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul>, double>::operator()+41
25.81% 0.00% std::uniform_real_distribution<double>::operator()<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul> >+41
25.75% 25.75% random.h:143
18.39% 0.00% main+57
18.39% 0.00% std::__detail::_Adaptor<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul>, double>::operator()+57
18.39% 0.00% std::uniform_real_distribution<double>::operator()<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul> >+57
13.80% 13.80% random.tcc:3330
5.64% 0.00% ??:0
4.13% 4.13% __hypot_finite+163
4.13% 0.00% __hypot_finite+18446603487892193443
...
~~~~~
After:
~~~~~
perf report --inline -s srcline -g none --stdio
...
# Children Self Source:Line
# ........ ........ ...........................................
#
94.30% 1.19% main.cpp:39
94.23% 0.00% __libc_start_main+18446603487898210537
94.23% 0.00% _start+41
48.44% 1.70% random.h:1823
48.44% 0.00% random.h:1814
46.74% 2.53% random.h:185
44.68% 0.10% complex:589
44.68% 0.00% complex:597
44.68% 0.00% complex:654
44.68% 0.00% complex:664
40.61% 13.80% random.tcc:3330
36.01% 0.00% hypot+18446603487892193300
26.81% 0.00% random.h:151
26.81% 0.00% random.h:332
25.75% 25.75% random.h:143
5.64% 0.00% ??:0
4.13% 4.13% __hypot_finite+163
4.13% 0.00% __hypot_finite+18446603487892193443
...
~~~~~
Note that this change removes the symbol from the source:line hist
column. If this information is desired, users should explicitly query
for it if needed. I.e. run this command instead:
~~~~~
perf report --inline -s sym,srcline -g none --stdio
...
# To display the perf.data header info, please use --header/--header-only options.
#
#
# Total Lost Samples: 0
#
# Samples: 1K of event 'cycles:uppp'
# Event count (approx.): 1381229476
#
# Children Self Symbol Source:Line
# ........ ........ ................................................................................................................................... ...........................................
#
94.30% 1.19% [.] main main.cpp:39
94.23% 0.00% [.] __libc_start_main __libc_start_main+18446603487898210537
94.23% 0.00% [.] _start _start+41
48.44% 0.00% [.] std::uniform_real_distribution<double>::operator()<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul> > (inlined) random.h:1814
48.44% 0.00% [.] std::uniform_real_distribution<double>::operator()<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul> > (inlined) random.h:1823
46.74% 0.00% [.] std::__detail::_Adaptor<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul>, double>::operator() (inlined) random.h:185
44.68% 0.00% [.] std::_Norm_helper<true>::_S_do_it<double> (inlined) complex:654
44.68% 0.00% [.] std::__complex_abs (inlined) complex:589
44.68% 0.00% [.] std::abs<double> (inlined) complex:597
44.68% 0.00% [.] std::norm<double> (inlined) complex:664
39.80% 13.59% [.] std::generate_canonical<double, 53ul, std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul> > random.tcc:3330
36.01% 0.00% [.] hypot hypot+18446603487892193300
26.81% 0.00% [.] std::__detail::__mod<unsigned long, 2147483647ul, 16807ul, 0ul> (inlined) random.h:151
26.81% 0.00% [.] std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul>::operator() (inlined) random.h:332
25.75% 0.00% [.] std::__detail::_Mod<unsigned long, 2147483647ul, 16807ul, 0ul, true, true>::__calc (inlined) random.h:143
25.19% 25.19% [.] std::generate_canonical<double, 53ul, std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul> > random.h:143
4.13% 4.13% [.] __hypot_finite __hypot_finite+163
4.13% 0.00% [.] __hypot_finite __hypot_finite+18446603487892193443
...
~~~~~
Compared to the old behavior, this reduces duplication in the output.
Before we used to print the symbol name in the srcline column even
when the sym column was explicitly requested. I.e. the output was:
~~~~~
perf report --inline -s sym,srcline -g none --stdio
...
# To display the perf.data header info, please use --header/--header-only options.
#
#
# Total Lost Samples: 0
#
# Samples: 1K of event 'cycles:uppp'
# Event count (approx.): 1381229476
#
# Children Self Symbol Source:Line
# ........ ........ ................................................................................................................................... ..................................................................................................................................
#
94.23% 0.00% [.] __libc_start_main __libc_start_main+18446603487898210537
94.23% 0.00% [.] _start _start+41
44.58% 0.00% [.] main main+100
44.58% 0.00% [.] std::_Norm_helper<true>::_S_do_it<double> (inlined) std::_Norm_helper<true>::_S_do_it<double>+100
44.58% 0.00% [.] std::__complex_abs (inlined) std::__complex_abs+100
44.58% 0.00% [.] std::abs<double> (inlined) std::abs<double>+100
44.58% 0.00% [.] std::norm<double> (inlined) std::norm<double>+100
36.01% 0.00% [.] hypot hypot+18446603487892193300
25.81% 0.00% [.] main main+41
25.81% 0.00% [.] std::__detail::_Adaptor<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul>, double>::operator() (inlined) std::__detail::_Adaptor<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul>, double>::operator()+41
25.81% 0.00% [.] std::uniform_real_distribution<double>::operator()<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul> > (inlined) std::uniform_real_distribution<double>::operator()<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul> >+41
25.69% 25.69% [.] std::generate_canonical<double, 53ul, std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul> > random.h:143
18.39% 0.00% [.] main main+57
18.39% 0.00% [.] std::__detail::_Adaptor<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul>, double>::operator() (inlined) std::__detail::_Adaptor<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul>, double>::operator()+57
18.39% 0.00% [.] std::uniform_real_distribution<double>::operator()<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul> > (inlined) std::uniform_real_distribution<double>::operator()<std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul> >+57
13.80% 13.80% [.] std::generate_canonical<double, 53ul, std::linear_congruential_engine<unsigned long, 16807ul, 0ul, 2147483647ul> > random.tcc:3330
4.13% 4.13% [.] __hypot_finite __hypot_finite+163
4.13% 0.00% [.] __hypot_finite __hypot_finite+18446603487892193443
...
~~~~~
Signed-off-by: Milian Wolff <milian.wolff@kdab.com>
Reviewed-by: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20171019113836.5548-5-milian.wolff@kdab.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2017-10-19 18:38:35 +07:00
|
|
|
al->srcline = node->srcline;
|
2017-10-20 12:15:33 +07:00
|
|
|
al->addr = node->ip;
|
2013-10-31 11:58:30 +07:00
|
|
|
|
|
|
|
if (al->sym == NULL) {
|
|
|
|
if (hide_unresolved)
|
|
|
|
return 0;
|
|
|
|
if (al->map == NULL)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2019-11-26 08:11:20 +07:00
|
|
|
if (al->maps == &al->maps->machine->kmaps) {
|
|
|
|
if (machine__is_host(al->maps->machine)) {
|
2013-10-31 11:58:30 +07:00
|
|
|
al->cpumode = PERF_RECORD_MISC_KERNEL;
|
|
|
|
al->level = 'k';
|
|
|
|
} else {
|
|
|
|
al->cpumode = PERF_RECORD_MISC_GUEST_KERNEL;
|
|
|
|
al->level = 'g';
|
|
|
|
}
|
|
|
|
} else {
|
2019-11-26 08:11:20 +07:00
|
|
|
if (machine__is_host(al->maps->machine)) {
|
2013-10-31 11:58:30 +07:00
|
|
|
al->cpumode = PERF_RECORD_MISC_USER;
|
|
|
|
al->level = '.';
|
|
|
|
} else if (perf_guest) {
|
|
|
|
al->cpumode = PERF_RECORD_MISC_GUEST_USER;
|
|
|
|
al->level = 'u';
|
|
|
|
} else {
|
|
|
|
al->cpumode = PERF_RECORD_MISC_HYPERVISOR;
|
|
|
|
al->level = 'H';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
return 1;
|
|
|
|
}
|
2014-11-13 09:05:23 +07:00
|
|
|
|
|
|
|
char *callchain_list__sym_name(struct callchain_list *cl,
|
|
|
|
char *bf, size_t bfsize, bool show_dso)
|
|
|
|
{
|
2017-03-19 04:49:28 +07:00
|
|
|
bool show_addr = callchain_param.key == CCKEY_ADDRESS;
|
|
|
|
bool show_srcline = show_addr || callchain_param.key == CCKEY_SRCLINE;
|
2014-11-13 09:05:23 +07:00
|
|
|
int printed;
|
|
|
|
|
|
|
|
if (cl->ms.sym) {
|
2017-10-10 03:33:01 +07:00
|
|
|
const char *inlined = cl->ms.sym->inlined ? " (inlined)" : "";
|
|
|
|
|
2017-10-10 03:32:56 +07:00
|
|
|
if (show_srcline && cl->srcline)
|
2017-10-10 03:33:01 +07:00
|
|
|
printed = scnprintf(bf, bfsize, "%s %s%s",
|
|
|
|
cl->ms.sym->name, cl->srcline,
|
|
|
|
inlined);
|
2014-11-13 09:05:24 +07:00
|
|
|
else
|
2017-10-10 03:33:01 +07:00
|
|
|
printed = scnprintf(bf, bfsize, "%s%s",
|
|
|
|
cl->ms.sym->name, inlined);
|
2014-11-13 09:05:23 +07:00
|
|
|
} else
|
|
|
|
printed = scnprintf(bf, bfsize, "%#" PRIx64, cl->ip);
|
|
|
|
|
|
|
|
if (show_dso)
|
|
|
|
scnprintf(bf + printed, bfsize - printed, " %s",
|
|
|
|
cl->ms.map ?
|
|
|
|
cl->ms.map->dso->short_name :
|
|
|
|
"unknown");
|
|
|
|
|
|
|
|
return bf;
|
|
|
|
}
|
2014-12-30 12:38:13 +07:00
|
|
|
|
2015-11-09 12:45:39 +07:00
|
|
|
char *callchain_node__scnprintf_value(struct callchain_node *node,
|
|
|
|
char *bf, size_t bfsize, u64 total)
|
|
|
|
{
|
|
|
|
double percent = 0.0;
|
|
|
|
u64 period = callchain_cumul_hits(node);
|
2015-11-09 12:45:41 +07:00
|
|
|
unsigned count = callchain_cumul_counts(node);
|
2015-11-09 12:45:39 +07:00
|
|
|
|
2015-11-09 12:45:41 +07:00
|
|
|
if (callchain_param.mode == CHAIN_FOLDED) {
|
2015-11-09 12:45:39 +07:00
|
|
|
period = node->hit;
|
2015-11-09 12:45:41 +07:00
|
|
|
count = node->count;
|
|
|
|
}
|
2015-11-09 12:45:39 +07:00
|
|
|
|
2015-11-09 12:45:41 +07:00
|
|
|
switch (callchain_param.value) {
|
|
|
|
case CCVAL_PERIOD:
|
|
|
|
scnprintf(bf, bfsize, "%"PRIu64, period);
|
|
|
|
break;
|
|
|
|
case CCVAL_COUNT:
|
|
|
|
scnprintf(bf, bfsize, "%u", count);
|
|
|
|
break;
|
|
|
|
case CCVAL_PERCENT:
|
|
|
|
default:
|
|
|
|
if (total)
|
|
|
|
percent = period * 100.0 / total;
|
|
|
|
scnprintf(bf, bfsize, "%.2f%%", percent);
|
|
|
|
break;
|
|
|
|
}
|
2015-11-09 12:45:39 +07:00
|
|
|
return bf;
|
|
|
|
}
|
|
|
|
|
|
|
|
int callchain_node__fprintf_value(struct callchain_node *node,
|
|
|
|
FILE *fp, u64 total)
|
|
|
|
{
|
|
|
|
double percent = 0.0;
|
|
|
|
u64 period = callchain_cumul_hits(node);
|
2015-11-09 12:45:41 +07:00
|
|
|
unsigned count = callchain_cumul_counts(node);
|
2015-11-09 12:45:39 +07:00
|
|
|
|
2015-11-09 12:45:41 +07:00
|
|
|
if (callchain_param.mode == CHAIN_FOLDED) {
|
2015-11-09 12:45:39 +07:00
|
|
|
period = node->hit;
|
2015-11-09 12:45:41 +07:00
|
|
|
count = node->count;
|
|
|
|
}
|
2015-11-09 12:45:39 +07:00
|
|
|
|
2015-11-09 12:45:41 +07:00
|
|
|
switch (callchain_param.value) {
|
|
|
|
case CCVAL_PERIOD:
|
|
|
|
return fprintf(fp, "%"PRIu64, period);
|
|
|
|
case CCVAL_COUNT:
|
|
|
|
return fprintf(fp, "%u", count);
|
|
|
|
case CCVAL_PERCENT:
|
|
|
|
default:
|
|
|
|
if (total)
|
|
|
|
percent = period * 100.0 / total;
|
|
|
|
return percent_color_fprintf(fp, "%.2f%%", percent);
|
|
|
|
}
|
|
|
|
return 0;
|
2015-11-09 12:45:39 +07:00
|
|
|
}
|
|
|
|
|
2016-10-31 08:19:51 +07:00
|
|
|
static void callchain_counts_value(struct callchain_node *node,
|
|
|
|
u64 *branch_count, u64 *predicted_count,
|
|
|
|
u64 *abort_count, u64 *cycles_count)
|
|
|
|
{
|
|
|
|
struct callchain_list *clist;
|
|
|
|
|
|
|
|
list_for_each_entry(clist, &node->val, list) {
|
|
|
|
if (branch_count)
|
|
|
|
*branch_count += clist->branch_count;
|
|
|
|
|
|
|
|
if (predicted_count)
|
|
|
|
*predicted_count += clist->predicted_count;
|
|
|
|
|
|
|
|
if (abort_count)
|
|
|
|
*abort_count += clist->abort_count;
|
|
|
|
|
|
|
|
if (cycles_count)
|
|
|
|
*cycles_count += clist->cycles_count;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int callchain_node_branch_counts_cumul(struct callchain_node *node,
|
|
|
|
u64 *branch_count,
|
|
|
|
u64 *predicted_count,
|
|
|
|
u64 *abort_count,
|
|
|
|
u64 *cycles_count)
|
|
|
|
{
|
|
|
|
struct callchain_node *child;
|
|
|
|
struct rb_node *n;
|
|
|
|
|
|
|
|
n = rb_first(&node->rb_root_in);
|
|
|
|
while (n) {
|
|
|
|
child = rb_entry(n, struct callchain_node, rb_node_in);
|
|
|
|
n = rb_next(n);
|
|
|
|
|
|
|
|
callchain_node_branch_counts_cumul(child, branch_count,
|
|
|
|
predicted_count,
|
|
|
|
abort_count,
|
|
|
|
cycles_count);
|
|
|
|
|
|
|
|
callchain_counts_value(child, branch_count,
|
|
|
|
predicted_count, abort_count,
|
|
|
|
cycles_count);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int callchain_branch_counts(struct callchain_root *root,
|
|
|
|
u64 *branch_count, u64 *predicted_count,
|
|
|
|
u64 *abort_count, u64 *cycles_count)
|
|
|
|
{
|
|
|
|
if (branch_count)
|
|
|
|
*branch_count = 0;
|
|
|
|
|
|
|
|
if (predicted_count)
|
|
|
|
*predicted_count = 0;
|
|
|
|
|
|
|
|
if (abort_count)
|
|
|
|
*abort_count = 0;
|
|
|
|
|
|
|
|
if (cycles_count)
|
|
|
|
*cycles_count = 0;
|
|
|
|
|
|
|
|
return callchain_node_branch_counts_cumul(&root->node,
|
|
|
|
branch_count,
|
|
|
|
predicted_count,
|
|
|
|
abort_count,
|
|
|
|
cycles_count);
|
|
|
|
}
|
|
|
|
|
2017-07-18 19:13:12 +07:00
|
|
|
static int count_pri64_printf(int idx, const char *str, u64 value, char *bf, int bfsize)
|
|
|
|
{
|
|
|
|
int printed;
|
|
|
|
|
|
|
|
printed = scnprintf(bf, bfsize, "%s%s:%" PRId64 "", (idx) ? " " : " (", str, value);
|
|
|
|
|
|
|
|
return printed;
|
|
|
|
}
|
|
|
|
|
2017-07-24 18:09:07 +07:00
|
|
|
static int count_float_printf(int idx, const char *str, float value,
|
|
|
|
char *bf, int bfsize, float threshold)
|
2017-07-18 19:13:12 +07:00
|
|
|
{
|
|
|
|
int printed;
|
|
|
|
|
2017-07-24 18:09:07 +07:00
|
|
|
if (threshold != 0.0 && value < threshold)
|
|
|
|
return 0;
|
|
|
|
|
2017-07-18 19:13:12 +07:00
|
|
|
printed = scnprintf(bf, bfsize, "%s%s:%.1f%%", (idx) ? " " : " (", str, value);
|
|
|
|
|
|
|
|
return printed;
|
|
|
|
}
|
|
|
|
|
2017-07-24 18:09:07 +07:00
|
|
|
static int branch_to_str(char *bf, int bfsize,
|
|
|
|
u64 branch_count, u64 predicted_count,
|
|
|
|
u64 abort_count,
|
|
|
|
struct branch_type_stat *brtype_stat)
|
2016-10-31 08:19:51 +07:00
|
|
|
{
|
2017-07-18 19:13:15 +07:00
|
|
|
int printed, i = 0;
|
2016-10-31 08:19:51 +07:00
|
|
|
|
2017-07-18 19:13:15 +07:00
|
|
|
printed = branch_type_str(brtype_stat, bf, bfsize);
|
|
|
|
if (printed)
|
|
|
|
i++;
|
|
|
|
|
2017-07-18 19:13:12 +07:00
|
|
|
if (predicted_count < branch_count) {
|
|
|
|
printed += count_float_printf(i++, "predicted",
|
|
|
|
predicted_count * 100.0 / branch_count,
|
2017-07-24 18:09:07 +07:00
|
|
|
bf + printed, bfsize - printed, 0.0);
|
2017-07-18 19:13:12 +07:00
|
|
|
}
|
2016-10-31 08:19:51 +07:00
|
|
|
|
2017-07-18 19:13:12 +07:00
|
|
|
if (abort_count) {
|
|
|
|
printed += count_float_printf(i++, "abort",
|
|
|
|
abort_count * 100.0 / branch_count,
|
2017-07-24 18:09:07 +07:00
|
|
|
bf + printed, bfsize - printed, 0.1);
|
2017-03-09 15:06:26 +07:00
|
|
|
}
|
2016-10-31 08:19:51 +07:00
|
|
|
|
2017-07-24 18:09:07 +07:00
|
|
|
if (i)
|
|
|
|
printed += scnprintf(bf + printed, bfsize - printed, ")");
|
|
|
|
|
|
|
|
return printed;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int branch_from_str(char *bf, int bfsize,
|
|
|
|
u64 branch_count,
|
|
|
|
u64 cycles_count, u64 iter_count,
|
2019-01-04 13:10:30 +07:00
|
|
|
u64 iter_cycles, u64 from_count)
|
2017-07-24 18:09:07 +07:00
|
|
|
{
|
|
|
|
int printed = 0, i = 0;
|
2019-01-04 13:10:30 +07:00
|
|
|
u64 cycles, v = 0;
|
2017-07-24 18:09:07 +07:00
|
|
|
|
2017-07-18 19:13:12 +07:00
|
|
|
cycles = cycles_count / branch_count;
|
|
|
|
if (cycles) {
|
|
|
|
printed += count_pri64_printf(i++, "cycles",
|
|
|
|
cycles,
|
|
|
|
bf + printed, bfsize - printed);
|
2016-10-31 08:19:51 +07:00
|
|
|
}
|
|
|
|
|
2019-01-04 13:10:30 +07:00
|
|
|
if (iter_count && from_count) {
|
|
|
|
v = iter_count / from_count;
|
|
|
|
if (v) {
|
|
|
|
printed += count_pri64_printf(i++, "iter",
|
|
|
|
v, bf + printed, bfsize - printed);
|
2017-08-07 20:05:15 +07:00
|
|
|
|
2019-01-04 13:10:30 +07:00
|
|
|
printed += count_pri64_printf(i++, "avg_cycles",
|
|
|
|
iter_cycles / iter_count,
|
|
|
|
bf + printed, bfsize - printed);
|
|
|
|
}
|
2017-03-09 15:06:26 +07:00
|
|
|
}
|
2016-10-31 08:19:51 +07:00
|
|
|
|
2017-07-18 19:13:12 +07:00
|
|
|
if (i)
|
2017-07-24 18:09:07 +07:00
|
|
|
printed += scnprintf(bf + printed, bfsize - printed, ")");
|
2017-03-09 15:06:26 +07:00
|
|
|
|
2017-07-24 18:09:07 +07:00
|
|
|
return printed;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int counts_str_build(char *bf, int bfsize,
|
|
|
|
u64 branch_count, u64 predicted_count,
|
|
|
|
u64 abort_count, u64 cycles_count,
|
2017-08-07 20:05:15 +07:00
|
|
|
u64 iter_count, u64 iter_cycles,
|
2019-01-04 13:10:30 +07:00
|
|
|
u64 from_count,
|
2017-07-24 18:09:07 +07:00
|
|
|
struct branch_type_stat *brtype_stat)
|
|
|
|
{
|
|
|
|
int printed;
|
|
|
|
|
|
|
|
if (branch_count == 0)
|
|
|
|
return scnprintf(bf, bfsize, " (calltrace)");
|
|
|
|
|
|
|
|
if (brtype_stat->branch_to) {
|
|
|
|
printed = branch_to_str(bf, bfsize, branch_count,
|
|
|
|
predicted_count, abort_count, brtype_stat);
|
|
|
|
} else {
|
|
|
|
printed = branch_from_str(bf, bfsize, branch_count,
|
2019-01-04 13:10:30 +07:00
|
|
|
cycles_count, iter_count, iter_cycles,
|
|
|
|
from_count);
|
2017-07-24 18:09:07 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!printed)
|
|
|
|
bf[0] = 0;
|
|
|
|
|
|
|
|
return printed;
|
2017-03-09 15:06:26 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int callchain_counts_printf(FILE *fp, char *bf, int bfsize,
|
|
|
|
u64 branch_count, u64 predicted_count,
|
|
|
|
u64 abort_count, u64 cycles_count,
|
2017-08-07 20:05:15 +07:00
|
|
|
u64 iter_count, u64 iter_cycles,
|
2019-01-04 13:10:30 +07:00
|
|
|
u64 from_count,
|
2017-07-18 19:13:15 +07:00
|
|
|
struct branch_type_stat *brtype_stat)
|
2017-03-09 15:06:26 +07:00
|
|
|
{
|
2017-07-18 19:13:15 +07:00
|
|
|
char str[256];
|
2017-03-09 15:06:26 +07:00
|
|
|
|
|
|
|
counts_str_build(str, sizeof(str), branch_count,
|
|
|
|
predicted_count, abort_count, cycles_count,
|
2019-01-04 13:10:30 +07:00
|
|
|
iter_count, iter_cycles, from_count, brtype_stat);
|
2016-10-31 08:19:51 +07:00
|
|
|
|
|
|
|
if (fp)
|
2017-03-09 15:06:26 +07:00
|
|
|
return fprintf(fp, "%s", str);
|
2016-10-31 08:19:51 +07:00
|
|
|
|
2017-03-09 15:06:26 +07:00
|
|
|
return scnprintf(bf, bfsize, "%s", str);
|
2016-10-31 08:19:51 +07:00
|
|
|
}
|
|
|
|
|
2017-08-07 20:05:15 +07:00
|
|
|
int callchain_list_counts__printf_value(struct callchain_list *clist,
|
2016-10-31 08:19:51 +07:00
|
|
|
FILE *fp, char *bf, int bfsize)
|
|
|
|
{
|
|
|
|
u64 branch_count, predicted_count;
|
|
|
|
u64 abort_count, cycles_count;
|
2017-08-07 20:05:15 +07:00
|
|
|
u64 iter_count, iter_cycles;
|
2019-01-04 13:10:30 +07:00
|
|
|
u64 from_count;
|
2016-10-31 08:19:51 +07:00
|
|
|
|
|
|
|
branch_count = clist->branch_count;
|
|
|
|
predicted_count = clist->predicted_count;
|
|
|
|
abort_count = clist->abort_count;
|
|
|
|
cycles_count = clist->cycles_count;
|
2017-08-07 20:05:15 +07:00
|
|
|
iter_count = clist->iter_count;
|
|
|
|
iter_cycles = clist->iter_cycles;
|
2019-01-04 13:10:30 +07:00
|
|
|
from_count = clist->from_count;
|
2016-10-31 08:19:51 +07:00
|
|
|
|
|
|
|
return callchain_counts_printf(fp, bf, bfsize, branch_count,
|
|
|
|
predicted_count, abort_count,
|
2017-08-07 20:05:15 +07:00
|
|
|
cycles_count, iter_count, iter_cycles,
|
2019-01-04 13:10:30 +07:00
|
|
|
from_count, &clist->brtype_stat);
|
2016-10-31 08:19:51 +07:00
|
|
|
}
|
|
|
|
|
2014-12-30 12:38:13 +07:00
|
|
|
static void free_callchain_node(struct callchain_node *node)
|
|
|
|
{
|
|
|
|
struct callchain_list *list, *tmp;
|
|
|
|
struct callchain_node *child;
|
|
|
|
struct rb_node *n;
|
|
|
|
|
2015-11-09 12:45:43 +07:00
|
|
|
list_for_each_entry_safe(list, tmp, &node->parent_val, list) {
|
2019-07-04 22:13:46 +07:00
|
|
|
list_del_init(&list->list);
|
2017-01-06 13:23:31 +07:00
|
|
|
map__zput(list->ms.map);
|
2015-11-09 12:45:43 +07:00
|
|
|
free(list);
|
|
|
|
}
|
|
|
|
|
2014-12-30 12:38:13 +07:00
|
|
|
list_for_each_entry_safe(list, tmp, &node->val, list) {
|
2019-07-04 22:13:46 +07:00
|
|
|
list_del_init(&list->list);
|
2017-01-06 13:23:31 +07:00
|
|
|
map__zput(list->ms.map);
|
2014-12-30 12:38:13 +07:00
|
|
|
free(list);
|
|
|
|
}
|
|
|
|
|
|
|
|
n = rb_first(&node->rb_root_in);
|
|
|
|
while (n) {
|
|
|
|
child = container_of(n, struct callchain_node, rb_node_in);
|
|
|
|
n = rb_next(n);
|
|
|
|
rb_erase(&child->rb_node_in, &node->rb_root_in);
|
|
|
|
|
|
|
|
free_callchain_node(child);
|
|
|
|
free(child);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void free_callchain(struct callchain_root *root)
|
|
|
|
{
|
|
|
|
if (!symbol_conf.use_callchain)
|
|
|
|
return;
|
|
|
|
|
|
|
|
free_callchain_node(&root->node);
|
|
|
|
}
|
2015-11-09 12:45:43 +07:00
|
|
|
|
2016-01-05 10:06:00 +07:00
|
|
|
static u64 decay_callchain_node(struct callchain_node *node)
|
|
|
|
{
|
|
|
|
struct callchain_node *child;
|
|
|
|
struct rb_node *n;
|
|
|
|
u64 child_hits = 0;
|
|
|
|
|
|
|
|
n = rb_first(&node->rb_root_in);
|
|
|
|
while (n) {
|
|
|
|
child = container_of(n, struct callchain_node, rb_node_in);
|
|
|
|
|
|
|
|
child_hits += decay_callchain_node(child);
|
|
|
|
n = rb_next(n);
|
|
|
|
}
|
|
|
|
|
|
|
|
node->hit = (node->hit * 7) / 8;
|
|
|
|
node->children_hit = child_hits;
|
|
|
|
|
|
|
|
return node->hit;
|
|
|
|
}
|
|
|
|
|
|
|
|
void decay_callchain(struct callchain_root *root)
|
|
|
|
{
|
|
|
|
if (!symbol_conf.use_callchain)
|
|
|
|
return;
|
|
|
|
|
|
|
|
decay_callchain_node(&root->node);
|
|
|
|
}
|
|
|
|
|
2015-11-09 12:45:43 +07:00
|
|
|
int callchain_node__make_parent_list(struct callchain_node *node)
|
|
|
|
{
|
|
|
|
struct callchain_node *parent = node->parent;
|
|
|
|
struct callchain_list *chain, *new;
|
|
|
|
LIST_HEAD(head);
|
|
|
|
|
|
|
|
while (parent) {
|
|
|
|
list_for_each_entry_reverse(chain, &parent->val, list) {
|
|
|
|
new = malloc(sizeof(*new));
|
|
|
|
if (new == NULL)
|
|
|
|
goto out;
|
|
|
|
*new = *chain;
|
|
|
|
new->has_children = false;
|
2017-01-06 13:23:31 +07:00
|
|
|
map__get(new->ms.map);
|
2015-11-09 12:45:43 +07:00
|
|
|
list_add_tail(&new->list, &head);
|
|
|
|
}
|
|
|
|
parent = parent->parent;
|
|
|
|
}
|
|
|
|
|
|
|
|
list_for_each_entry_safe_reverse(chain, new, &head, list)
|
|
|
|
list_move_tail(&chain->list, &node->parent_val);
|
|
|
|
|
|
|
|
if (!list_empty(&node->parent_val)) {
|
|
|
|
chain = list_first_entry(&node->parent_val, struct callchain_list, list);
|
|
|
|
chain->has_children = rb_prev(&node->rb_node) || rb_next(&node->rb_node);
|
|
|
|
|
|
|
|
chain = list_first_entry(&node->val, struct callchain_list, list);
|
|
|
|
chain->has_children = false;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
out:
|
|
|
|
list_for_each_entry_safe(chain, new, &head, list) {
|
2019-07-04 22:13:46 +07:00
|
|
|
list_del_init(&chain->list);
|
2017-01-06 13:23:31 +07:00
|
|
|
map__zput(chain->ms.map);
|
2015-11-09 12:45:43 +07:00
|
|
|
free(chain);
|
|
|
|
}
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
2016-12-06 10:40:02 +07:00
|
|
|
|
|
|
|
int callchain_cursor__copy(struct callchain_cursor *dst,
|
|
|
|
struct callchain_cursor *src)
|
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
callchain_cursor_reset(dst);
|
|
|
|
callchain_cursor_commit(src);
|
|
|
|
|
|
|
|
while (true) {
|
|
|
|
struct callchain_cursor_node *node;
|
|
|
|
|
|
|
|
node = callchain_cursor_current(src);
|
|
|
|
if (node == NULL)
|
|
|
|
break;
|
|
|
|
|
2019-11-04 22:14:32 +07:00
|
|
|
rc = callchain_cursor_append(dst, node->ip, &node->ms,
|
2016-12-06 10:40:02 +07:00
|
|
|
node->branch, &node->branch_flags,
|
2017-08-07 20:05:15 +07:00
|
|
|
node->nr_loop_iter,
|
|
|
|
node->iter_cycles,
|
2017-10-10 03:32:56 +07:00
|
|
|
node->branch_from, node->srcline);
|
2016-12-06 10:40:02 +07:00
|
|
|
if (rc)
|
|
|
|
break;
|
|
|
|
|
|
|
|
callchain_cursor_advance(src);
|
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
2019-01-27 17:55:39 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize a cursor before adding entries inside, but keep
|
|
|
|
* the previously allocated entries as a cache.
|
|
|
|
*/
|
|
|
|
void callchain_cursor_reset(struct callchain_cursor *cursor)
|
|
|
|
{
|
|
|
|
struct callchain_cursor_node *node;
|
|
|
|
|
|
|
|
cursor->nr = 0;
|
|
|
|
cursor->last = &cursor->first;
|
|
|
|
|
|
|
|
for (node = cursor->first; node != NULL; node = node->next)
|
2019-11-04 22:14:32 +07:00
|
|
|
map__zput(node->ms.map);
|
2019-01-27 17:55:39 +07:00
|
|
|
}
|