Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp477220rwd; Sat, 27 May 2023 00:41:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4VVWXcUYEU4MuS1QgxXpABlYjO35O3dSiUrY7D5orVPkgUORVzpgtKs3+Jy+dtHb77Nl23 X-Received: by 2002:a17:902:c713:b0:1ad:ddf0:131f with SMTP id p19-20020a170902c71300b001adddf0131fmr4800210plp.51.1685173316193; Sat, 27 May 2023 00:41:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685173316; cv=none; d=google.com; s=arc-20160816; b=pzFQRFJtbIddKkYhzwmvBKjYCSzQomwkzuXP7dcNW0MGSnbwOF8MjBc+vFMVShVPrr rAIs85GyVu9yfe9o1EcM+QQvzxBqoPbnYAvOZLoTCeKHVITEZXrBArDDXVNb3wxauYOq 3zHY8HdSDEclSTz36AddoE3YHuURYtZwkZ6z5qvmXuu9Ix5sDSy+kM48rl+wiJh+S9LH zK0IZi2naTiPOxjsY2nKGrEEop8txGVEismCO8jDj5iaH/L6NJGKnPQG7aqpFW7NamAS MpbogRqyY1mEcqAhvCuE9vQyGeeEOKb+ECcD+9Hn1y9aJyjzCmPR92stpabbw5YmTfpy P7hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=csOWTo951DO4baytRGvCV+AGtywhGll+tnrLNxjPQY0=; b=0B8nYMVoyswTrIqThbIOilR2tmaJt+JhKGJXB+/iRoOPJKwd14pT/CRTSnjb9rZ+PL xInUfdk4dPMm+0tir+ZLQgIgw8hM8GPVqOXWoSf82keihSBQa6paa4njz9+YG0b4mVZ6 JgnjKid/WuPwGkveaDyA2JV7AtfUNhvAykElWMVUbWYSutu8cHWZS11J6qDXqihJau0c KWgInkokQa1jtJTX67lrbX9zpcy2AXgmLjSwtGnmKEeHFxugsqKA4pPDmVTcOe9kwwyO xbSCKHryWFKD9/YitK14GMmRvrOb7PCZ94gGqupXXn4w44lthYqcxIoYaEJwY7lVePkT MnZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b="C38tR/1R"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j11-20020a170902da8b00b001b00ae4ad57si2582048plx.369.2023.05.27.00.41.43; Sat, 27 May 2023 00:41:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b="C38tR/1R"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S231917AbjE0HYg (ORCPT + 99 others); Sat, 27 May 2023 03:24:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231939AbjE0HYO (ORCPT ); Sat, 27 May 2023 03:24:14 -0400 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAB841A2 for ; Sat, 27 May 2023 00:23:45 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id 98e67ed59e1d1-256419413a3so452579a91.0 for ; Sat, 27 May 2023 00:23:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685172195; x=1687764195; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=csOWTo951DO4baytRGvCV+AGtywhGll+tnrLNxjPQY0=; b=C38tR/1RFw0fe/o2q2Trv6vb+/sMetouZoKl5RczGdJM3c1q+o0U0BjC1i4bjBEKJp 1kl1gmNWPAOBXqn6I0TNfCIMKwnjrZjs6cPn2QyuUn6JbfCpZJHcH0qvK7k3zgqebmNa wyeJAAUdvWDt6l+i/HTcTREnsvQceX9qf1SsL2sxNY+gSImIlHhCgsEpESOZnCTkY61J Kx3LgdBvGB3Zx04lgA0PGpIJlbuaQl7NM0vBAz6mKL34dgisX3IhdnRHMAx9l/Xha2SM +6PGm+rdGLE82h4UgqVT8Ec2sxJnVJt8KcC16c8KEPDj6YAwyJP8SL++upz8V9gOB8Hi aGpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685172195; x=1687764195; 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=csOWTo951DO4baytRGvCV+AGtywhGll+tnrLNxjPQY0=; b=KHOuu061W0oZ+QZbi3zpQnuXChtmUnpl8gJ1PQWQYw2WzZmlV3nCbwqPtcOeLdKbVh /SvmQMZXYKKpCfYTT+FkPreQmu2Nv0qZttenudmdu3Dc5NAx3T1lgQxyp93ySZZIrlyF ekEQp8DLnJRimweBMEWktGdQXgliu76q4MmKBbqk+uPsxUMpFW9EkZjqq2GeISAVr/Od SSbE6J4DKjzt/TZ5mxzX3//6UTMuiNhRIlVRS3ZB0+Z/JXRo83/4DkqDH3dM/3Qf0d2O bJbHrCUstkeq/SvW9bG5VDuqtPUtzRLDjWeDp12fYjiTqTmNQ1E912VxYakgEIxmzb/H glfw== X-Gm-Message-State: AC+VfDzcsfIIso/8U0tMCbS3Mq+kZPf37uOD5oBI8BylfQu6d+IqynCy jNxAQ1WQdBMIlkOBTeXXHAyC8nWNHMw1 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3b4e:312c:644:a642]) (user=irogers job=sendgmr) by 2002:a17:90a:5782:b0:253:4800:438b with SMTP id g2-20020a17090a578200b002534800438bmr249539pji.2.1685172195498; Sat, 27 May 2023 00:23:15 -0700 (PDT) Date: Sat, 27 May 2023 00:21:54 -0700 In-Reply-To: <20230527072210.2900565-1-irogers@google.com> Message-Id: <20230527072210.2900565-19-irogers@google.com> Mime-Version: 1.0 References: <20230527072210.2900565-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH v5 18/34] perf topology: Avoid hybrid list for hybrid topology 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 Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Avoid perf_pmu__for_each_hybrid_pmu in hybrid_topology__new by scanning all PMUs and processing the is_core ones. Add early exit for non-hybrid. Signed-off-by: Ian Rogers Reviewed-by: Kan Liang --- tools/perf/util/cputopo.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/cputopo.c b/tools/perf/util/cputopo.c index ca1d833a0c26..a5c259bd5cc0 100644 --- a/tools/perf/util/cputopo.c +++ b/tools/perf/util/cputopo.c @@ -12,7 +12,7 @@ #include "cpumap.h" #include "debug.h" #include "env.h" -#include "pmu-hybrid.h" +#include "pmu.h" #define PACKAGE_CPUS_FMT \ "%s/devices/system/cpu/cpu%d/topology/package_cpus_list" @@ -469,11 +469,17 @@ static int load_hybrid_node(struct hybrid_topology_node *node, struct hybrid_topology *hybrid_topology__new(void) { - struct perf_pmu *pmu; + struct perf_pmu *pmu = NULL; struct hybrid_topology *tp = NULL; - u32 nr, i = 0; + u32 nr = 0, i = 0; - nr = perf_pmu__hybrid_pmu_num(); + if (!perf_pmu__has_hybrid()) + return NULL; + + while ((pmu = perf_pmu__scan(pmu)) != NULL) { + if (pmu->is_core) + nr++; + } if (nr == 0) return NULL; @@ -482,7 +488,10 @@ struct hybrid_topology *hybrid_topology__new(void) return NULL; tp->nr = nr; - perf_pmu__for_each_hybrid_pmu(pmu) { + while ((pmu = perf_pmu__scan(pmu)) != NULL) { + if (!pmu->is_core) + continue; + if (load_hybrid_node(&tp->nodes[i], pmu)) { hybrid_topology__delete(tp); return NULL; -- 2.41.0.rc0.172.g3f132b7071-goog