From patchwork Wed Dec 6 18:35:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 174693 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp4302515vqy; Wed, 6 Dec 2023 10:35:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IGYQi69iMaN4hFWIc4LNnJ2ZzBGat1EYw/5/+uA/neMmcHXJmkwYLHjevGjZAP1A1aLd+yF X-Received: by 2002:a17:902:dacd:b0:1d0:94f2:2ad7 with SMTP id q13-20020a170902dacd00b001d094f22ad7mr1161182plx.68.1701887746128; Wed, 06 Dec 2023 10:35:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701887746; cv=none; d=google.com; s=arc-20160816; b=zAudvpvEYSmM4R7C5yVnbdJP+STH0gjYI2X9U6TAUscu3SMsN8k6yRLxFwSlGRtWWs afuwrZYXi9JanNGdnN8W0MjWMovbHkF0tF3BwHbWeEbzPCf4l2LncONhDrkPcN/IRgn2 TCrpKjRI0PEqUF53d3bwHJIiswv8u7WvKXzMQwibrYo4jYjRKMDZYi038+Pm0TXLX5W/ goLoIRkYWRbB66WWn+XuJptE3Pb1rT9m9DC1mZ2nTD5VqPqHDvMjK6GrYIyoBQPrEyfi P6CPBcCQsQSZA6djUwIK1aj2PUI3SyrAoNN7kmgJS2pJg9rS/HbgYWdvu6nUNqtR75KF p+Mg== 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:mime-version:message-id:date :dkim-signature; bh=B2/YElcFb78YmCVTTtjEUczkDmkglR+f6tXmRIs88Pc=; fh=xuq0cTzW1R0PtUGJBxTlmQQfwdpV9dI7aZ4WT/R+6iQ=; b=Rcw+E44RS3LlWGz1Sig5+pfRV6olsWuNi7WfQtDk34/1Ko8kdUzxagi6gc7omjcwIZ G7EIjaX3rfV/+jUPwaLCyh/+081XtXYjZq3H/2WqeI+1tUQHgTO+fg/yi1/hgs6F+Dlf bSC0WNyDu6vJ/vzxBEqcuAMfPMmXs5YSA6LbPGuetr04C3b3I603VuClc++ZQCQWNX3q aljXSmoxdr1CyXzlnG8TDdh8Jpbtbv1ZaH9Jws28C55kBfWYJGF7rEm5NRmy+Y9PvN4Z q9G3W4VG4yiwy7s4pc3afCESM2oWcuJYnUqDwd2lR2skUzR2U27UgSZx1ms8wuTMhwCC ACCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=lpI5S7KZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id p2-20020a1709026b8200b001bb9375b349si172786plk.536.2023.12.06.10.35.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 10:35:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=lpI5S7KZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 3922F83265AE; Wed, 6 Dec 2023 10:35:41 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378792AbjLFSfc (ORCPT + 99 others); Wed, 6 Dec 2023 13:35:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378355AbjLFSfb (ORCPT ); Wed, 6 Dec 2023 13:35:31 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA703D40 for ; Wed, 6 Dec 2023 10:35:37 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5c5daf2baccso448577b3.3 for ; Wed, 06 Dec 2023 10:35:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701887737; x=1702492537; darn=vger.kernel.org; h=cc:to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=B2/YElcFb78YmCVTTtjEUczkDmkglR+f6tXmRIs88Pc=; b=lpI5S7KZve6rDwSg9JJuwFXZi3JkCxVRCkaFNLUCQlGo9HFSQI1at6FI526w7WbY3R ntP5ih+FAqVRNL3o1ZV4A4EZuppjCU4bp1IlDErRnOAzhbMIGuoy0YXCOZdynmztQ1qa a6ieddnGtqPT1gMMhhXHYPjAClSqmu8JWSriqMFYv1eIg5IpJw20+JYVpT9X3EDymwOm DGHuk+767I4cQmjyMCYRvZiF/qavx5EDSL4PgxNuMsXXVbCQH01iyMY77N+GtbT/P3BW Wk+BHlZFv11jl9hVMkNRX3KdW6cY/xmHhZF0Iwmm/GmYEERduyErsKcEWb+XrQa653P2 Yo5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701887737; x=1702492537; h=cc:to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=B2/YElcFb78YmCVTTtjEUczkDmkglR+f6tXmRIs88Pc=; b=wFLUA532xOqUjk213a5xTtup5glUu42hzcrUpf92LX9jpMw16XVnZSwHbiA7Zcrgsx W1QUQuHU94CbTE36w4H61yfgcEVUl39e8hu7/QJyjyWTLNod8ou3gQ+NwU22T0SEHrE3 EnFKGOi6FZ0ID37xGAbALs5jwkbN4ItHkidg1rjk2IGvz4InD+hgFpg5vv8xXXNxl4aN yJfcoMFF9wnlw9tAAgl8gpdz9a38uQXYqVZFf30YHvVwJjYWeFoAXchsPs6efHyiFuXR 8H5vBnsVz/Wrwxvt7VPl3FtSaCLdJS+J2Fn8npD3CgAqxmMpldfgbx0ZCEj6qO/TTqf+ t4OQ== X-Gm-Message-State: AOJu0YxmESXLFMKgWBz+heJlPfJFXGH6Tec4PrJC1G4bp2nv1d4xn8vM DWyZFduhKQXAcBlBslyUUd3vMvAwxoG5 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:fe7d:8e90:65a9:5cbe]) (user=irogers job=sendgmr) by 2002:a81:af04:0:b0:5d8:95b:af70 with SMTP id n4-20020a81af04000000b005d8095baf70mr21731ywh.4.1701887737162; Wed, 06 Dec 2023 10:35:37 -0800 (PST) Date: Wed, 6 Dec 2023 10:35:33 -0800 Message-Id: <20231206183533.972028-1-irogers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.43.0.rc2.451.g8631bc7472-goog Subject: [PATCH v1] perf stat: Exit perf stat if parse groups fails From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Arnaldo Carvalho de Melo X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 06 Dec 2023 10:35:41 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784558645646508886 X-GMAIL-MSGID: 1784558645646508886 Metrics were added by a callback but commit a4b8cfcabb1d ("perf stat: Delay metric parsing") postponed this to allow optimizations based on the CPU configuration. In doing so it stopped errors in metric parsing from causing perf stat termination. This change adds the termination for bad metric names back in. Reported-by: Arnaldo Carvalho de Melo Closes: https://lore.kernel.org/lkml/ZXByT1K6enTh2EHT@kernel.org/ Fixes: a4b8cfcabb1d ("perf stat: Delay metric parsing") Signed-off-by: Ian Rogers --- tools/perf/builtin-stat.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index d8e5d6f7a87a..d22228eddccb 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -2695,15 +2695,19 @@ int cmd_stat(int argc, const char **argv) */ if (metrics) { const char *pmu = parse_events_option_args.pmu_filter ?: "all"; + int ret = metricgroup__parse_groups(evsel_list, pmu, metrics, + stat_config.metric_no_group, + stat_config.metric_no_merge, + stat_config.metric_no_threshold, + stat_config.user_requested_cpu_list, + stat_config.system_wide, + &stat_config.metric_events); - metricgroup__parse_groups(evsel_list, pmu, metrics, - stat_config.metric_no_group, - stat_config.metric_no_merge, - stat_config.metric_no_threshold, - stat_config.user_requested_cpu_list, - stat_config.system_wide, - &stat_config.metric_events); zfree(&metrics); + if (ret) { + status = ret; + goto out; + } } if (add_default_attributes())