Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp424353pxb; Fri, 16 Apr 2021 08:54:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxe9yvjq3Qb7wXRn3yeqeD5Fhby2a05Jx2w4UJECUjyR7jIDI69jqpxUityjYKiOznSgJJW X-Received: by 2002:a05:6402:138f:: with SMTP id b15mr10866487edv.121.1618588497868; Fri, 16 Apr 2021 08:54:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618588497; cv=none; d=google.com; s=arc-20160816; b=m0dxaJr9OVXXGfwaQ3wobtpt/Jw5rjZM7g5VWye8cp+wRrAKrjYZBFIPPLZ9lZV8cI qsXiV2DcQn4Qtms9a/JQH5WZAb89LFX8qfSlhYGHzC0pbaodzEoGt3z5CMjA0u4DWRdS 3bo6+3GFvykCsIEWQCco6Kzx7GiU9/HbkOmBBZF5BWqC4Gz7S7MT6jU8SenZvyZhuYsi 2l69/bxvWupP3QnI4BPX5ehlGstQbBxDEavtNQId+TpmSflXXgqpRxaWijL8qUt2ENXX p4HzawU/8Tud1ElG4MCOcYN97XekdwDMN/gQjfxH95LHNvputtWC5WZSk4xhbZrITIPn NUQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:ironport-sdr:ironport-sdr; bh=LQceSjxYOzdpOXVfrNA7zSkX0dPTn5LTAVcgTsbUS1o=; b=JhbYxCwANc9aE4xJaqH73FgJEG8Hieere5F6aDiiR4e3N8JpsbffRC0svaB1Ln1i8x jXFYG9Pmx7E6AXiqvaHKyrZHLQzqfvcCMpKTYmWo7lfiisJe2n9nYMdoHzCZJfLL47fp 2NI0IKxyHZ2amwwmlICqvphwlG9e9SyFDMP8ep4Pk5cC4vwiYuveZHDcAsET1+vo+GVV 6lao8MF45vuP/wEHzZWXCwd7uz5R+Itt+tV7liXYgvXdkRo6OAg1dnp1sO+RgIRburb6 NVdjmOmRwIZqWoOrLePE8/hwaq04MEXHsVcsx8EADNGErBxHxgYjpOFdJ2kSLEf5FN06 xAtw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e15si5200125edz.11.2021.04.16.08.54.34; Fri, 16 Apr 2021 08:54:57 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236210AbhDPOG7 (ORCPT + 99 others); Fri, 16 Apr 2021 10:06:59 -0400 Received: from mga06.intel.com ([134.134.136.31]:11215 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236168AbhDPOGz (ORCPT ); Fri, 16 Apr 2021 10:06:55 -0400 IronPort-SDR: pl8vRZ5S3gcWL8JOKWiKsu2pbnQyPIWUONWXL2e6L6EIzNiNRwo6QGYNpSL7jTBjtzyyL8KEQY sFGG6mL+gf2w== X-IronPort-AV: E=McAfee;i="6200,9189,9956"; a="256358371" X-IronPort-AV: E=Sophos;i="5.82,226,1613462400"; d="scan'208";a="256358371" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2021 07:06:30 -0700 IronPort-SDR: hbPM+OCwXay/ySEN4uEoYB/yRD4zKy0H/vIRqQTOLn2r+FhN2txpmOQ9URQsBMZNcO/9TB0Wo5 zuPLBnlY59Uw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,226,1613462400"; d="scan'208";a="612766679" Received: from kbl-ppc.sh.intel.com ([10.239.159.163]) by fmsmga006.fm.intel.com with ESMTP; 16 Apr 2021 07:06:28 -0700 From: Jin Yao To: acme@kernel.org, jolsa@kernel.org, peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com Cc: Linux-kernel@vger.kernel.org, ak@linux.intel.com, kan.liang@intel.com, yao.jin@intel.com, Jin Yao Subject: [PATCH v4 06/25] perf pmu: Add hybrid helper functions Date: Fri, 16 Apr 2021 22:04:58 +0800 Message-Id: <20210416140517.18206-7-yao.jin@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210416140517.18206-1-yao.jin@linux.intel.com> References: <20210416140517.18206-1-yao.jin@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The functions perf_pmu__is_hybrid and perf_pmu__find_hybrid_pmu can be used to identify the hybrid platform and return the found hybrid cpu pmu. All the detected hybrid pmus have been saved in 'perf_pmu__hybrid_pmus' list. So we just need to search this list. perf_pmu__hybrid_type_to_pmu converts the user specified string to hybrid pmu name. This is used to support the '--cputype' option in next patches. perf_pmu__has_hybrid checks the existing of hybrid pmu. Note that, we have to define it in pmu.c (make pmu-hybrid.c no more symbol dependency), otherwise perf test python would be failed. Signed-off-by: Jin Yao --- v4: - No change. v3: - Move perf_pmu__has_hybrid from pmu-hybrid.c to pmu.c. We have to add pmu-hybrid.c to python-ext-sources to solve symbol dependency issue found in perf test python. For perf_pmu__has_hybrid, it calls perf_pmu__scan, which is defined in pmu.c. It's very hard to add pmu.c to python-ext-sources, too much symbol dependency here. tools/perf/util/pmu-hybrid.c | 40 ++++++++++++++++++++++++++++++++++++ tools/perf/util/pmu-hybrid.h | 4 ++++ tools/perf/util/pmu.c | 11 ++++++++++ tools/perf/util/pmu.h | 2 ++ 4 files changed, 57 insertions(+) diff --git a/tools/perf/util/pmu-hybrid.c b/tools/perf/util/pmu-hybrid.c index 8ed0e6e1776d..f51ccaac60ee 100644 --- a/tools/perf/util/pmu-hybrid.c +++ b/tools/perf/util/pmu-hybrid.c @@ -47,3 +47,43 @@ bool perf_pmu__hybrid_mounted(const char *name) return true; } + +struct perf_pmu *perf_pmu__find_hybrid_pmu(const char *name) +{ + struct perf_pmu *pmu; + + if (!name) + return NULL; + + perf_pmu__for_each_hybrid_pmu(pmu) { + if (!strcmp(name, pmu->name)) + return pmu; + } + + return NULL; +} + +bool perf_pmu__is_hybrid(const char *name) +{ + return perf_pmu__find_hybrid_pmu(name) != NULL; +} + +char *perf_pmu__hybrid_type_to_pmu(const char *type) +{ + char *pmu_name = NULL; + + if (asprintf(&pmu_name, "cpu_%s", type) < 0) + return NULL; + + if (perf_pmu__is_hybrid(pmu_name)) + return pmu_name; + + /* + * pmu may be not scanned, check the sysfs. + */ + if (perf_pmu__hybrid_mounted(pmu_name)) + return pmu_name; + + free(pmu_name); + return NULL; +} diff --git a/tools/perf/util/pmu-hybrid.h b/tools/perf/util/pmu-hybrid.h index 35bed3714438..d0fa7bc50a76 100644 --- a/tools/perf/util/pmu-hybrid.h +++ b/tools/perf/util/pmu-hybrid.h @@ -15,4 +15,8 @@ extern struct list_head perf_pmu__hybrid_pmus; bool perf_pmu__hybrid_mounted(const char *name); +struct perf_pmu *perf_pmu__find_hybrid_pmu(const char *name); +bool perf_pmu__is_hybrid(const char *name); +char *perf_pmu__hybrid_type_to_pmu(const char *type); + #endif /* __PMU_HYBRID_H */ diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 6e49c7b8ad71..88c8ecdc60b0 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -40,6 +40,7 @@ int perf_pmu_parse(struct list_head *list, char *name); extern FILE *perf_pmu_in; static LIST_HEAD(pmus); +static bool hybrid_scanned; /* * Parse & process all the sysfs attributes located under @@ -1861,3 +1862,13 @@ void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config, "'%llx' not supported by kernel)!\n", name ?: "N/A", buf, config); } + +bool perf_pmu__has_hybrid(void) +{ + if (!hybrid_scanned) { + hybrid_scanned = true; + perf_pmu__scan(NULL); + } + + return !list_empty(&perf_pmu__hybrid_pmus); +} diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 9a2f89eeab6f..a790ef758171 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -132,4 +132,6 @@ int perf_pmu__caps_parse(struct perf_pmu *pmu); void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config, char *name); +bool perf_pmu__has_hybrid(void); + #endif /* __PMU_H */ -- 2.17.1