perf: Fix "kernel lock contention analysis" test by not printing warnings in quiet mode
v2 cover perf: Fix "kernel lock contention analysis" test by not printing warnings in quiet mode
This is V2, but the previous patch was titled 'perf: Fix "Track with sched_switch" test by not printing warnings in quiet mode'
Changes since V1:
* Add a commit to make the behavior consistent between tools and update the docs
* Fix the incorrect test name in the commit message
James Clark (2):
perf: Fix "kernel lock contention analysis" test by not printing
warnings in quiet mode
perf: Make quiet mode consistent between tools
tools/perf/Documentation/perf-annotate.txt | 2 +- tools/perf/Documentation/perf-diff.txt | 2 +- tools/perf/Documentation/perf-lock.txt | 2 +- tools/perf/Documentation/perf-probe.txt | 2 +- tools/perf/Documentation/perf-record.txt | 2 +- tools/perf/Documentation/perf-report.txt | 2 +- tools/perf/Documentation/perf-stat.txt | 4 ++-- tools/perf/bench/numa.c | 9 +++++---- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-diff.c | 2 +- tools/perf/builtin-lock.c | 2 +- tools/perf/builtin-probe.c | 7 +++---- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-stat.c | 8 ++++---- tools/perf/ui/util.c | 5 +++++ tools/perf/util/stat.h | 1 - 17 files changed, 30 insertions(+), 26 deletions(-)
Signature · 1 line
2.28.0
PATCH v2 1/2 perf: Fix "kernel lock contention analysis" test by not printing warnings in quiet mode
Especially when CONFIG_LOCKDEP and other debug configs are enabled, Perf can print the following warning when running the "kernel lock contention analysis" test:
Warning:
Processed 1378918 events and lost 4 chunks!
Check IO/CPU overload!
Warning:
Processed 4593325 samples and lost 70.00%!
The test already supplies -q to run in quiet mode, so extend quiet mode to perf_stdio__warning() and also ui__warning() for consistency.
This fixes the following failure due to the extra lines counted:
perf test "lock cont" -vvv
82: kernel lock contention analysis test :
--- start ---
test child forked, pid 3125
Testing perf lock record and perf lock contention [Fail] Recorded result count is not 1: 9 test child finished with -1
---- end ----
kernel lock contention analysis test: FAILED!
--- tools/perf/ui/util.c | 5 +++++ 1 file changed, 5 insertions(+)
tools/perf/ui/util.c +5 -0
@@ -15,6 +15,9 @@ static int perf_stdio__error(const char *format, va_list args)static int perf_stdio__warning (const char *format,va_list args) { +if (quiet) +return 0 ; +fprintf (stderr,"Warning:\n" );vfprintf (stderr, format, args);return 0 ;
@@ -45,6 +48,8 @@ int ui__warning(const char *format, ...) {int ret;va_list args; +if (quiet) +return 0 ;va_start (args, format); ret = perf_eops->warning (format, args);
Signature · 1 line
2.28.0
PATCH v2 2/2 perf: Make quiet mode consistent between tools
In reply to James ClarkUse the global quiet variable everywhere so that all tools hide warnings in quiet mode and update the documentation to reflect this.
Perf-probe claimed that errors are not printed in quiet mode but I don't see this so remove it from the docs.
--- tools/perf/Documentation/perf-annotate.txt | 2 +- tools/perf/Documentation/perf-diff.txt | 2 +- tools/perf/Documentation/perf-lock.txt | 2 +- tools/perf/Documentation/perf-probe.txt | 2 +- tools/perf/Documentation/perf-record.txt | 2 +- tools/perf/Documentation/perf-report.txt | 2 +- tools/perf/Documentation/perf-stat.txt | 4 ++-- tools/perf/bench/numa.c | 9 +++++---- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-diff.c | 2 +- tools/perf/builtin-lock.c | 2 +- tools/perf/builtin-probe.c | 7 +++---- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-stat.c | 8 ++++---- tools/perf/util/stat.h | 1 - 16 files changed, 25 insertions(+), 26 deletions(-)
tools/perf/Documentation/perf-annotate.txt +1 -1
@@ -41,7 +41,7 @@ OPTIONS -q:: --quiet:: - Do not show any message. (Suppress -v) + Do not show any warnings or messages. (Suppress -v) -n:: --show-nr-samples::
tools/perf/Documentation/perf-diff.txt +1 -1
@@ -75,7 +75,7 @@ OPTIONS -q:: --quiet:: - Do not show any message. (Suppress -v) + Do not show any warnings or messages. (Suppress -v) -f:: --force::
tools/perf/Documentation/perf-lock.txt +1 -1
@@ -42,7 +42,7 @@ COMMON OPTIONS -q:: --quiet:: - Do not show any message. (Suppress -v) + Do not show any warnings or messages. (Suppress -v) -D:: --dump-raw-trace::
tools/perf/Documentation/perf-probe.txt +1 -1
@@ -57,7 +57,7 @@ OPTIONS -q:: --quiet:: - Be quiet (do not show any messages including errors). + Do not show any warnings or messages. Can not use with -v. -a::
tools/perf/Documentation/perf-record.txt +1 -1
@@ -282,7 +282,7 @@ OPTIONS -q:: --quiet:: - Don't print any message, useful for scripting. + Don't print any warnings or messages, useful for scripting. -v:: --verbose::
tools/perf/Documentation/perf-report.txt +1 -1
@@ -27,7 +27,7 @@ OPTIONS -q:: --quiet:: - Do not show any message. (Suppress -v) + Do not show any warnings or messages. (Suppress -v) -n:: --show-nr-samples::
tools/perf/Documentation/perf-stat.txt +2 -2
@@ -354,8 +354,8 @@ forbids the event merging logic from sharing events between groups and may be used to increase accuracy in this case. --quiet:: -Don't print output. This is useful with perf stat record below to only -write data to the perf.data file. +Don't print output, warnings or messages. This is useful with perf stat +record below to only write data to the perf.data file. STAT RECORD -----------
tools/perf/bench/numa.c +5 -4
@@ -16,6 +16,7 @@#include <sched.h> #include <stdio.h> #include <assert.h> +#include <debug.h> #include <malloc.h> #include <signal.h> #include <stdlib.h>
@@ -116,7 +117,6 @@ struct params {long bytes_thread;int nr_tasks; -bool show_quiet;bool show_convergence;bool measure_convergence;
@@ -197,7 +197,8 @@ static const struct option options[] = {OPT_BOOLEAN ('c' ,"show_convergence" , &p0.show_convergence,"show convergence details, " "convergence is reached when each process (all its threads) is running on a single NUMA node." ),OPT_BOOLEAN ('m' ,"measure_convergence" , &p0.measure_convergence,"measure convergence latency" ), -OPT_BOOLEAN ('q' ,"quiet" , &p0.show_quiet,"quiet mode" ), +OPT_BOOLEAN ('q' ,"quiet" , &quiet, +"quiet mode (do not show any warnings or messages)" ), OPT_BOOLEAN('S', "serialize-startup", &p0.serialize_startup,"serialize thread startup"),/* Special option string parsing callbacks: */
@@ -1474,7 +1475,7 @@ static int init(void)/* char array in count_process_nodes(): */ BUG_ON (g->p.nr_nodes <0 ); -if (g->p.show_quiet && !g->p.show_details) +if (quiet && !g->p.show_details) g->p.show_details =-1 ;/* Some memory should be specified: */
@@ -1553,7 +1554,7 @@ static void print_res(const char *name, double val,if (!name) name ="main," ; -if (!g->p.show_quiet) +if (!quiet)printf (" %-30s %15.3f, %-15s %s\n" , name, val, txt_unit, txt_short);else printf (" %14.3f %s\n" , val, txt_long);
tools/perf/builtin-annotate.c +1 -1
@@ -525,7 +525,7 @@ int cmd_annotate(int argc, const char **argv)OPT_BOOLEAN ('f' ,"force" , &data.force,"don't complain, do it" ),OPT_INCR ('v' ,"verbose" , &verbose,"be more verbose (show symbol address, etc)" ), -OPT_BOOLEAN ('q' ,"quiet" , &quiet,"do now show any message" ), +OPT_BOOLEAN ('q' ,"quiet" , &quiet,"do now show any warnings or messages" ),OPT_BOOLEAN ('D' ,"dump-raw-trace" , &dump_trace,"dump raw trace in ASCII" ), #ifdef HAVE_GTK2_SUPPORT
tools/perf/builtin-diff.c +1 -1
@@ -1260,7 +1260,7 @@ static const char * const diff_usage[] = {static const struct option options[] = {OPT_INCR ('v' ,"verbose" , &verbose,"be more verbose (show symbol address, etc)" ), -OPT_BOOLEAN ('q' ,"quiet" , &quiet,"Do not show any message" ), +OPT_BOOLEAN ('q' ,"quiet" , &quiet,"Do not show any warnings or messages" ),OPT_BOOLEAN ('b' ,"baseline-only" , &show_baseline_only,"Show only items with match in baseline" ), OPT_CALLBACK('c', "compute", &compute,
tools/perf/builtin-lock.c +1 -1
@@ -1869,7 +1869,7 @@ int cmd_lock(int argc, const char **argv) "file", "vmlinux pathname"),OPT_STRING (0 ,"kallsyms" , &symbol_conf.kallsyms_name,"file" ,"kallsyms pathname" ), -OPT_BOOLEAN ('q' ,"quiet" , &quiet,"Do not show any message" ), +OPT_BOOLEAN ('q' ,"quiet" , &quiet,"Do not show any warnings or messages" ), OPT_END() };
tools/perf/builtin-probe.c +3 -4
@@ -40,7 +40,6 @@ static struct {int command;/* Command short_name */ bool list_events;bool uprobes; -bool quiet;bool target_used;int nevents;struct perf_probe_event events[MAX_PROBES ];
@@ -514,8 +513,8 @@ __cmd_probe(int argc, const char **argv)struct option options[] = {OPT_INCR ('v' ,"verbose" , &verbose,"be more verbose (show parsed arguments, etc)" ), -OPT_BOOLEAN ('q' ,"quiet" , ¶ms.quiet, -"be quiet (do not show any messages)" ), +OPT_BOOLEAN ('q' ,"quiet" , &quiet, +"be quiet (do not show any warnings or messages)" ),OPT_CALLBACK_DEFAULT ('l' ,"list" ,NULL ,"[GROUP:]EVENT" ,"list up probe events" , opt_set_filter_with_command,DEFAULT_LIST_FILTER ),
@@ -634,7 +633,7 @@ __cmd_probe(int argc, const char **argv)if (ret)return ret; -if (params.quiet) { +if (quiet) {if (verbose !=0 ) {pr_err (" Error: -v and -q are exclusive.\n" );return -EINVAL ;
tools/perf/builtin-record.c +1 -1
@@ -3379,7 +3379,7 @@ static struct option __record_options[] = { &record_parse_callchain_opt),OPT_INCR ('v' ,"verbose" , &verbose,"be more verbose (show counter open errors, etc)" ), -OPT_BOOLEAN ('q' ,"quiet" , &quiet,"don't print any message" ), +OPT_BOOLEAN ('q' ,"quiet" , &quiet,"don't print any warnings or messages" ),OPT_BOOLEAN ('s' ,"stat" , &record.opts.inherit_stat,"per thread counts" ), OPT_BOOLEAN('d', "data", &record.opts.sample_address, "Record the sample addresses"),
tools/perf/builtin-report.c +1 -1
@@ -1222,7 +1222,7 @@ int cmd_report(int argc, const char **argv) "input file name"),OPT_INCR ('v' ,"verbose" , &verbose,"be more verbose (show symbol address, etc)" ), -OPT_BOOLEAN ('q' ,"quiet" , &quiet,"Do not show any message" ), +OPT_BOOLEAN ('q' ,"quiet" , &quiet,"Do not show any warnings or messages" ),OPT_BOOLEAN ('D' ,"dump-raw-trace" , &dump_trace,"dump raw trace in ASCII" ), OPT_BOOLEAN(0, "stats", &report.stats_mode, "Display event stats"),
tools/perf/builtin-stat.c +4 -4
@@ -1023,7 +1023,7 @@ static void print_counters(struct timespec *ts, int argc, const char **argv)/* Do not print anything if we record to the pipe. */ if (STAT_RECORD && perf_stat.data.is_pipe)return ; -if (stat_config.quiet) +if (quiet)return ;evlist__print_counters (evsel_list, &stat_config, &target, ts, argc, argv);
@@ -1273,8 +1273,8 @@ static struct option stat_options[] = { "print summary for interval mode"),OPT_BOOLEAN (0 ,"no-csv-summary" , &stat_config.no_csv_summary,"don't print 'summary' for CSV summary output" ), -OPT_BOOLEAN (0 ,"quiet" , &stat_config.quiet, -"don't print output (useful with record)" ), +OPT_BOOLEAN (0 ,"quiet" , &quiet, +"don't print any output, messages or warnings (useful with record)" ), OPT_CALLBACK(0, "cputype", &evsel_list, "hybrid cpu type", "Only enable events on applying cpu with this type " "for hybrid platform (e.g. core or atom)",
@@ -2277,7 +2277,7 @@ int cmd_stat(int argc, const char **argv) goto out; } -if (!output && !stat_config.quiet) { +if (!output && !quiet) {struct timespec tm; mode = append_file ?"a" :"w" ;
tools/perf/util/stat.h +0 -1
@@ -139,7 +139,6 @@ struct perf_stat_config {bool metric_no_group;bool metric_no_merge;bool stop_read_counter; -bool quiet;bool iostat_run;char *user_requested_cpu_list;bool system_wide;
Signature · 1 line
2.28.0
Arnaldo Carvalho de Melo
maintainerEm Tue, Oct 18, 2022 at 10:41:34AM +0100, James Clark escreveu:
Quoted 8 lines
This is V2, but the previous patch was titled 'perf: Fix "Track with
sched_switch" test by not printing warnings in quiet mode'Changes since V1:
* Add a commit to make the behavior consistent between tools and update the docs
* Fix the incorrect test name in the commit message
Namhyung, can I have your Acked-by, even you having some reservation about this? You said that if this was the way forward, then documentation should reflect that, which James did, so, wdyt?
- Arnaldo
Quoted 26 lines
James Clark (2):
perf: Fix "kernel lock contention analysis" test by not printing
warnings in quiet mode
perf: Make quiet mode consistent between toolstools/perf/Documentation/perf-annotate.txt | 2 +- tools/perf/Documentation/perf-diff.txt | 2 +- tools/perf/Documentation/perf-lock.txt | 2 +- tools/perf/Documentation/perf-probe.txt | 2 +- tools/perf/Documentation/perf-record.txt | 2 +- tools/perf/Documentation/perf-report.txt | 2 +- tools/perf/Documentation/perf-stat.txt | 4 ++-- tools/perf/bench/numa.c | 9 +++++---- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-diff.c | 2 +- tools/perf/builtin-lock.c | 2 +- tools/perf/builtin-probe.c | 7 +++---- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-stat.c | 8 ++++---- tools/perf/ui/util.c | 5 +++++ tools/perf/util/stat.h | 1 - 17 files changed, 30 insertions(+), 26 deletions(-)Signature · 1 line
2.28.0
Signature · 1 line
- Arnaldo
Em Tue, Oct 18, 2022 at 10:41:34AM +0100, James Clark escreveu:
Quoted 8 lines
This is V2, but the previous patch was titled 'perf: Fix "Track with
sched_switch" test by not printing warnings in quiet mode'Changes since V1:
* Add a commit to make the behavior consistent between tools and update the docs
* Fix the incorrect test name in the commit message
Thanks, applied.
- Arnaldo
Quoted 26 lines
James Clark (2):
perf: Fix "kernel lock contention analysis" test by not printing
warnings in quiet mode
perf: Make quiet mode consistent between toolstools/perf/Documentation/perf-annotate.txt | 2 +- tools/perf/Documentation/perf-diff.txt | 2 +- tools/perf/Documentation/perf-lock.txt | 2 +- tools/perf/Documentation/perf-probe.txt | 2 +- tools/perf/Documentation/perf-record.txt | 2 +- tools/perf/Documentation/perf-report.txt | 2 +- tools/perf/Documentation/perf-stat.txt | 4 ++-- tools/perf/bench/numa.c | 9 +++++---- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-diff.c | 2 +- tools/perf/builtin-lock.c | 2 +- tools/perf/builtin-probe.c | 7 +++---- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-stat.c | 8 ++++---- tools/perf/ui/util.c | 5 +++++ tools/perf/util/stat.h | 1 - 17 files changed, 30 insertions(+), 26 deletions(-)Signature · 1 line
2.28.0
Signature · 1 line
- Arnaldo