Skip to content

Commit 8e674ae

Browse files
namhyungcaptain5050
namhyung
authored and
captain5050
committed
perf trace: Add --max-summary option
The --max-summary option is to limit the number of output lines for syscall summary stats. The max applies to each entries like thread and cgroups. For total summary, it will just print up to the given number. For example, $ sudo perf trace -as --max-summary 3 sleep 0.1 ThreadPoolServi (1011651), 114 events, 14.8% syscall calls errors total min avg max stddev (msec) (msec) (msec) (msec) (%) --------------- -------- ------ -------- --------- --------- --------- ------ epoll_wait 38 0 95.589 0.000 2.515 11.153 28.98% futex 9 0 0.040 0.002 0.004 0.014 28.63% read 10 0 0.037 0.003 0.004 0.005 4.67% sleep (1050529), 250 events, 32.4% syscall calls errors total min avg max stddev (msec) (msec) (msec) (msec) (%) --------------- -------- ------ -------- --------- --------- --------- ------ clock_nanosleep 1 0 100.156 100.156 100.156 100.156 0.00% execve 4 3 1.020 0.005 0.255 0.989 95.93% openat 36 17 0.416 0.003 0.012 0.029 10.58% ... And this is for per-cgroup summary using BPF. $ sudo perf trace -as --max-summary 3 --summary-mode=cgroup --bpf-summary sleep 0.1 cgroup /user.slice/user-657345.slice/[email protected]/session.slice/[email protected], 12 events syscall calls errors total min avg max stddev (msec) (msec) (msec) (msec) (%) --------------- -------- ------ -------- --------- --------- --------- ------ recvmsg 8 7 0.016 0.001 0.002 0.006 39.73% ppoll 1 0 0.014 0.014 0.014 0.014 0.00% write 2 0 0.010 0.002 0.005 0.008 61.02% cgroup /user.slice/user-657345.slice/session-4.scope, 73 events syscall calls errors total min avg max stddev (msec) (msec) (msec) (msec) (%) --------------- -------- ------ -------- --------- --------- --------- ------ epoll_wait 8 0 13.461 0.010 1.683 12.235 89.66% ioctl 20 0 0.204 0.001 0.010 0.113 54.01% writev 11 0 0.164 0.004 0.015 0.042 20.34% Signed-off-by: Namhyung Kim <[email protected]> Reviewed-by: Howard Chu <[email protected]>
1 parent f0c0a23 commit 8e674ae

File tree

4 files changed

+38
-20
lines changed

4 files changed

+38
-20
lines changed

‎tools/perf/Documentation/perf-trace.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,10 @@ the thread executes on the designated CPUs. Default is to monitor all CPUs.
249249
works well with -s/--summary option where no argument information is
250250
required.
251251

252+
--max-summary=N::
253+
Maximum number of lines in the summary mode. Note that this applies to
254+
each entry (thread or cgroup).
255+
252256

253257
PAGEFAULTS
254258
----------

‎tools/perf/builtin-trace.c‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ struct trace {
196196
unsigned int max_stack;
197197
unsigned int min_stack;
198198
enum trace_summary_mode summary_mode;
199+
int max_summary;
199200
int raw_augmented_syscalls_args_size;
200201
bool raw_augmented_syscalls;
201202
bool fd_path_disabled;
@@ -4599,7 +4600,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
45994600
if (!err) {
46004601
if (trace->summary) {
46014602
if (trace->summary_bpf)
4602-
trace_print_bpf_summary(trace->output);
4603+
trace_print_bpf_summary(trace->output, trace->max_summary);
46034604
else if (trace->summary_mode == SUMMARY__BY_TOTAL)
46044605
trace__fprintf_total_summary(trace, trace->output);
46054606
else
@@ -4822,6 +4823,7 @@ static size_t syscall__dump_stats(struct trace *trace, int e_machine, FILE *fp,
48224823
struct hashmap *syscall_stats)
48234824
{
48244825
size_t printed = 0;
4826+
int lines = 0;
48254827
struct syscall *sc;
48264828
struct syscall_entry *entries;
48274829

@@ -4866,7 +4868,11 @@ static size_t syscall__dump_stats(struct trace *trace, int e_machine, FILE *fp,
48664868
fprintf(fp, "\t\t\t\t%s: %d\n", perf_env__arch_strerrno(trace->host->env, e + 1), stats->errnos[e]);
48674869
}
48684870
}
4871+
lines++;
48694872
}
4873+
4874+
if (trace->max_summary && trace->max_summary <= lines)
4875+
break;
48704876
}
48714877

48724878
free(entries);
@@ -5443,6 +5449,8 @@ int cmd_trace(int argc, const char **argv)
54435449
OPT_BOOLEAN(0, "force-btf", &trace.force_btf, "Prefer btf_dump general pretty printer"
54445450
"to customized ones"),
54455451
OPT_BOOLEAN(0, "bpf-summary", &trace.summary_bpf, "Summary syscall stats in BPF"),
5452+
OPT_INTEGER(0, "max-summary", &trace.max_summary,
5453+
"Max number of entries in the summary."),
54465454
OPTS_EVSWITCH(&trace.evswitch),
54475455
OPT_END()
54485456
};

‎tools/perf/util/bpf-trace-summary.c‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,14 @@ static bool sc_node_equal(long key1, long key2, void *ctx __maybe_unused)
138138
return key1 == key2;
139139
}
140140

141-
static int print_common_stats(struct syscall_data *data, FILE *fp)
141+
static int print_common_stats(struct syscall_data *data, int max_summary, FILE *fp)
142142
{
143143
int printed = 0;
144144

145-
for (int i = 0; i < data->nr_nodes; i++) {
145+
if (max_summary == 0 || max_summary > data->nr_nodes)
146+
max_summary = data->nr_nodes;
147+
148+
for (int i = 0; i < max_summary; i++) {
146149
struct syscall_node *node = &data->nodes[i];
147150
struct syscall_stats *stat = &node->stats;
148151
double total = (double)(stat->total_time) / NSEC_PER_MSEC;
@@ -200,7 +203,7 @@ static int update_thread_stats(struct hashmap *hash, struct syscall_key *map_key
200203
return 0;
201204
}
202205

203-
static int print_thread_stat(struct syscall_data *data, FILE *fp)
206+
static int print_thread_stat(struct syscall_data *data, int max_summary, FILE *fp)
204207
{
205208
int printed = 0;
206209

@@ -213,18 +216,18 @@ static int print_thread_stat(struct syscall_data *data, FILE *fp)
213216
printed += fprintf(fp, " (msec) (msec) (msec) (msec) (%%)\n");
214217
printed += fprintf(fp, " --------------- -------- ------ -------- --------- --------- --------- ------\n");
215218

216-
printed += print_common_stats(data, fp);
219+
printed += print_common_stats(data, max_summary, fp);
217220
printed += fprintf(fp, "\n\n");
218221

219222
return printed;
220223
}
221224

222-
static int print_thread_stats(struct syscall_data **data, int nr_data, FILE *fp)
225+
static int print_thread_stats(struct syscall_data **data, int nr_data, int max_summary, FILE *fp)
223226
{
224227
int printed = 0;
225228

226229
for (int i = 0; i < nr_data; i++)
227-
printed += print_thread_stat(data[i], fp);
230+
printed += print_thread_stat(data[i], max_summary, fp);
228231

229232
return printed;
230233
}
@@ -277,7 +280,7 @@ static int update_total_stats(struct hashmap *hash, struct syscall_key *map_key,
277280
return 0;
278281
}
279282

280-
static int print_total_stats(struct syscall_data **data, int nr_data, FILE *fp)
283+
static int print_total_stats(struct syscall_data **data, int nr_data, int max_summary, FILE *fp)
281284
{
282285
int printed = 0;
283286
int nr_events = 0;
@@ -291,8 +294,11 @@ static int print_total_stats(struct syscall_data **data, int nr_data, FILE *fp)
291294
printed += fprintf(fp, " (msec) (msec) (msec) (msec) (%%)\n");
292295
printed += fprintf(fp, " --------------- -------- ------ -------- --------- --------- --------- ------\n");
293296

294-
for (int i = 0; i < nr_data; i++)
295-
printed += print_common_stats(data[i], fp);
297+
if (max_summary == 0 || max_summary > nr_data)
298+
max_summary = nr_data;
299+
300+
for (int i = 0; i < max_summary; i++)
301+
printed += print_common_stats(data[i], max_summary, fp);
296302

297303
printed += fprintf(fp, "\n\n");
298304
return printed;
@@ -333,7 +339,7 @@ static int update_cgroup_stats(struct hashmap *hash, struct syscall_key *map_key
333339
return 0;
334340
}
335341

336-
static int print_cgroup_stat(struct syscall_data *data, FILE *fp)
342+
static int print_cgroup_stat(struct syscall_data *data, int max_summary, FILE *fp)
337343
{
338344
int printed = 0;
339345
struct cgroup *cgrp = __cgroup__find(&cgroups, data->key);
@@ -351,23 +357,23 @@ static int print_cgroup_stat(struct syscall_data *data, FILE *fp)
351357
printed += fprintf(fp, " (msec) (msec) (msec) (msec) (%%)\n");
352358
printed += fprintf(fp, " --------------- -------- ------ -------- --------- --------- --------- ------\n");
353359

354-
printed += print_common_stats(data, fp);
360+
printed += print_common_stats(data, max_summary, fp);
355361
printed += fprintf(fp, "\n\n");
356362

357363
return printed;
358364
}
359365

360-
static int print_cgroup_stats(struct syscall_data **data, int nr_data, FILE *fp)
366+
static int print_cgroup_stats(struct syscall_data **data, int nr_data, int max_summary, FILE *fp)
361367
{
362368
int printed = 0;
363369

364370
for (int i = 0; i < nr_data; i++)
365-
printed += print_cgroup_stat(data[i], fp);
371+
printed += print_cgroup_stat(data[i], max_summary, fp);
366372

367373
return printed;
368374
}
369375

370-
int trace_print_bpf_summary(FILE *fp)
376+
int trace_print_bpf_summary(FILE *fp, int max_summary)
371377
{
372378
struct bpf_map *map = skel->maps.syscall_stats_map;
373379
struct syscall_key *prev_key, key;
@@ -420,13 +426,13 @@ int trace_print_bpf_summary(FILE *fp)
420426

421427
switch (skel->rodata->aggr_mode) {
422428
case SYSCALL_AGGR_THREAD:
423-
printed += print_thread_stats(data, nr_data, fp);
429+
printed += print_thread_stats(data, nr_data, max_summary, fp);
424430
break;
425431
case SYSCALL_AGGR_CPU:
426-
printed += print_total_stats(data, nr_data, fp);
432+
printed += print_total_stats(data, nr_data, max_summary, fp);
427433
break;
428434
case SYSCALL_AGGR_CGROUP:
429-
printed += print_cgroup_stats(data, nr_data, fp);
435+
printed += print_cgroup_stats(data, nr_data, max_summary, fp);
430436
break;
431437
default:
432438
break;

‎tools/perf/util/trace.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ enum trace_summary_mode {
1616
int trace_prepare_bpf_summary(enum trace_summary_mode mode);
1717
void trace_start_bpf_summary(void);
1818
void trace_end_bpf_summary(void);
19-
int trace_print_bpf_summary(FILE *fp);
19+
int trace_print_bpf_summary(FILE *fp, int max_summary);
2020
void trace_cleanup_bpf_summary(void);
2121

2222
#else /* !HAVE_BPF_SKEL */
@@ -27,7 +27,7 @@ static inline int trace_prepare_bpf_summary(enum trace_summary_mode mode __maybe
2727
}
2828
static inline void trace_start_bpf_summary(void) {}
2929
static inline void trace_end_bpf_summary(void) {}
30-
static inline int trace_print_bpf_summary(FILE *fp __maybe_unused)
30+
static inline int trace_print_bpf_summary(FILE *fp __maybe_unused, int max_summary __maybe_unused)
3131
{
3232
return 0;
3333
}

0 commit comments

Comments
 (0)