Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2144130pxb; Sun, 17 Oct 2021 07:00:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQZWZV7cLrQfJxMzAgYbeWFIOuNycKoPHEwBfkbw6NE20V+TkVq8uilAXWveTZ68K87TAm X-Received: by 2002:a17:906:b796:: with SMTP id dt22mr22946606ejb.456.1634479247278; Sun, 17 Oct 2021 07:00:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634479247; cv=none; d=google.com; s=arc-20160816; b=ctn88nKX6Gg/PZYAfGLuWi4R6+O2OPkjUTGvgWo54cCj5nhcZivpVJ0fQGnwxFP3AZ naW+nuKK91HVCavBepRX1jiuI/1MzxtgDsfa0tIKjxFmnKz82rsk0SZdaon6KlA19JsZ MgckapnYgoBvCEcZQ04pzdWvfBO7javzbs1rvrprYJlPXGjB5Cd63W5Io0Om5ReokNJa UUiIB9GoiM7vWidq+pBldKR5Q4zCIZuvvRupzw86W2T7uBUOZ4S+r2A+OaulSVBqdf0k e7bqNICakfON+yh9Pq55RBK2f2GTEUWzIJKRaAwCLikQkTl/Tm+utC19m7IpUu+SXqlb FbaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=/ICUTnn0+DHTkHe1Sa2FAQhyptinzYEiREIP815vWD4=; b=zBvY0hGXAdR0EFvRJfwmPEp2pt/FjipNVQjSVAmV2MfR+TdcwV2Rz2Os6nS3cyNYTB B9CJDwwdA+tnRMeOkznJl87H/oybukTSC1JWPuL1ey4ADMzhIf2XBURJyGyZEROyd626 F00txQ+78Pc8ng+W6te0ewV7bW2TnSe7FDUkKO93Ta5aSt281Do2+KUduPg5I3IJaKQ/ oNBmh3rHz0KSOc6CoDsuoUpMVVhN0+aUq0LJLiContoVdJO6kTjTSDKUvjL0/TbxOjVB sJCyvgJwQO+lWGwh5nMGmbdws4A5uV5L7jt8x2p7fymy3fODYwE7FJI8M3k/E9y8a1qL y8Ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="ox/64Jkr"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id si30si15550349ejb.545.2021.10.17.07.00.22; Sun, 17 Oct 2021 07:00:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="ox/64Jkr"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242378AbhJORZj (ORCPT + 99 others); Fri, 15 Oct 2021 13:25:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242360AbhJORZF (ORCPT ); Fri, 15 Oct 2021 13:25:05 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBFF2C061798 for ; Fri, 15 Oct 2021 10:22:26 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id x16-20020a25b910000000b005b6b7f2f91cso12112978ybj.1 for ; Fri, 15 Oct 2021 10:22:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=/ICUTnn0+DHTkHe1Sa2FAQhyptinzYEiREIP815vWD4=; b=ox/64JkrW3jXnk0RlnPstVbJFZZOWV3tK2cfmCw971N9LjBbHfNBWvjw3tzgdVpa87 woqDGI40TwCac71jo1uzm/id843f45ebpMXnd3/XpRMtF4gCA2dSze7kvzugn620pELl eInwgQH9RWGQ3Qk6FsLczjzFBLZ3JH85Wnf81HfUq6i3PVWekKD8fOUdrN0qWx/85Vse TkvMEdvS+UeDOlsJc5ik0CqWM3mUZ21qFjrxGZSVpWoNVPlUJjOx1lkyZZqF12fd1THy 3rIuIKhBBSicB7eBx15dqNtdtmf/xrGJWdWv98mdBWhV+qa2c/ztylfokA4JmXnGLjOi mqLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=/ICUTnn0+DHTkHe1Sa2FAQhyptinzYEiREIP815vWD4=; b=VwQv2495IKf2KkNHAgW+hdLQEQUzcUtaCYhJgd0bRiP4nRg8bHV9JNZEQKQ1YPK0WZ nq4XXAa0AsIoGOSKnAUldZvNiSrZIXDSZEJDwmmqZeMJppw4FORppNKqUxYe5AJHgGgF hkuwUv/JN9AOhChw1MP4sZ3unJsLVAbAti6kfWNk+UZN2KhISwcJSW/EQfkJu9xcbMID QtgxJWqTsbbjv2Uh3q7n1KdGnbd0TGkAylHevmkBrAdw6YhrdXmEyN0HK7nrB9JU7XI8 WuxG+6rMKTlldxbe15mhrse71KDX9uLjKUCfg18Op0rXYkMJX8A9Y1eCOnboNmwwI7jF Wr9A== X-Gm-Message-State: AOAM531UD5SRq2KGY4JGvsO/DBcwgOCgXImI0xQO3ylFbe79Jyn/gX4J q+K4twTu6XidMpvQ472TXfFOinDSs0+A X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:69bc:7451:58ad:6585]) (user=irogers job=sendgmr) by 2002:a25:5b8b:: with SMTP id p133mr14099440ybb.273.1634318545867; Fri, 15 Oct 2021 10:22:25 -0700 (PDT) Date: Fri, 15 Oct 2021 10:21:31 -0700 In-Reply-To: <20211015172132.1162559-1-irogers@google.com> Message-Id: <20211015172132.1162559-21-irogers@google.com> Mime-Version: 1.0 References: <20211015172132.1162559-1-irogers@google.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog Subject: [PATCH v2 20/21] perf parse-events: Identify broken modifiers. From: Ian Rogers To: Andi Kleen , Jiri Olsa , Jin Yao , Namhyung Kim , John Garry , Kajol Jain , "Paul A . Clarke" , Arnaldo Carvalho de Melo , Riccardo Mancini , Kan Liang , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Kees Cook , Sami Tolvanen , Nick Desaulniers , Andrew Morton , Jacob Keller , Zhen Lei , ToastC , Joakim Zhang , Felix Fietkau , Jiapeng Chong , Song Liu , Fabian Hemmer , Alexander Antonov , Nicholas Fraser , Adrian Hunter , Denys Zagorui , Wan Jiabing , Thomas Richter , Sumanth Korikkar , Heiko Carstens , Changbin Du , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Andrew Kilroy Cc: Stephane Eranian , Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Previously the broken modifier causes a usage message to printed but nothing else. After: $ perf stat -e 'cycles:kk' -a sleep 2 event syntax error: 'cycles:kk' \___ Bad modifier Run 'perf list' for a list of valid events Usage: perf stat [] [] -e, --event event selector. use 'perf list' to list available events $ perf stat -e '{instructions,cycles}:kk' -a sleep 2 event syntax error: '..ns,cycles}:kk' \___ Bad modifier Run 'perf list' for a list of valid events Usage: perf stat [] [] -e, --event event selector. use 'perf list' to list available events Acked-by: Andi Kleen Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.y | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 17c8c66f3f51..2d60f3cbe42b 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -183,6 +183,11 @@ group_def ':' PE_MODIFIER_EVENT err = parse_events__modifier_group(list, $3); free($3); if (err) { + struct parse_events_state *parse_state = _parse_state; + struct parse_events_error *error = parse_state->error; + + parse_events__handle_error(error, @3.first_column, + strdup("Bad modifier"), NULL); free_list_evsel(list); YYABORT; } @@ -240,6 +245,11 @@ event_name PE_MODIFIER_EVENT err = parse_events__modifier_event(list, $2, false); free($2); if (err) { + struct parse_events_state *parse_state = _parse_state; + struct parse_events_error *error = parse_state->error; + + parse_events__handle_error(error, @2.first_column, + strdup("Bad modifier"), NULL); free_list_evsel(list); YYABORT; } -- 2.33.0.1079.g6e70778dc9-goog