From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2760C5DF60 for ; Fri, 8 Nov 2019 18:25:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BAC81215EA for ; Fri, 8 Nov 2019 18:25:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BdFPSdwW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727889AbfKHSZ1 (ORCPT ); Fri, 8 Nov 2019 13:25:27 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:43512 "EHLO mail-qv1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726152AbfKHSZ1 (ORCPT ); Fri, 8 Nov 2019 13:25:27 -0500 Received: by mail-qv1-f51.google.com with SMTP id cg2so2571544qvb.10 for ; Fri, 08 Nov 2019 10:25:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=/zawH8E5Iik4irQZDcFHkIRBzKfbWIDzeKd69/F1648=; b=BdFPSdwW7t5amNGEVuky7/CRuPhg1TznulxBRrddP8YarMCBi/57ueFiGj1pwWT4Y0 q8REHzCSIbkFRS7WdJlNxGDg/0yR+06fKpZqsGY2cDW7i+rD57AUn0p9PMjmVXQOqJ/+ 4/De6t/KeKwhjY1sRpPS6FEHJYsVCu8JJJAIhEG5J8rO//RBTzFu+jBnAjcXQTIsKh6i 2FH8AkLKbEqoMnsriTSH073LfHMBGDhXO04kUFMV2KVvSyrtw/xk+M0NF8eE5iJobiBf ZQEU6JiUY+JXmwBpbJzYVGLeaOuIod02JZ4rguwfWhNaQOSuDIaTbLyaVrQ28b0bha7D uHsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=/zawH8E5Iik4irQZDcFHkIRBzKfbWIDzeKd69/F1648=; b=nxUVyiESCTBDy6DKtaMGl13WrFtbWA8zvwATAnxSn0Lb0sCkpe69bVk4rJG0dRcgqg sZQueGOJ25ZVXf+4fJ15prktE6b4EZzcg2PFswnbBR/irPzd8+OtK5EZzea81c884+bS DWkxnrcHwXnHJTu1VK0SXThHtQiL1ZsFEyxuBgg9FH1h1qqWirT9QmdE3GDZytjvAHZf ju4et6MZidDAk51ugy4yJCbxrk+jGeBdGhKkHrf/+84jMrtZOlmhbfZhyQNmxbQxHavs JRdMIeX9+3mzfkpcSzMMSM5HkYDm4Wm1pVmsYg3+zUCZEjYCWFYgHGynJSZSlMiMxNMk 1HTw== X-Gm-Message-State: APjAAAXz+2w2+Y6alwhIR4f3y59bmkHN7RCkyMxZkXLUJk2vGPFRtB3Q lmjZQmlQdqFbLq5FtcPeTzS60KxSzek= X-Google-Smtp-Source: APXvYqxZqP7yJSp+YhTBZ34nfqNUCdr5djzoQ+2T/iPXohjOUyuYdI25gw+GNM3TYsB91H3cTwVPdA== X-Received: by 2002:a0c:fe11:: with SMTP id x17mr11099180qvr.162.1573237525848; Fri, 08 Nov 2019 10:25:25 -0800 (PST) Received: from quaco.ghostprotocols.net ([177.195.211.140]) by smtp.gmail.com with ESMTPSA id o3sm4183057qta.3.2019.11.08.10.25.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2019 10:25:25 -0800 (PST) From: Arnaldo Carvalho de Melo X-Google-Original-From: Arnaldo Carvalho de Melo Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 046D1411B3; Fri, 8 Nov 2019 15:25:21 -0300 (-03) Date: Fri, 8 Nov 2019 15:25:21 -0300 To: Jiri Olsa Cc: Ian Rogers , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ravi Bangoria , Anju T Sudhakar , Christian Borntraeger , Thomas Richter , Andi Kleen , Jin Yao , Allison Randal , Davidlohr Bueso , Thomas Gleixner , Adrian Hunter , linux-kernel@vger.kernel.org, Stephane Eranian Subject: Re: [PATCH] perf tools: report initial event parsing error Message-ID: <20191108182521.GA28896@kernel.org> References: <20191107222315.GA7261@kernel.org> <20191108181533.222053-1-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191108181533.222053-1-irogers@google.com> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.12.1 (2019-06-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Fri, Nov 08, 2019 at 10:15:33AM -0800, Ian Rogers escreveu: > Record the first event parsing error and report. Implementing feedback > from Jiri Olsa: > https://lkml.org/lkml/2019/10/28/680 > > An example error is: > > $ tools/perf/perf stat -e c/c/ > WARNING: multiple event parsing errors > event syntax error: 'c/c/' > \___ unknown term > > valid terms: event,filter_rem,filter_opc0,edge,filter_isoc,filter_tid,filter_loc,filter_nc,inv,umask,filter_opc1,tid_en,thresh,filter_all_op,filter_not_nm,filter_state,filter_nm,config,config1,config2,name,period,percore > > Initial error: > event syntax error: 'c/c/' > \___ Cannot find PMU `c'. Missing kernel support? > Run 'perf list' for a list of valid events > > Usage: perf stat [] [] > > -e, --event event selector. use 'perf list' to list available events Jiri, I couldn't find your Acked-by for this one, have you provided it? - Arnaldo > Signed-off-by: Ian Rogers > --- > tools/perf/arch/powerpc/util/kvm-stat.c | 9 ++- > tools/perf/builtin-stat.c | 2 + > tools/perf/builtin-trace.c | 16 ++++-- > tools/perf/tests/parse-events.c | 3 +- > tools/perf/util/metricgroup.c | 2 +- > tools/perf/util/parse-events.c | 76 ++++++++++++++++++------- > tools/perf/util/parse-events.h | 4 ++ > 7 files changed, 84 insertions(+), 28 deletions(-) > > diff --git a/tools/perf/arch/powerpc/util/kvm-stat.c b/tools/perf/arch/powerpc/util/kvm-stat.c > index 9cc1c4a9dec4..30f5310373ca 100644 > --- a/tools/perf/arch/powerpc/util/kvm-stat.c > +++ b/tools/perf/arch/powerpc/util/kvm-stat.c > @@ -113,10 +113,15 @@ static int is_tracepoint_available(const char *str, struct evlist *evlist) > struct parse_events_error err; > int ret; > > - err.str = NULL; > + bzero(&err, sizeof(err)); > ret = parse_events(evlist, str, &err); > - if (err.str) > + if (err.str) { > pr_err("%s : %s\n", str, err.str); > + free(&err->str); > + free(&err->help); > + free(&err->first_str); > + free(&err->first_help); > + } > return ret; > } > > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > index 5964e808d73d..0a15253b438c 100644 > --- a/tools/perf/builtin-stat.c > +++ b/tools/perf/builtin-stat.c > @@ -1307,6 +1307,7 @@ static int add_default_attributes(void) > if (stat_config.null_run) > return 0; > > + bzero(&errinfo, sizeof(errinfo)); > if (transaction_run) { > /* Handle -T as -M transaction. Once platform specific metrics > * support has been added to the json files, all archictures > @@ -1364,6 +1365,7 @@ static int add_default_attributes(void) > return -1; > } > if (err) { > + parse_events_print_error(&errinfo, smi_cost_attrs); > fprintf(stderr, "Cannot set up SMI cost events\n"); > return -1; > } > diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c > index 43c05eae1768..46a72ecac427 100644 > --- a/tools/perf/builtin-trace.c > +++ b/tools/perf/builtin-trace.c > @@ -3016,11 +3016,18 @@ static bool evlist__add_vfs_getname(struct evlist *evlist) > { > bool found = false; > struct evsel *evsel, *tmp; > - struct parse_events_error err = { .idx = 0, }; > - int ret = parse_events(evlist, "probe:vfs_getname*", &err); > + struct parse_events_error err; > + int ret; > > - if (ret) > + bzero(&err, sizeof(err)); > + ret = parse_events(evlist, "probe:vfs_getname*", &err); > + if (ret) { > + free(err.str); > + free(err.help); > + free(err.first_str); > + free(err.first_help); > return false; > + } > > evlist__for_each_entry_safe(evlist, evsel, tmp) { > if (!strstarts(perf_evsel__name(evsel), "probe:vfs_getname")) > @@ -4832,8 +4839,9 @@ int cmd_trace(int argc, const char **argv) > * wrong in more detail. > */ > if (trace.perfconfig_events != NULL) { > - struct parse_events_error parse_err = { .idx = 0, }; > + struct parse_events_error parse_err; > > + bzero(&parse_err, sizeof(parse_err)); > err = parse_events(trace.evlist, trace.perfconfig_events, &parse_err); > if (err) { > parse_events_print_error(&parse_err, trace.perfconfig_events); > diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c > index 25e0ed2eedfc..091c3aeccc27 100644 > --- a/tools/perf/tests/parse-events.c > +++ b/tools/perf/tests/parse-events.c > @@ -1768,10 +1768,11 @@ static struct terms_test test__terms[] = { > > static int test_event(struct evlist_test *e) > { > - struct parse_events_error err = { .idx = 0, }; > + struct parse_events_error err; > struct evlist *evlist; > int ret; > > + bzero(&err, sizeof(err)); > if (e->valid && !e->valid()) { > pr_debug("... SKIP"); > return 0; > diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c > index a7c0424dbda3..6a4d350d5cdb 100644 > --- a/tools/perf/util/metricgroup.c > +++ b/tools/perf/util/metricgroup.c > @@ -523,7 +523,7 @@ int metricgroup__parse_groups(const struct option *opt, > if (ret) > return ret; > pr_debug("adding %s\n", extra_events.buf); > - memset(&parse_error, 0, sizeof(struct parse_events_error)); > + bzero(&parse_error, sizeof(parse_error)); > ret = parse_events(perf_evlist, extra_events.buf, &parse_error); > if (ret) { > parse_events_print_error(&parse_error, extra_events.buf); > diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c > index 6d18ff9bce49..a369bbc289b2 100644 > --- a/tools/perf/util/parse-events.c > +++ b/tools/perf/util/parse-events.c > @@ -189,12 +189,29 @@ void parse_events__handle_error(struct parse_events_error *err, int idx, > free(help); > return; > } > - WARN_ONCE(err->str, "WARNING: multiple event parsing errors\n"); > - err->idx = idx; > - free(err->str); > - err->str = str; > - free(err->help); > - err->help = help; > + switch (err->num_errors) { > + case 0: > + err->idx = idx; > + err->str = str; > + err->help = help; > + break; > + case 1: > + err->first_idx = err->idx; > + err->idx = idx; > + err->first_str = err->str; > + err->str = str; > + err->first_help = err->help; > + err->help = help; > + break; > + default: > + WARN_ONCE(1, "WARNING: multiple event parsing errors\n"); > + free(err->str); > + err->str = str; > + free(err->help); > + err->help = help; > + break; > + } > + err->num_errors++; > } > > struct tracepoint_path *tracepoint_id_to_path(u64 config) > @@ -2007,15 +2024,14 @@ static int get_term_width(void) > return ws.ws_col > MAX_WIDTH ? MAX_WIDTH : ws.ws_col; > } > > -void parse_events_print_error(struct parse_events_error *err, > - const char *event) > +static void __parse_events_print_error(int err_idx, const char *err_str, > + const char *err_help, const char *event) > { > const char *str = "invalid or unsupported event: "; > char _buf[MAX_WIDTH]; > char *buf = (char *) event; > int idx = 0; > - > - if (err->str) { > + if (err_str) { > /* -2 for extra '' in the final fprintf */ > int width = get_term_width() - 2; > int len_event = strlen(event); > @@ -2038,8 +2054,8 @@ void parse_events_print_error(struct parse_events_error *err, > buf = _buf; > > /* We're cutting from the beginning. */ > - if (err->idx > max_err_idx) > - cut = err->idx - max_err_idx; > + if (err_idx > max_err_idx) > + cut = err_idx - max_err_idx; > > strncpy(buf, event + cut, max_len); > > @@ -2052,16 +2068,33 @@ void parse_events_print_error(struct parse_events_error *err, > buf[max_len] = 0; > } > > - idx = len_str + err->idx - cut; > + idx = len_str + err_idx - cut; > } > > fprintf(stderr, "%s'%s'\n", str, buf); > if (idx) { > - fprintf(stderr, "%*s\\___ %s\n", idx + 1, "", err->str); > - if (err->help) > - fprintf(stderr, "\n%s\n", err->help); > - zfree(&err->str); > - zfree(&err->help); > + fprintf(stderr, "%*s\\___ %s\n", idx + 1, "", err_str); > + if (err_help) > + fprintf(stderr, "\n%s\n", err_help); > + } > +} > + > +void parse_events_print_error(struct parse_events_error *err, > + const char *event) > +{ > + if (!err->num_errors) > + return; > + > + __parse_events_print_error(err->idx, err->str, err->help, event); > + zfree(&err->str); > + zfree(&err->help); > + > + if (err->num_errors > 1) { > + fputs("\nInitial error:\n", stderr); > + __parse_events_print_error(err->first_idx, err->first_str, > + err->first_help, event); > + zfree(&err->first_str); > + zfree(&err->first_help); > } > } > > @@ -2071,8 +2104,11 @@ int parse_events_option(const struct option *opt, const char *str, > int unset __maybe_unused) > { > struct evlist *evlist = *(struct evlist **)opt->value; > - struct parse_events_error err = { .idx = 0, }; > - int ret = parse_events(evlist, str, &err); > + struct parse_events_error err; > + int ret; > + > + bzero(&err, sizeof(err)); > + ret = parse_events(evlist, str, &err); > > if (ret) { > parse_events_print_error(&err, str); > diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h > index 5ee8ac93840c..ff367f248fe8 100644 > --- a/tools/perf/util/parse-events.h > +++ b/tools/perf/util/parse-events.h > @@ -110,9 +110,13 @@ struct parse_events_term { > }; > > struct parse_events_error { > + int num_errors; /* number of errors encountered */ > int idx; /* index in the parsed string */ > char *str; /* string to display at the index */ > char *help; /* optional help string */ > + int first_idx;/* as above, but for the first encountered error */ > + char *first_str; > + char *first_help; > }; > > struct parse_events_state { > -- > 2.24.0.432.g9d3f5f5b63-goog -- - Arnaldo