From nobody Sat Apr 18 17:23:42 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06EE3C433EF for ; Tue, 12 Jul 2022 11:28:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232356AbiGLL2s (ORCPT ); Tue, 12 Jul 2022 07:28:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232118AbiGLL2m (ORCPT ); Tue, 12 Jul 2022 07:28:42 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8891632A for ; Tue, 12 Jul 2022 04:28:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657625320; x=1689161320; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=onTgph3rXetM5BAUTtdZP1dl7HRIsTscsKh4CTi0arU=; b=gXIIyl/CWBXT6PJE9aoQCamiVjn+0bf79PNZmEIAPuvtlCWREdZqE5Ot gVBvzI7yQ4LcqubYG6MxRbmVwT6pctrjEMn6r5vVA4OgZ3m5yjtbl0+1U f2pCT/+6Qe9GTPO6IirO1k3bEh2vyp6vDoMksa7fBeRMGkMpq+DOWdaNv 6BYbCzkgQoSOMFM8glbWzV8RjUadVXwrE2Qk8SKxncbV71k24UYHsiwIh do9iYjBB6Hh2LLUO5SZf9+ys55Ap+Kavzm4tOLytlX9vR7X+1cOLlA/x9 PXv53cRzryzU927x+C+7/nMTbp0ey6DaqNwz/WOPVlnEBMyIqTnZVTsfR Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10405"; a="310523781" X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="310523781" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2022 04:28:40 -0700 X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="652870324" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.252.51.155]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2022 04:28:38 -0700 From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Ian Rogers , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] perf parse-events: Fix segfault when event parser gets an error Date: Tue, 12 Jul 2022 14:28:23 +0300 Message-Id: <20220712112824.28770-2-adrian.hunter@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220712112824.28770-1-adrian.hunter@intel.com> References: <20220712112824.28770-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" parse_events() is often called with parse_events_error set to NULL. Make parse_events_error__handle() not segfault in that case. Fixes: 43eb05d06679 ("perf tests: Support 'Track with sched_switch' test fo= r hybrid") Signed-off-by: Adrian Hunter --- tools/perf/util/parse-events.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 7ed235740431..700c95eafd62 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -2391,9 +2391,12 @@ void parse_events_error__exit(struct parse_events_er= ror *err) void parse_events_error__handle(struct parse_events_error *err, int idx, char *str, char *help) { - if (WARN(!str, "WARNING: failed to provide error string\n")) { - free(help); - return; + if (WARN(!str, "WARNING: failed to provide error string\n")) + goto out_free; + if (!err) { + /* Assume caller does not want message printed */ + pr_debug("event syntax error: %s\n", str); + goto out_free; } switch (err->num_errors) { case 0: @@ -2419,6 +2422,11 @@ void parse_events_error__handle(struct parse_events_= error *err, int idx, break; } err->num_errors++; + return; + +out_free: + free(str); + free(help); } =20 #define MAX_WIDTH 1000 --=20 2.25.1 From nobody Sat Apr 18 17:23:42 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D74EC433EF for ; Tue, 12 Jul 2022 11:28:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232428AbiGLL2v (ORCPT ); Tue, 12 Jul 2022 07:28:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232152AbiGLL2o (ORCPT ); Tue, 12 Jul 2022 07:28:44 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 866E6640C for ; Tue, 12 Jul 2022 04:28:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657625322; x=1689161322; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=94KgKSWfdtzq1V4a3xLl/CsdDgK+DoD3CPqR8VX7yH8=; b=R0tJrt1fFhBC7MAZUUexJmVC0Mi2jnOXvXmH90nNPk6f+emohkJ+t/lv YC9mV8ZbzOAL7u9siyabxIydFR94ioEvfWJR8NnxT5ByqDeg5cwKy+T6x HltBzxJuRpk2DCwDcsNo7++d6XjrkoVwR4MmlQYRWShnydoGtXz6YLMdx 9kaSw4LkqJG9q3r5SLy5hI40mKCu2yW+DXy4BuhLgYgduwbsi2o3f6yP8 lnZqIh4zJiU52rDPPN6K6leQGPHIzWYPSx5Od9KLhs+AieOom0opQvxf1 ntSbJb5Bg/76kBDBPixd0BOIHpYZrXHVL85O+TmObvecY5QjowcAiy0ZK A==; X-IronPort-AV: E=McAfee;i="6400,9594,10405"; a="310523786" X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="310523786" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2022 04:28:42 -0700 X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="652870338" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.252.51.155]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2022 04:28:40 -0700 From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Ian Rogers , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] perf tests: Fix Track with sched_switch test for hybrid case Date: Tue, 12 Jul 2022 14:28:24 +0300 Message-Id: <20220712112824.28770-3-adrian.hunter@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220712112824.28770-1-adrian.hunter@intel.com> References: <20220712112824.28770-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" If cpu_core PMU event fails to parse, try also cpu_atom PMU event when parsing cycles event. Fixes: 43eb05d06679 ("perf tests: Support 'Track with sched_switch' test fo= r hybrid") Signed-off-by: Adrian Hunter --- tools/perf/tests/switch-tracking.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/tools/perf/tests/switch-tracking.c b/tools/perf/tests/switch-t= racking.c index 0c0c2328bf4e..6f53bee33f7c 100644 --- a/tools/perf/tests/switch-tracking.c +++ b/tools/perf/tests/switch-tracking.c @@ -324,6 +324,7 @@ static int process_events(struct evlist *evlist, static int test__switch_tracking(struct test_suite *test __maybe_unused, i= nt subtest __maybe_unused) { const char *sched_switch =3D "sched:sched_switch"; + const char *cycles =3D "cycles:u"; struct switch_tracking switch_tracking =3D { .tids =3D NULL, }; struct record_opts opts =3D { .mmap_pages =3D UINT_MAX, @@ -372,12 +373,19 @@ static int test__switch_tracking(struct test_suite *t= est __maybe_unused, int sub cpu_clocks_evsel =3D evlist__last(evlist); =20 /* Second event */ - if (perf_pmu__has_hybrid()) - err =3D parse_events(evlist, "cpu_core/cycles/u", NULL); - else - err =3D parse_events(evlist, "cycles:u", NULL); + if (perf_pmu__has_hybrid()) { + cycles =3D "cpu_core/cycles/u"; + err =3D parse_events(evlist, cycles, NULL); + if (err) { + cycles =3D "cpu_atom/cycles/u"; + pr_debug("Trying %s\n", cycles); + err =3D parse_events(evlist, cycles, NULL); + } + } else { + err =3D parse_events(evlist, cycles, NULL); + } if (err) { - pr_debug("Failed to parse event cycles:u\n"); + pr_debug("Failed to parse event %s\n", cycles); goto out_err; } =20 --=20 2.25.1