From nobody Mon Feb 9 09:10:17 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 15FDBC77B73 for ; Mon, 22 May 2023 06:45:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232081AbjEVGow (ORCPT ); Mon, 22 May 2023 02:44:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230285AbjEVGoP (ORCPT ); Mon, 22 May 2023 02:44:15 -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 A092BE53 for ; Sun, 21 May 2023 23:43:56 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-ba8337a578dso7610806276.1 for ; Sun, 21 May 2023 23:43:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684737836; x=1687329836; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=cjAbWq1xZ7aD31R1h5+Cy8ZSDZyyIBasEI10DVMtL4M=; b=E0nxZGShWtenEGxKFPR3VtzZCurGG1j7euF2OoC5z+45QG+ULtTsGSDi31e4Wt3NE7 dZ3pJuvbP3B4AtT/za6BIYrmnxc2a8mXYgd9Fg6oCrS3B/kIlL3ReM6uPG3jGfff7lPN sTXH7zoYfRwjM5z86Xeovmpuzwg2P/boqnyGDLaPHnZiOiDnAJ0Yxb59xZo3t4mcuyFf fz4b9OtojC2w5ZoUs/9Oo/1olDAM8WYvmJf3J45nU0H5KiCtRzNDaHE+ffRjnFC1AX3W YJsc39e+mG2JDSRZUNhLyLY6/rsZQP1ZNC0oiHMCS88I7+iehhT6hiPDrYtpTRttSPLP Svlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684737836; x=1687329836; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=cjAbWq1xZ7aD31R1h5+Cy8ZSDZyyIBasEI10DVMtL4M=; b=K/euqoFWG8HIZY2Uvei4N+PGcIBLJZ6uuHZOizDdVEJHmdTStUirPnR3CbFVvFmMzE 7LDfXtTuxe27aJDHhYuReZ6VFvX8/qoV+6PlyxH/QhQXnCQqYvGUBWWQpxGKeVYs0+Sq 2QlDq2SwyMWSL0OONLZgkqmWQisg5hkNIie0uvhhenZND+ckrcv4Do178cZ8mNNtcptu G1cGBnrS/ZuLalLTATX+vQXTQ5W92Zcw2XxMpbNJ6RJD612Qz76+HVlLfuN+9VpRxwMj KPuhQOFlsYbObjBhFIDb9K5vgCVO2AOjgAbAyRQI2mjjfgkwQSnHFml1Y7S/MiUAteN1 NA1Q== X-Gm-Message-State: AC+VfDz3SZIMaJ7dhNcoayER8pxEEybKvTn/y+c6v9vczuofECCWdQKD OcFGRSLFUxTzPsiYD1XFbIHy7gkS+poh X-Google-Smtp-Source: ACHHUZ7UYLUCv03X5Bt6HUtR5w7vwMGWg5NGikYWsYaP3pPvUgsRYY/eLv+3oFgeC8ULmAK/RXYhwieFfyc6 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:48d9:8c21:e099:7301]) (user=irogers job=sendgmr) by 2002:a25:949:0:b0:ba1:6f1b:8905 with SMTP id u9-20020a250949000000b00ba16f1b8905mr5870686ybm.4.1684737835844; Sun, 21 May 2023 23:43:55 -0700 (PDT) Date: Sun, 21 May 2023 23:43:16 -0700 In-Reply-To: <20230522064330.189127-1-irogers@google.com> Message-Id: <20230522064330.189127-10-irogers@google.com> Mime-Version: 1.0 References: <20230522064330.189127-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog Subject: [PATCH v2 09/23] perf x86: Iterate hybrid PMUs as core PMUs From: Ian Rogers To: Suzuki K Poulose , Mike Leach , Leo Yan , John Garry , Will Deacon , James Clark , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Kajol Jain , Jing Zhang , Kan Liang , Zhengjun Xing , Ravi Bangoria , Madhavan Srinivasan , Athira Rajeev , Ming Wang , Huacai Chen , Sandipan Das , Dmitrii Dolgov <9erthalion6@gmail.com>, Sean Christopherson , Ali Saidi , Rob Herring , Thomas Richter , Kang Minchul , linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rather than iterating over a separate hybrid list, iterate all PMUs with the hybrid ones having is_core as true. Signed-off-by: Ian Rogers --- tools/perf/arch/x86/tests/hybrid.c | 2 +- tools/perf/arch/x86/util/evlist.c | 25 +++++++++++++++++-------- tools/perf/arch/x86/util/perf_regs.c | 14 ++++++++++---- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/tools/perf/arch/x86/tests/hybrid.c b/tools/perf/arch/x86/tests= /hybrid.c index 941a9edfed4e..944bd1b4bab6 100644 --- a/tools/perf/arch/x86/tests/hybrid.c +++ b/tools/perf/arch/x86/tests/hybrid.c @@ -3,7 +3,7 @@ #include "debug.h" #include "evlist.h" #include "evsel.h" -#include "pmu-hybrid.h" +#include "pmu.h" #include "tests/tests.h" =20 static bool test_config(const struct evsel *evsel, __u64 expected_config) diff --git a/tools/perf/arch/x86/util/evlist.c b/tools/perf/arch/x86/util/e= vlist.c index 1b6065841fb0..03f7eb4cf0a4 100644 --- a/tools/perf/arch/x86/util/evlist.c +++ b/tools/perf/arch/x86/util/evlist.c @@ -4,7 +4,6 @@ #include "util/evlist.h" #include "util/parse-events.h" #include "util/event.h" -#include "util/pmu-hybrid.h" #include "topdown.h" #include "evsel.h" =20 @@ -12,9 +11,6 @@ static int ___evlist__add_default_attrs(struct evlist *ev= list, struct perf_event_attr *attrs, size_t nr_attrs) { - struct perf_cpu_map *cpus; - struct evsel *evsel, *n; - struct perf_pmu *pmu; LIST_HEAD(head); size_t i =3D 0; =20 @@ -25,15 +21,24 @@ static int ___evlist__add_default_attrs(struct evlist *= evlist, return evlist__add_attrs(evlist, attrs, nr_attrs); =20 for (i =3D 0; i < nr_attrs; i++) { + struct perf_pmu *pmu =3D NULL; + if (attrs[i].type =3D=3D PERF_TYPE_SOFTWARE) { - evsel =3D evsel__new(attrs + i); + struct evsel *evsel =3D evsel__new(attrs + i); + if (evsel =3D=3D NULL) goto out_delete_partial_list; list_add_tail(&evsel->core.node, &head); continue; } =20 - perf_pmu__for_each_hybrid_pmu(pmu) { + while ((pmu =3D perf_pmu__scan(pmu)) !=3D NULL) { + struct perf_cpu_map *cpus; + struct evsel *evsel; + + if (!pmu->is_core) + continue; + evsel =3D evsel__new(attrs + i); if (evsel =3D=3D NULL) goto out_delete_partial_list; @@ -51,8 +56,12 @@ static int ___evlist__add_default_attrs(struct evlist *e= vlist, return 0; =20 out_delete_partial_list: - __evlist__for_each_entry_safe(&head, n, evsel) - evsel__delete(evsel); + { + struct evsel *evsel, *n; + + __evlist__for_each_entry_safe(&head, n, evsel) + evsel__delete(evsel); + } return -1; } =20 diff --git a/tools/perf/arch/x86/util/perf_regs.c b/tools/perf/arch/x86/uti= l/perf_regs.c index 0ed177991ad0..26abc159fc0e 100644 --- a/tools/perf/arch/x86/util/perf_regs.c +++ b/tools/perf/arch/x86/util/perf_regs.c @@ -10,7 +10,6 @@ #include "../../../util/debug.h" #include "../../../util/event.h" #include "../../../util/pmu.h" -#include "../../../util/pmu-hybrid.h" =20 const struct sample_reg sample_reg_masks[] =3D { SMPL_REG(AX, PERF_REG_X86_AX), @@ -286,7 +285,6 @@ uint64_t arch__intr_reg_mask(void) .disabled =3D 1, .exclude_kernel =3D 1, }; - struct perf_pmu *pmu; int fd; /* * In an unnamed union, init it here to build on older gcc versions @@ -294,12 +292,20 @@ uint64_t arch__intr_reg_mask(void) attr.sample_period =3D 1; =20 if (perf_pmu__has_hybrid()) { + struct perf_pmu *pmu =3D NULL; + __u64 type =3D PERF_TYPE_RAW; + /* * The same register set is supported among different hybrid PMUs. * Only check the first available one. */ - pmu =3D list_first_entry(&perf_pmu__hybrid_pmus, typeof(*pmu), hybrid_li= st); - attr.config |=3D (__u64)pmu->type << PERF_PMU_TYPE_SHIFT; + while ((pmu =3D perf_pmu__scan(pmu)) !=3D NULL) { + if (pmu->is_core) { + type =3D pmu->type; + break; + } + } + attr.config |=3D type << PERF_PMU_TYPE_SHIFT; } =20 event_attr_init(&attr); --=20 2.40.1.698.g37aff9b760-goog