From nobody Sun Nov 24 00:31:28 2024 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EF46D1E505 for ; Sat, 9 Nov 2024 00:38:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731112697; cv=none; b=RCm/yMTTjmoiRPvMVPIcMx/pW9voYyvTYEG4YVFVvubX5SIV4sjFAvwgNMoCQu5bZemvYhHYy8qoOI3klO7hHjnjvQZRcNjPfzfPHEnTRG9bqspKKW5jLX5Myow87zd7q/Yl1yZxrwbjgsuqI016gCQ8dE5ElK4/c7UFhV9d/RU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731112697; c=relaxed/simple; bh=ZhWpi/y0IU48IBt0+u5WIP11qQFZYZwVjrYO5lrfaHY=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=Snjdt8qxOSSGEzhn6fjWP+4wSM5hdaDKJd2kLRXGY+HnUskBQj0sB5LRXXM8KmukyPQabBN8LGlqSwqNeg4zgeiy9jpV1oKRC+HYgQgBg8/lC62KqZDNyGe4zw8CDuIiOrvWvTXjm3RhEQv5otSbv3sVeoEaySZoESBlLAuEqwQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=qyuvqNfl; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="qyuvqNfl" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6e376aa4586so55469747b3.1 for ; Fri, 08 Nov 2024 16:38:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1731112695; x=1731717495; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=K3pEKqmDVF94310Lcc6dZMS2bWB1ZbAcb+eC42TYfHQ=; b=qyuvqNflFa5QDOsS2HULbCp51ZWvqyO2c6kIEJ+j3IX+IkUjvq3eH+aEmXl8SO1Ico nzDPJ1kk/ttbSbzZ/WSmITXstgkgtoIOvrcQleKw4FpW2EMVOMq1Vskzx8CH7buYMBOd 0embQUvPjWi6y4cd0znsyYrZZvAAvOo4aLEYjb25lS9miqDogUv46mp5Vb21rMVAkvei IQiOAfX12PL9aZgTffKnjBlVQnAjL0lMCrVjoxA3iNI4DHPCgsjPb3MVCot1xrnCJ5GV N4fwgWCC+dL0gPpfh14EudDGrF9U1F14izsA6vS2c6iEjnIhf1TC1+o8YKb+5ChODSJA wIOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731112695; x=1731717495; 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=K3pEKqmDVF94310Lcc6dZMS2bWB1ZbAcb+eC42TYfHQ=; b=Y0/Mms2tSybqkVWcg3xgFP7pujovUWQ3ZJ2Hc1CpyAXK3h+MmRYblll3hn3CADZF0F 5mohhEV1zCUFK2oBvxILe9eooxVT0YqXe2iPruRJDdImu/MvSlWqNOVYogkwvePOeLXA ypzfc7Dj4FSJUMWtElyqLBKkqYiHuSKSRrYOCi/SqjZ19j+QL0Ax0dNWewi3tFst8Ytj rFr3GKI7j60LCdjIqe6hO19i1wjcbAAOGmuKkHq05IcV5u4QkJnSOA7m8DvR9qNULDQR Gjm4K33FRp038UF12nmzojVB3qRvAj8H7YeQFQSm0v4SxCJywLQgq47dxWZd4b1AKlBr mO/Q== X-Forwarded-Encrypted: i=1; AJvYcCVIANfgH/aiI49Uw8Sg/DQ6Ik4M0QuRKPn6gXFh9egGCeb4obCy5etg3cYzBUvHXSViT87UlenE6CQdeXg=@vger.kernel.org X-Gm-Message-State: AOJu0Yy61X+5Mc8SIjWBr0495bgDq44vfUtW9yPF4uhT2Ysrt40Fb5Cq rJmmeuHSLscxbjjuuLM9l6lpYbGS7lmv+DdYLU8MFYi/+BKJA0jyARt3NO11w6nTAimgl+9+ITd NVB/EoQ== X-Google-Smtp-Source: AGHT+IGoym8hF8gD8A7TgoUSKdocFo7FnfQXZ23YR60+rYbOIwKjaezhZtr0vkmSCGVIfm2mCYWhs/tsllEW X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:6fd2:1e36:6d8c:7c49]) (user=irogers job=sendgmr) by 2002:a05:690c:74c8:b0:6ea:e974:8aa9 with SMTP id 00721157ae682-6eae974919bmr102707b3.2.1731112695102; Fri, 08 Nov 2024 16:38:15 -0800 (PST) Date: Fri, 8 Nov 2024 16:37:57 -0800 In-Reply-To: <20241109003759.473460-1-irogers@google.com> Message-Id: <20241109003759.473460-6-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241109003759.473460-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.277.g8800431eea-goog Subject: [PATCH v9 5/7] perf pmu: Add calls enabling the hwmon_pmu From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Ravi Bangoria , Weilin Wang , Yoshihiro Furudera , James Clark , Athira Jajeev , Howard Chu , Oliver Upton , Changbin Du , Ze Gao , Junhao He , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add the base PMU calls necessary for hwmon_pmu(s) to be created/deleted and events found, listed, opened and read. Signed-off-by: Ian Rogers --- tools/perf/util/evsel.c | 9 +++++++++ tools/perf/util/pmu.c | 20 ++++++++++++++++++++ tools/perf/util/pmus.c | 2 ++ 3 files changed, 31 insertions(+) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index f780e30aa259..fc1bf86c5063 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -56,6 +56,7 @@ #include "off_cpu.h" #include "pmu.h" #include "pmus.h" +#include "hwmon_pmu.h" #include "tool_pmu.h" #include "rlimit.h" #include "../perf-sys.h" @@ -1799,6 +1800,9 @@ int evsel__read_counter(struct evsel *evsel, int cpu_= map_idx, int thread) if (evsel__is_tool(evsel)) return evsel__tool_pmu_read(evsel, cpu_map_idx, thread); =20 + if (evsel__is_hwmon(evsel)) + return evsel__hwmon_pmu_read(evsel, cpu_map_idx, thread); + if (evsel__is_retire_lat(evsel)) return evsel__read_retire_lat(evsel, cpu_map_idx, thread); =20 @@ -2465,6 +2469,11 @@ static int evsel__open_cpu(struct evsel *evsel, stru= ct perf_cpu_map *cpus, start_cpu_map_idx, end_cpu_map_idx); } + if (evsel__is_hwmon(evsel)) { + return evsel__hwmon_pmu_open(evsel, threads, + start_cpu_map_idx, + end_cpu_map_idx); + } =20 for (idx =3D start_cpu_map_idx; idx < end_cpu_map_idx; idx++) { =20 diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 0789758598c0..a02df2c80f42 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -18,6 +18,7 @@ #include "debug.h" #include "evsel.h" #include "pmu.h" +#include "hwmon_pmu.h" #include "pmus.h" #include "tool_pmu.h" #include @@ -1529,6 +1530,9 @@ int perf_pmu__config_terms(const struct perf_pmu *pmu, { struct parse_events_term *term; =20 + if (perf_pmu__is_hwmon(pmu)) + return hwmon_pmu__config_terms(pmu, attr, terms, err); + list_for_each_entry(term, &terms->terms, list) { if (pmu_config_term(pmu, attr, term, terms, zero, apply_hardcoded, err)) return -EINVAL; @@ -1661,6 +1665,11 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, stru= ct parse_events_terms *head_ info->scale =3D 0.0; info->snapshot =3D false; =20 + if (perf_pmu__is_hwmon(pmu)) { + ret =3D hwmon_pmu__check_alias(head_terms, info, err); + goto out; + } + /* Fake PMU doesn't rewrite terms. */ if (perf_pmu__is_fake(pmu)) goto out; @@ -1834,6 +1843,8 @@ bool perf_pmu__have_event(struct perf_pmu *pmu, const= char *name) return false; if (perf_pmu__is_tool(pmu) && tool_pmu__skip_event(name)) return false; + if (perf_pmu__is_hwmon(pmu)) + return hwmon_pmu__have_event(pmu, name); if (perf_pmu__find_alias(pmu, name, /*load=3D*/ true) !=3D NULL) return true; if (pmu->cpu_aliases_added || !pmu->events_table) @@ -1845,6 +1856,9 @@ size_t perf_pmu__num_events(struct perf_pmu *pmu) { size_t nr; =20 + if (perf_pmu__is_hwmon(pmu)) + return hwmon_pmu__num_events(pmu); + pmu_aliases_parse(pmu); nr =3D pmu->sysfs_aliases + pmu->sys_json_aliases; =20 @@ -1908,6 +1922,9 @@ int perf_pmu__for_each_event(struct perf_pmu *pmu, bo= ol skip_duplicate_pmus, int ret =3D 0; struct strbuf sb; =20 + if (perf_pmu__is_hwmon(pmu)) + return hwmon_pmu__for_each_event(pmu, state, cb); + strbuf_init(&sb, /*hint=3D*/ 0); pmu_aliases_parse(pmu); pmu_add_cpu_aliases(pmu); @@ -2303,6 +2320,9 @@ int perf_pmu__pathname_fd(int dirfd, const char *pmu_= name, const char *filename, =20 void perf_pmu__delete(struct perf_pmu *pmu) { + if (perf_pmu__is_hwmon(pmu)) + hwmon_pmu__exit(pmu); + perf_pmu__del_formats(&pmu->format); perf_pmu__del_aliases(pmu); perf_pmu__del_caps(pmu); diff --git a/tools/perf/util/pmus.c b/tools/perf/util/pmus.c index 107de86c2637..5c3e88adb9e6 100644 --- a/tools/perf/util/pmus.c +++ b/tools/perf/util/pmus.c @@ -15,6 +15,7 @@ #include "evsel.h" #include "pmus.h" #include "pmu.h" +#include "hwmon_pmu.h" #include "tool_pmu.h" #include "print-events.h" #include "strbuf.h" @@ -234,6 +235,7 @@ static void pmu_read_sysfs(bool core_only) if (!core_only) { tool_pmu =3D perf_pmus__tool_pmu(); list_add_tail(&tool_pmu->list, &other_pmus); + perf_pmus__read_hwmon_pmus(&other_pmus); } list_sort(NULL, &other_pmus, pmus_cmp); if (!list_empty(&core_pmus)) { --=20 2.47.0.277.g8800431eea-goog