aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2016-04-28 18:03:42 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-05-30 11:41:44 -0400
commit792d48b4cf9c248ab2bf66c140a27c48e116bed7 (patch)
tree620d25a3ffd13c3f698d69da35b058de19814887
parent97c79a38cd454602645f0470ffb444b3b75ce574 (diff)
perf tools: Per event max-stack settings
The tooling counterpart, now it is possible to do: # perf record -e sched:sched_switch/max-stack=10/ -e cycles/call-graph=dwarf,max-stack=4/ -e cpu-cycles/call-graph=dwarf,max-stack=1024/ usleep 1 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.052 MB perf.data (5 samples) ] # perf evlist -v sched:sched_switch: type: 2, size: 112, config: 0x110, { sample_period, sample_freq }: 1, sample_type: IP|TID|TIME|CALLCHAIN|CPU|PERIOD|RAW|IDENTIFIER, read_format: ID, disabled: 1, inherit: 1, mmap: 1, comm: 1, enable_on_exec: 1, task: 1, sample_id_all: 1, exclude_guest: 1, mmap2: 1, comm_exec: 1, sample_max_stack: 10 cycles/call-graph=dwarf,max-stack=4/: size: 112, { sample_period, sample_freq }: 4000, sample_type: IP|TID|TIME|CALLCHAIN|PERIOD|REGS_USER|STACK_USER|IDENTIFIER, read_format: ID, disabled: 1, inherit: 1, freq: 1, enable_on_exec: 1, sample_id_all: 1, exclude_guest: 1, exclude_callchain_user: 1, sample_regs_user: 0xff0fff, sample_stack_user: 8192, sample_max_stack: 4 cpu-cycles/call-graph=dwarf,max-stack=1024/: size: 112, { sample_period, sample_freq }: 4000, sample_type: IP|TID|TIME|CALLCHAIN|PERIOD|REGS_USER|STACK_USER|IDENTIFIER, read_format: ID, disabled: 1, inherit: 1, freq: 1, enable_on_exec: 1, sample_id_all: 1, exclude_guest: 1, exclude_callchain_user: 1, sample_regs_user: 0xff0fff, sample_stack_user: 8192, sample_max_stack: 1024 # Tip: use 'perf evlist --trace-fields' to show fields for tracepoint events Using just /max-stack=N/ means /call-graph=fp,max-stack=N/, that should be further configurable by means of some .perfconfig knob. Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Brendan Gregg <brendan.d.gregg@gmail.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: He Kuang <hekuang@huawei.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Milian Wolff <milian.wolff@kdab.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vince Weaver <vincent.weaver@maine.edu> Cc: Wang Nan <wangnan0@huawei.com> Cc: Zefan Li <lizefan@huawei.com> Link: http://lkml.kernel.org/n/tip-kolmn1yo40p7jhswxwrc7rrd@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/util/callchain.h1
-rw-r--r--tools/perf/util/evsel.c16
-rw-r--r--tools/perf/util/evsel.h2
-rw-r--r--tools/perf/util/parse-events.c8
-rw-r--r--tools/perf/util/parse-events.h1
-rw-r--r--tools/perf/util/parse-events.l1
-rw-r--r--tools/perf/util/session.c2
7 files changed, 29 insertions, 2 deletions
diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h
index 65e2a4f7cb4e..a70f6b54eb92 100644
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@ -94,6 +94,7 @@ struct callchain_param {
94 enum perf_call_graph_mode record_mode; 94 enum perf_call_graph_mode record_mode;
95 u32 dump_size; 95 u32 dump_size;
96 enum chain_mode mode; 96 enum chain_mode mode;
97 u16 max_stack;
97 u32 print_limit; 98 u32 print_limit;
98 double min_percent; 99 double min_percent;
99 sort_chain_func_t sort; 100 sort_chain_func_t sort;
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 02c177d14c8d..245ac503f211 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -572,6 +572,8 @@ void perf_evsel__config_callchain(struct perf_evsel *evsel,
572 572
573 perf_evsel__set_sample_bit(evsel, CALLCHAIN); 573 perf_evsel__set_sample_bit(evsel, CALLCHAIN);
574 574
575 attr->sample_max_stack = param->max_stack;
576
575 if (param->record_mode == CALLCHAIN_LBR) { 577 if (param->record_mode == CALLCHAIN_LBR) {
576 if (!opts->branch_stack) { 578 if (!opts->branch_stack) {
577 if (attr->exclude_user) { 579 if (attr->exclude_user) {
@@ -635,7 +637,8 @@ static void apply_config_terms(struct perf_evsel *evsel,
635 struct perf_event_attr *attr = &evsel->attr; 637 struct perf_event_attr *attr = &evsel->attr;
636 struct callchain_param param; 638 struct callchain_param param;
637 u32 dump_size = 0; 639 u32 dump_size = 0;
638 char *callgraph_buf = NULL; 640 int max_stack = 0;
641 const char *callgraph_buf = NULL;
639 642
640 /* callgraph default */ 643 /* callgraph default */
641 param.record_mode = callchain_param.record_mode; 644 param.record_mode = callchain_param.record_mode;
@@ -662,6 +665,9 @@ static void apply_config_terms(struct perf_evsel *evsel,
662 case PERF_EVSEL__CONFIG_TERM_STACK_USER: 665 case PERF_EVSEL__CONFIG_TERM_STACK_USER:
663 dump_size = term->val.stack_user; 666 dump_size = term->val.stack_user;
664 break; 667 break;
668 case PERF_EVSEL__CONFIG_TERM_MAX_STACK:
669 max_stack = term->val.max_stack;
670 break;
665 case PERF_EVSEL__CONFIG_TERM_INHERIT: 671 case PERF_EVSEL__CONFIG_TERM_INHERIT:
666 /* 672 /*
667 * attr->inherit should has already been set by 673 * attr->inherit should has already been set by
@@ -677,7 +683,12 @@ static void apply_config_terms(struct perf_evsel *evsel,
677 } 683 }
678 684
679 /* User explicitly set per-event callgraph, clear the old setting and reset. */ 685 /* User explicitly set per-event callgraph, clear the old setting and reset. */
680 if ((callgraph_buf != NULL) || (dump_size > 0)) { 686 if ((callgraph_buf != NULL) || (dump_size > 0) || max_stack) {
687 if (max_stack) {
688 param.max_stack = max_stack;
689 if (callgraph_buf == NULL)
690 callgraph_buf = "fp";
691 }
681 692
682 /* parse callgraph parameters */ 693 /* parse callgraph parameters */
683 if (callgraph_buf != NULL) { 694 if (callgraph_buf != NULL) {
@@ -1329,6 +1340,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,
1329 PRINT_ATTRf(clockid, p_signed); 1340 PRINT_ATTRf(clockid, p_signed);
1330 PRINT_ATTRf(sample_regs_intr, p_hex); 1341 PRINT_ATTRf(sample_regs_intr, p_hex);
1331 PRINT_ATTRf(aux_watermark, p_unsigned); 1342 PRINT_ATTRf(aux_watermark, p_unsigned);
1343 PRINT_ATTRf(sample_max_stack, p_unsigned);
1332 1344
1333 return ret; 1345 return ret;
1334} 1346}
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index c1f10159804c..028412b32d5a 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -44,6 +44,7 @@ enum {
44 PERF_EVSEL__CONFIG_TERM_CALLGRAPH, 44 PERF_EVSEL__CONFIG_TERM_CALLGRAPH,
45 PERF_EVSEL__CONFIG_TERM_STACK_USER, 45 PERF_EVSEL__CONFIG_TERM_STACK_USER,
46 PERF_EVSEL__CONFIG_TERM_INHERIT, 46 PERF_EVSEL__CONFIG_TERM_INHERIT,
47 PERF_EVSEL__CONFIG_TERM_MAX_STACK,
47 PERF_EVSEL__CONFIG_TERM_MAX, 48 PERF_EVSEL__CONFIG_TERM_MAX,
48}; 49};
49 50
@@ -56,6 +57,7 @@ struct perf_evsel_config_term {
56 bool time; 57 bool time;
57 char *callgraph; 58 char *callgraph;
58 u64 stack_user; 59 u64 stack_user;
60 int max_stack;
59 bool inherit; 61 bool inherit;
60 } val; 62 } val;
61}; 63};
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index bcbc983d4b12..89d40bb425e1 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -900,6 +900,7 @@ static const char *config_term_names[__PARSE_EVENTS__TERM_TYPE_NR] = {
900 [PARSE_EVENTS__TERM_TYPE_STACKSIZE] = "stack-size", 900 [PARSE_EVENTS__TERM_TYPE_STACKSIZE] = "stack-size",
901 [PARSE_EVENTS__TERM_TYPE_NOINHERIT] = "no-inherit", 901 [PARSE_EVENTS__TERM_TYPE_NOINHERIT] = "no-inherit",
902 [PARSE_EVENTS__TERM_TYPE_INHERIT] = "inherit", 902 [PARSE_EVENTS__TERM_TYPE_INHERIT] = "inherit",
903 [PARSE_EVENTS__TERM_TYPE_MAX_STACK] = "max-stack",
903}; 904};
904 905
905static bool config_term_shrinked; 906static bool config_term_shrinked;
@@ -995,6 +996,9 @@ do { \
995 case PARSE_EVENTS__TERM_TYPE_NAME: 996 case PARSE_EVENTS__TERM_TYPE_NAME:
996 CHECK_TYPE_VAL(STR); 997 CHECK_TYPE_VAL(STR);
997 break; 998 break;
999 case PARSE_EVENTS__TERM_TYPE_MAX_STACK:
1000 CHECK_TYPE_VAL(NUM);
1001 break;
998 default: 1002 default:
999 err->str = strdup("unknown term"); 1003 err->str = strdup("unknown term");
1000 err->idx = term->err_term; 1004 err->idx = term->err_term;
@@ -1040,6 +1044,7 @@ static int config_term_tracepoint(struct perf_event_attr *attr,
1040 case PARSE_EVENTS__TERM_TYPE_STACKSIZE: 1044 case PARSE_EVENTS__TERM_TYPE_STACKSIZE:
1041 case PARSE_EVENTS__TERM_TYPE_INHERIT: 1045 case PARSE_EVENTS__TERM_TYPE_INHERIT:
1042 case PARSE_EVENTS__TERM_TYPE_NOINHERIT: 1046 case PARSE_EVENTS__TERM_TYPE_NOINHERIT:
1047 case PARSE_EVENTS__TERM_TYPE_MAX_STACK:
1043 return config_term_common(attr, term, err); 1048 return config_term_common(attr, term, err);
1044 default: 1049 default:
1045 if (err) { 1050 if (err) {
@@ -1109,6 +1114,9 @@ do { \
1109 case PARSE_EVENTS__TERM_TYPE_NOINHERIT: 1114 case PARSE_EVENTS__TERM_TYPE_NOINHERIT:
1110 ADD_CONFIG_TERM(INHERIT, inherit, term->val.num ? 0 : 1); 1115 ADD_CONFIG_TERM(INHERIT, inherit, term->val.num ? 0 : 1);
1111 break; 1116 break;
1117 case PARSE_EVENTS__TERM_TYPE_MAX_STACK:
1118 ADD_CONFIG_TERM(MAX_STACK, max_stack, term->val.num);
1119 break;
1112 default: 1120 default:
1113 break; 1121 break;
1114 } 1122 }
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index d740c3ca9a1d..46c05ccd5dfe 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -68,6 +68,7 @@ enum {
68 PARSE_EVENTS__TERM_TYPE_STACKSIZE, 68 PARSE_EVENTS__TERM_TYPE_STACKSIZE,
69 PARSE_EVENTS__TERM_TYPE_NOINHERIT, 69 PARSE_EVENTS__TERM_TYPE_NOINHERIT,
70 PARSE_EVENTS__TERM_TYPE_INHERIT, 70 PARSE_EVENTS__TERM_TYPE_INHERIT,
71 PARSE_EVENTS__TERM_TYPE_MAX_STACK,
71 __PARSE_EVENTS__TERM_TYPE_NR, 72 __PARSE_EVENTS__TERM_TYPE_NR,
72}; 73};
73 74
diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l
index 1477fbc78993..01af1ee90a27 100644
--- a/tools/perf/util/parse-events.l
+++ b/tools/perf/util/parse-events.l
@@ -199,6 +199,7 @@ branch_type { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE
199time { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_TIME); } 199time { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_TIME); }
200call-graph { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CALLGRAPH); } 200call-graph { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CALLGRAPH); }
201stack-size { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_STACKSIZE); } 201stack-size { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_STACKSIZE); }
202max-stack { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_MAX_STACK); }
202inherit { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_INHERIT); } 203inherit { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_INHERIT); }
203no-inherit { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_NOINHERIT); } 204no-inherit { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_NOINHERIT); }
204, { return ','; } 205, { return ','; }
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 2335b2824d8a..43d30ea87b7e 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -593,6 +593,7 @@ do { \
593 if (bswap_safe(f, 0)) \ 593 if (bswap_safe(f, 0)) \
594 attr->f = bswap_##sz(attr->f); \ 594 attr->f = bswap_##sz(attr->f); \
595} while(0) 595} while(0)
596#define bswap_field_16(f) bswap_field(f, 16)
596#define bswap_field_32(f) bswap_field(f, 32) 597#define bswap_field_32(f) bswap_field(f, 32)
597#define bswap_field_64(f) bswap_field(f, 64) 598#define bswap_field_64(f) bswap_field(f, 64)
598 599
@@ -608,6 +609,7 @@ do { \
608 bswap_field_64(sample_regs_user); 609 bswap_field_64(sample_regs_user);
609 bswap_field_32(sample_stack_user); 610 bswap_field_32(sample_stack_user);
610 bswap_field_32(aux_watermark); 611 bswap_field_32(aux_watermark);
612 bswap_field_16(sample_max_stack);
611 613
612 /* 614 /*
613 * After read_format are bitfields. Check read_format because 615 * After read_format are bitfields. Check read_format because