Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+29 -2
+1
tools/perf/util/callchain.h
··· 94 94 enum perf_call_graph_mode record_mode; 95 95 u32 dump_size; 96 96 enum chain_mode mode; 97 + u16 max_stack; 97 98 u32 print_limit; 98 99 double min_percent; 99 100 sort_chain_func_t sort;
+14 -2
tools/perf/util/evsel.c
··· 572 572 573 573 perf_evsel__set_sample_bit(evsel, CALLCHAIN); 574 574 575 + attr->sample_max_stack = param->max_stack; 576 + 575 577 if (param->record_mode == CALLCHAIN_LBR) { 576 578 if (!opts->branch_stack) { 577 579 if (attr->exclude_user) { ··· 637 635 struct perf_event_attr *attr = &evsel->attr; 638 636 struct callchain_param param; 639 637 u32 dump_size = 0; 640 - char *callgraph_buf = NULL; 638 + int max_stack = 0; 639 + const char *callgraph_buf = NULL; 641 640 642 641 /* callgraph default */ 643 642 param.record_mode = callchain_param.record_mode; ··· 665 662 case PERF_EVSEL__CONFIG_TERM_STACK_USER: 666 663 dump_size = term->val.stack_user; 667 664 break; 665 + case PERF_EVSEL__CONFIG_TERM_MAX_STACK: 666 + max_stack = term->val.max_stack; 667 + break; 668 668 case PERF_EVSEL__CONFIG_TERM_INHERIT: 669 669 /* 670 670 * attr->inherit should has already been set by ··· 683 677 } 684 678 685 679 /* User explicitly set per-event callgraph, clear the old setting and reset. */ 686 - if ((callgraph_buf != NULL) || (dump_size > 0)) { 680 + if ((callgraph_buf != NULL) || (dump_size > 0) || max_stack) { 681 + if (max_stack) { 682 + param.max_stack = max_stack; 683 + if (callgraph_buf == NULL) 684 + callgraph_buf = "fp"; 685 + } 687 686 688 687 /* parse callgraph parameters */ 689 688 if (callgraph_buf != NULL) { ··· 1340 1329 PRINT_ATTRf(clockid, p_signed); 1341 1330 PRINT_ATTRf(sample_regs_intr, p_hex); 1342 1331 PRINT_ATTRf(aux_watermark, p_unsigned); 1332 + PRINT_ATTRf(sample_max_stack, p_unsigned); 1343 1333 1344 1334 return ret; 1345 1335 }
+2
tools/perf/util/evsel.h
··· 44 44 PERF_EVSEL__CONFIG_TERM_CALLGRAPH, 45 45 PERF_EVSEL__CONFIG_TERM_STACK_USER, 46 46 PERF_EVSEL__CONFIG_TERM_INHERIT, 47 + PERF_EVSEL__CONFIG_TERM_MAX_STACK, 47 48 PERF_EVSEL__CONFIG_TERM_MAX, 48 49 }; 49 50 ··· 57 56 bool time; 58 57 char *callgraph; 59 58 u64 stack_user; 59 + int max_stack; 60 60 bool inherit; 61 61 } val; 62 62 };
+8
tools/perf/util/parse-events.c
··· 900 900 [PARSE_EVENTS__TERM_TYPE_STACKSIZE] = "stack-size", 901 901 [PARSE_EVENTS__TERM_TYPE_NOINHERIT] = "no-inherit", 902 902 [PARSE_EVENTS__TERM_TYPE_INHERIT] = "inherit", 903 + [PARSE_EVENTS__TERM_TYPE_MAX_STACK] = "max-stack", 903 904 }; 904 905 905 906 static bool config_term_shrinked; ··· 996 995 case PARSE_EVENTS__TERM_TYPE_NAME: 997 996 CHECK_TYPE_VAL(STR); 998 997 break; 998 + case PARSE_EVENTS__TERM_TYPE_MAX_STACK: 999 + CHECK_TYPE_VAL(NUM); 1000 + break; 999 1001 default: 1000 1002 err->str = strdup("unknown term"); 1001 1003 err->idx = term->err_term; ··· 1044 1040 case PARSE_EVENTS__TERM_TYPE_STACKSIZE: 1045 1041 case PARSE_EVENTS__TERM_TYPE_INHERIT: 1046 1042 case PARSE_EVENTS__TERM_TYPE_NOINHERIT: 1043 + case PARSE_EVENTS__TERM_TYPE_MAX_STACK: 1047 1044 return config_term_common(attr, term, err); 1048 1045 default: 1049 1046 if (err) { ··· 1113 1108 break; 1114 1109 case PARSE_EVENTS__TERM_TYPE_NOINHERIT: 1115 1110 ADD_CONFIG_TERM(INHERIT, inherit, term->val.num ? 0 : 1); 1111 + break; 1112 + case PARSE_EVENTS__TERM_TYPE_MAX_STACK: 1113 + ADD_CONFIG_TERM(MAX_STACK, max_stack, term->val.num); 1116 1114 break; 1117 1115 default: 1118 1116 break;
+1
tools/perf/util/parse-events.h
··· 68 68 PARSE_EVENTS__TERM_TYPE_STACKSIZE, 69 69 PARSE_EVENTS__TERM_TYPE_NOINHERIT, 70 70 PARSE_EVENTS__TERM_TYPE_INHERIT, 71 + PARSE_EVENTS__TERM_TYPE_MAX_STACK, 71 72 __PARSE_EVENTS__TERM_TYPE_NR, 72 73 }; 73 74
+1
tools/perf/util/parse-events.l
··· 199 199 time { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_TIME); } 200 200 call-graph { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CALLGRAPH); } 201 201 stack-size { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_STACKSIZE); } 202 + max-stack { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_MAX_STACK); } 202 203 inherit { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_INHERIT); } 203 204 no-inherit { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_NOINHERIT); } 204 205 , { return ','; }
+2
tools/perf/util/session.c
··· 593 593 if (bswap_safe(f, 0)) \ 594 594 attr->f = bswap_##sz(attr->f); \ 595 595 } while(0) 596 + #define bswap_field_16(f) bswap_field(f, 16) 596 597 #define bswap_field_32(f) bswap_field(f, 32) 597 598 #define bswap_field_64(f) bswap_field(f, 64) 598 599 ··· 609 608 bswap_field_64(sample_regs_user); 610 609 bswap_field_32(sample_stack_user); 611 610 bswap_field_32(aux_watermark); 611 + bswap_field_16(sample_max_stack); 612 612 613 613 /* 614 614 * After read_format are bitfields. Check read_format because