From nobody Sat Nov 23 22:49:53 2024 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (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 6C5C78C07 for ; Sat, 9 Nov 2024 00:38:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731112688; cv=none; b=rO1JmPjXtslZdMiGOSOe6mYs0P3jDEL1xQBY0nB2Xav4NFAXde2U5D240P4H2iy4AN/Mx59g2ZfrctZ5ow4/Z2Sc+Lec928GZNw6qidTsRDfhzwvugx73qkfejA/PubJGlrObeRUYphi1mKAcRslqAke9tCrJS3o7c9HBCJn0Uo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731112688; c=relaxed/simple; bh=JR2W9BY58B7KI+DPucllOVM9yijzERRopT+DlqMeLCU=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=AlFtPdQTsC7b4JJdNlpnDw+Pq5Nfl1f64PlgTz44BMo92U13VaZBICePPqGBNosvjwc31hmGsdhO/vAH90cvnfqfLdGrj6XSptDgkVts5pky5uqwHm+U9X/25qXG9mDOBiE3096OsfufGtV8VHWElplNksF+/VCK6WZWBtZhzkE= 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=lz9ouNdV; arc=none smtp.client-ip=209.85.219.201 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="lz9ouNdV" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e3314237b86so4872768276.1 for ; Fri, 08 Nov 2024 16:38:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1731112686; x=1731717486; 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=3SPWlc2lPTGFJEvFedKLB5LrjZb1UnFHbKvI0m+mSBo=; b=lz9ouNdVZcv2MhAZ2AalIAGKOMsk4P9C4qOkUYbkkITWMJQ1P+rSia7kf7ZH24/6zJ /VsQIDeyGzgxX5iyDYFjJAUHMehpEZ4W3HckFPZKN4ubOmmDWc8Q8LlocSrrd/9Mtz/Y +vzNYknawpOTxAbknjOOSTYBYIXQwpqqm4b92o47WuakiSGTZ09He5HP95J9sWzHynKZ /i99YdMn9tCNyhyJX8TGMNEFTYBkZPVQy7L3sxXYqY3j9B0AiIsfMjPWlTr4bGqt1+Ak +xAi3FdVYZUS0u84QQLlO0Z7S+WLlOYG6ZKeTIAniSngVm6Xj4dzVm3MgLskv/IwLS+d Jmzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731112686; x=1731717486; 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=3SPWlc2lPTGFJEvFedKLB5LrjZb1UnFHbKvI0m+mSBo=; b=fYVlecEbaHyQ0ffOll4AMLARwnqKTyb86wLq6UAoz6fKrMLIUmB0szBZZihvy6fL1L 5PwpY/xgfR3/uaME1WLNduYyD5Q3kH9+qjlVXQqCshd/iF4XNPnLb7LEVi8IUk/bhscF WZcF6tVizT/2oxnF3a8dBtpS7NTzj2cUpFczEE3PZVTYpbUUskYTGYGOE2SGYsfO9HyM p/N0FU50U3ZGxjSJ1iI2eBeVPysVNeNHsMU2Ig3JxWAUEJ+n/4pLOXkWanfSY8Aoc39+ kCj9OQdU+vtRNpwIAlqskNpNJUyPOM8haYtVsespmlz5so005uQD5Z01K9TKW+60N/ZU Xahw== X-Forwarded-Encrypted: i=1; AJvYcCVEZsB3d2SSpFmJHsnipOUgATP2qqAD656grRhuWUe/AZRIX6TuTRZYqj81I8i9RB1G/cyq8+0mmMsdcaE=@vger.kernel.org X-Gm-Message-State: AOJu0Yx1Fj5A1Y/u8xfVI3BtNWZp51UoPujodY8Tqec4UT2Z+lczLnr7 aiqe36lXJjL4JdxEB1635zJm0Pote3zCLO7xi9O8YjNeNsYCfq651TE5tfE2wH3q/31lB+QNFxN jwB5LkQ== X-Google-Smtp-Source: AGHT+IEbCvuNzznHJpTzjrrAOjr0V/uUsjUwc1//TkW/1cqMa3tVVHph1FyNI7oYtDyjF4CBOn/7+dGxx9S/ X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:6fd2:1e36:6d8c:7c49]) (user=irogers job=sendgmr) by 2002:a25:dc4a:0:b0:e25:5cb1:77d8 with SMTP id 3f1490d57ef6-e337f8ed8bbmr2910276.6.1731112686450; Fri, 08 Nov 2024 16:38:06 -0800 (PST) Date: Fri, 8 Nov 2024 16:37:53 -0800 In-Reply-To: <20241109003759.473460-1-irogers@google.com> Message-Id: <20241109003759.473460-2-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 1/7] tools api io: Ensure line_len_out is always initialized 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" Ensure initialization to avoid compiler warnings about potential use of uninitialized variables. Signed-off-by: Ian Rogers --- tools/lib/api/io.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/lib/api/io.h b/tools/lib/api/io.h index d3eb04d1bc89..1731996b2c32 100644 --- a/tools/lib/api/io.h +++ b/tools/lib/api/io.h @@ -189,6 +189,7 @@ static inline ssize_t io__getdelim(struct io *io, char = **line_out, size_t *line_ err_out: free(line); *line_out =3D NULL; + *line_len_out =3D 0; return -ENOMEM; } =20 --=20 2.47.0.277.g8800431eea-goog From nobody Sat Nov 23 22:49:53 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 943DD1E505 for ; Sat, 9 Nov 2024 00:38:09 +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=1731112691; cv=none; b=nPRungQheGtLd8GJBgMFaYISqFsJUxXUC76UFaXQZ7SNVVNsv7zyEsPB8oJpLbPIZnxydRkNZCviH3aHbYSqgPNTukvLIWZfUq1+J6HlXJ97kg1sxJaNlHb85Cdv7yVH883gixQe66cUK4C9KDh5Fm5L99GqQSn5ssc4DU7K/5A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731112691; c=relaxed/simple; bh=EPHABW4Dal5OoWmB5VB9qYe0tkW5pDWGRMOxZWg45/8=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=DP/Px553wCk62acETzBsVZL9GCUy5Orf6jDcXgmeSJcC+WyeyoP/QDDp+aErY/R8IY28twKCfq/tYszeFpoNUxMmlZGRf1Mqbw5vlpKbjpbtevsEXmcf/BAPgCyG5ibhz17MkSWvOXGk+58QIGPDjli58B8aSpBaIXMB4dx1yYo= 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=vMp71Gqw; 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="vMp71Gqw" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6ea86f1df79so52116407b3.1 for ; Fri, 08 Nov 2024 16:38:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1731112688; x=1731717488; 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=HTiUHf6g81o8sTIu2Q+yefZ91ahAjUlTz9BdmD6fp2A=; b=vMp71GqwHoSgPpYbGo0okBqH1jkJtEmB4GlVq3fF59EcKSmamAbQvaTzim9mQrGWXT ypB8ooE1Tc2st4HB4WkQJuB+Jo4EnkpuTdmabSxIdmh+gNYPRwa9lVNbZjNzJjE6Pj3C tHzNaW8xrAVYb45UTFvR6q0c6e+C2v+Q02DTsrgdNV8ErTtBTMyzAsYYf/YHgJFxC1jR nysiXyuLytTQnmLof0YRRujTCCYaPdhHL6WtWKRYZKRibe/zGwo07aE3AQ15qU5SDazC rL4bwAjXL5xL84dwVGKf2qoz6ysfGDMrOX6UWsTv/fKURM7yG5Ep8pr4eRztOc6ksQWA vMdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731112688; x=1731717488; 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=HTiUHf6g81o8sTIu2Q+yefZ91ahAjUlTz9BdmD6fp2A=; b=MQOGdn+10R1r6OIXnlGrCd9yjs1fn9BXaA6kTe+oxWm2Qh3GiBkISrSNInzDS7dsvv /t4gDHefoVVZUO4m3+lg9iQpb9P7rmbMwXFoBV0UuJ+aH5xRldu2ewWhwkxy2n+HBUrB sp2xwSsQPD2Bv9cbExqao9pEDABWaE8niLrrZLIRYlx/jOaKVYQZiNc7arLbcz1Gj1Wd vLNMvNGe3HXHhdSFTukQW8Slzx0BiHhjA6FoKPqcAm4S4yygv7HT5k7oV7YD1Uk+wZQm BhhclefZ8OnvH3BrsKyXUvFBNdue8xcj4v8CEpqtp0vA9/rHzp/YhpJsfnq4zhu9kvAs CePA== X-Forwarded-Encrypted: i=1; AJvYcCXMO4IX7t6KOiwrGaWNqEF4nUqFyktosvkl50QhbZ6JF6RDCqtLNT01wFdM8Los7dx/wL6dR/s96IwiR8M=@vger.kernel.org X-Gm-Message-State: AOJu0YyxivtmUQBJhyrjICrVMnDq+gFMMDIapCCOp6aJh9qeLXBi+erk Jx6l02sp+7qiaYVTtxKb9RkPJHY57tGeBo4xyZsdiLHK9IHStCmVtNeZZT3xk6wHNswvzgkP08B Wq67NpQ== X-Google-Smtp-Source: AGHT+IF6gQvvK5Lil5+ng0LPpg9X8rdu8LgEF9SDR8ig2x/8mDlSkvbT3HqLAYHEhF+R6ExZ4n87L1KB3LEL X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:6fd2:1e36:6d8c:7c49]) (user=irogers job=sendgmr) by 2002:a05:690c:200f:b0:6ea:34c3:742b with SMTP id 00721157ae682-6eaddfad76amr477787b3.6.1731112688654; Fri, 08 Nov 2024 16:38:08 -0800 (PST) Date: Fri, 8 Nov 2024 16:37:54 -0800 In-Reply-To: <20241109003759.473460-1-irogers@google.com> Message-Id: <20241109003759.473460-3-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 2/7] perf hwmon_pmu: Add hwmon filename parser 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" hwmon filenames have a specific encoding that will be used to give a config value. The encoding is described in: Documentation/hwmon/sysfs-interface.rst Add a function to parse the filename into consituent enums/ints that will then be amenable to config encoding. Note, things are done this way to allow mapping names to config and back without the use of hash/dynamic lookup tables. Signed-off-by: Ian Rogers --- tools/perf/util/Build | 1 + tools/perf/util/hwmon_pmu.c | 144 ++++++++++++++++++++++++++++++++++++ tools/perf/util/hwmon_pmu.h | 111 +++++++++++++++++++++++++++ 3 files changed, 256 insertions(+) create mode 100644 tools/perf/util/hwmon_pmu.c create mode 100644 tools/perf/util/hwmon_pmu.h diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 1eedead5f2f2..78b990c04f71 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -83,6 +83,7 @@ perf-util-y +=3D pmu.o perf-util-y +=3D pmus.o perf-util-y +=3D pmu-flex.o perf-util-y +=3D pmu-bison.o +perf-util-y +=3D hwmon_pmu.o perf-util-y +=3D tool_pmu.o perf-util-y +=3D svghelper.o perf-util-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-info.o diff --git a/tools/perf/util/hwmon_pmu.c b/tools/perf/util/hwmon_pmu.c new file mode 100644 index 000000000000..8791e55097dc --- /dev/null +++ b/tools/perf/util/hwmon_pmu.c @@ -0,0 +1,144 @@ +// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) +#include "debug.h" +#include "hwmon_pmu.h" +#include +#include +#include +#include +#include + +/** Strings that correspond to enum hwmon_type. */ +static const char * const hwmon_type_strs[HWMON_TYPE_MAX] =3D { + NULL, + "cpu", + "curr", + "energy", + "fan", + "humidity", + "in", + "intrusion", + "power", + "pwm", + "temp", +}; +#define LONGEST_HWMON_TYPE_STR "intrusion" + +/** Strings that correspond to enum hwmon_item. */ +static const char * const hwmon_item_strs[HWMON_ITEM__MAX] =3D { + NULL, + "accuracy", + "alarm", + "auto_channels_temp", + "average", + "average_highest", + "average_interval", + "average_interval_max", + "average_interval_min", + "average_lowest", + "average_max", + "average_min", + "beep", + "cap", + "cap_hyst", + "cap_max", + "cap_min", + "crit", + "crit_hyst", + "div", + "emergency", + "emergency_hist", + "enable", + "fault", + "freq", + "highest", + "input", + "label", + "lcrit", + "lcrit_hyst", + "lowest", + "max", + "max_hyst", + "min", + "min_hyst", + "mod", + "offset", + "pulses", + "rated_max", + "rated_min", + "reset_history", + "target", + "type", + "vid", +}; +#define LONGEST_HWMON_ITEM_STR "average_interval_max" + +static int hwmon_strcmp(const void *a, const void *b) +{ + const char *sa =3D a; + const char * const *sb =3D b; + + return strcmp(sa, *sb); +} + +bool parse_hwmon_filename(const char *filename, + enum hwmon_type *type, + int *number, + enum hwmon_item *item, + bool *alarm) +{ + char fn_type[24]; + const char **elem; + const char *fn_item =3D NULL; + size_t fn_item_len; + + assert(strlen(LONGEST_HWMON_TYPE_STR) < sizeof(fn_type)); + strlcpy(fn_type, filename, sizeof(fn_type)); + for (size_t i =3D 0; fn_type[i] !=3D '\0'; i++) { + if (fn_type[i] >=3D '0' && fn_type[i] <=3D '9') { + fn_type[i] =3D '\0'; + *number =3D strtoul(&filename[i], (char **)&fn_item, 10); + if (*fn_item =3D=3D '_') + fn_item++; + break; + } + if (fn_type[i] =3D=3D '_') { + fn_type[i] =3D '\0'; + *number =3D -1; + fn_item =3D &filename[i + 1]; + break; + } + } + if (fn_item =3D=3D NULL || fn_type[0] =3D=3D '\0' || (item !=3D NULL && f= n_item[0] =3D=3D '\0')) { + pr_debug("hwmon_pmu: not a hwmon file '%s'\n", filename); + return false; + } + elem =3D bsearch(&fn_type, hwmon_type_strs + 1, ARRAY_SIZE(hwmon_type_str= s) - 1, + sizeof(hwmon_type_strs[0]), hwmon_strcmp); + if (!elem) { + pr_debug("hwmon_pmu: not a hwmon type '%s' in file name '%s'\n", + fn_type, filename); + return false; + } + + *type =3D elem - &hwmon_type_strs[0]; + if (!item) + return true; + + *alarm =3D false; + fn_item_len =3D strlen(fn_item); + if (fn_item_len > 6 && !strcmp(&fn_item[fn_item_len - 6], "_alarm")) { + assert(strlen(LONGEST_HWMON_ITEM_STR) < sizeof(fn_type)); + strlcpy(fn_type, fn_item, fn_item_len - 5); + fn_item =3D fn_type; + *alarm =3D true; + } + elem =3D bsearch(fn_item, hwmon_item_strs + 1, ARRAY_SIZE(hwmon_item_strs= ) - 1, + sizeof(hwmon_item_strs[0]), hwmon_strcmp); + if (!elem) { + pr_debug("hwmon_pmu: not a hwmon item '%s' in file name '%s'\n", + fn_item, filename); + return false; + } + *item =3D elem - &hwmon_item_strs[0]; + return true; +} diff --git a/tools/perf/util/hwmon_pmu.h b/tools/perf/util/hwmon_pmu.h new file mode 100644 index 000000000000..df0ab5ff7534 --- /dev/null +++ b/tools/perf/util/hwmon_pmu.h @@ -0,0 +1,111 @@ +/* SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) */ +#ifndef __HWMON_PMU_H +#define __HWMON_PMU_H + +#include + +/** + * enum hwmon_type: + * + * As described in Documentation/hwmon/sysfs-interface.rst hwmon events are + * defined over multiple files of the form _. This enum + * captures potential values. + * + * This enum is exposed for testing. + */ +enum hwmon_type { + HWMON_TYPE_NONE, + + HWMON_TYPE_CPU, + HWMON_TYPE_CURR, + HWMON_TYPE_ENERGY, + HWMON_TYPE_FAN, + HWMON_TYPE_HUMIDITY, + HWMON_TYPE_IN, + HWMON_TYPE_INTRUSION, + HWMON_TYPE_POWER, + HWMON_TYPE_PWM, + HWMON_TYPE_TEMP, + + HWMON_TYPE_MAX +}; + +/** + * enum hwmon_item: + * + * Similar to enum hwmon_type but describes the item part of a a sysfs fil= ename. + * + * This enum is exposed for testing. + */ +enum hwmon_item { + HWMON_ITEM_NONE, + + HWMON_ITEM_ACCURACY, + HWMON_ITEM_ALARM, + HWMON_ITEM_AUTO_CHANNELS_TEMP, + HWMON_ITEM_AVERAGE, + HWMON_ITEM_AVERAGE_HIGHEST, + HWMON_ITEM_AVERAGE_INTERVAL, + HWMON_ITEM_AVERAGE_INTERVAL_MAX, + HWMON_ITEM_AVERAGE_INTERVAL_MIN, + HWMON_ITEM_AVERAGE_LOWEST, + HWMON_ITEM_AVERAGE_MAX, + HWMON_ITEM_AVERAGE_MIN, + HWMON_ITEM_BEEP, + HWMON_ITEM_CAP, + HWMON_ITEM_CAP_HYST, + HWMON_ITEM_CAP_MAX, + HWMON_ITEM_CAP_MIN, + HWMON_ITEM_CRIT, + HWMON_ITEM_CRIT_HYST, + HWMON_ITEM_DIV, + HWMON_ITEM_EMERGENCY, + HWMON_ITEM_EMERGENCY_HIST, + HWMON_ITEM_ENABLE, + HWMON_ITEM_FAULT, + HWMON_ITEM_FREQ, + HWMON_ITEM_HIGHEST, + HWMON_ITEM_INPUT, + HWMON_ITEM_LABEL, + HWMON_ITEM_LCRIT, + HWMON_ITEM_LCRIT_HYST, + HWMON_ITEM_LOWEST, + HWMON_ITEM_MAX, + HWMON_ITEM_MAX_HYST, + HWMON_ITEM_MIN, + HWMON_ITEM_MIN_HYST, + HWMON_ITEM_MOD, + HWMON_ITEM_OFFSET, + HWMON_ITEM_PULSES, + HWMON_ITEM_RATED_MAX, + HWMON_ITEM_RATED_MIN, + HWMON_ITEM_RESET_HISTORY, + HWMON_ITEM_TARGET, + HWMON_ITEM_TYPE, + HWMON_ITEM_VID, + + HWMON_ITEM__MAX, +}; + +/** + * parse_hwmon_filename() - Parse filename into constituent parts. + * + * @filename: To be parsed, of the form _. + * @type: The type defined from the parsed file name. + * @number: The number of the type, for example there may be more than 1 f= an. + * @item: A hwmon may have multiple associated items. + * @alarm: Is the filename for an alarm value? + * + * An example of a hwmon filename is "temp1_input". The type is temp for a + * temperature value. The number is 1. The item within the file is an input + * value - the temperature itself. This file doesn't contain an alarm valu= e. + * + * Exposed for testing. + */ +bool parse_hwmon_filename(const char *filename, + enum hwmon_type *type, + int *number, + enum hwmon_item *item, + bool *alarm); + +#endif /* __HWMON_PMU_H */ --=20 2.47.0.277.g8800431eea-goog From nobody Sat Nov 23 22:49:53 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 C52553C463 for ; Sat, 9 Nov 2024 00:38:11 +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=1731112693; cv=none; b=f3QvEQZFuoixOLLn19roPFO1//9rrr45BqQ5QOEvJT0Gp7z7PCwEGgCuxPc/gDEVryToldbdX1kXyDo8S8fr33ycWKdbqqw2dLMmFXdDhi7PNJuZP4W5Lop2wfybpZZFiWJ0XIOtUdIy42lw76Yv8rfr4wIpKN/byrorzWBbJjI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731112693; c=relaxed/simple; bh=cJXlLHhPm/MxqQ001SlGf6LhXjO0VbFH7y7+7Dv6k6s=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=Ej7bLeyDQPlGXZiWq29WjXvlWl+tvgSQDErPWfnrMggA1nzct1N7+V7JutyhTj8Q0v5ZFhTeD+LFidaLEH8MyxHn+YU2nyBqIxs9CnBmnN4F+r0JocunjcgybRVUwJR8DOlgTkabGPYxlfH94nwk2jspcrVQLfqDpb4RdLlr2xY= 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=cwPJNE5r; 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="cwPJNE5r" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6e7e7568ed3so50381637b3.1 for ; Fri, 08 Nov 2024 16:38:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1731112691; x=1731717491; 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=sMRp4SArakG3qttQ7Acj4+yjGFvVzfYJdi2BB3ubp6I=; b=cwPJNE5rrvT/SJNcQZbuoW9qxub4x5jU8VqRZYCsIG7Hx3y1lFwFsV0gLSrq5Tr5Nb DtmykYUROSvyV6exy7R7lbm2bybMBhBoObuo1kA7WUdOxjalMp3IBamKCu8wARRiNAEx d0AcfP5TpEtN0H/A5E6IjV9+Zpw1CiQ9ttnmlQ5O78BIF+/efNrGNOSWEvBtpCPNJ+rD BWLH8fj33+so4MgsirGvIeHgLa+l2KSytCCYYMhsOOg9l23kJxGl3Lga7G2uTXQ5lSia 5GoYzL325Gs/pNWRiUoVkbnt9X4Joq24tSfI3HXvrds/8smclG1OytN3JZkcbBP1svLU iRNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731112691; x=1731717491; 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=sMRp4SArakG3qttQ7Acj4+yjGFvVzfYJdi2BB3ubp6I=; b=bPrUZL52W33h7I1yoVc3gQiaTFIGmasSKmxb8PlGa/WUqUhGD0Dj7Al6NE6Bl/mmy6 doB40oVdQBudyW2MbzCtLpVuknAuMzB/HdJ3+IB2Hcigqn5DE3gZSt/xPgtqMSfnTdvq 48BUuhUCzvBF6IdCVVDk6oGaBbAF0wMmepQFdjMKmp7DBRaXPNNAL0A87e3qk6ql72mU mxakwvoJ5L3WcvD2ofoTJs7NNvi7FG8/J125M0Jy9fJeUHV9ahEHE9m+/26MZpppG5wO Jz5ot915taq1+hN4euNEdMNcakjz1rVF4ltP15nfaamlR1YRX2OjkM2NdIVZe1Q5m21j h0pw== X-Forwarded-Encrypted: i=1; AJvYcCVstDRlap9VeLXXl0lJXvxnHbULIcbz7KsB5IdNt1Tx1syGIqepK3Nbx7CF8xLZJ9ey/bFadLSN+1E3NTw=@vger.kernel.org X-Gm-Message-State: AOJu0YxMEce5hA/eyABIvb0c0m1aRdI38Te6shxTo3+HPttOiIhcQDKj q+BHJ8x3OskUnlSt5BuF264eLwjCp+GtGb+xC9Lwki5cL1jvI41Kni+fg3I2pzGiq4EMA8Pq6/M JbthU1A== X-Google-Smtp-Source: AGHT+IFH5L9yMlY50p0WH+meGB871eq2DYlEmJtgpnnORnt4x6dJ1AvKxHmGyMUHtEUvgDi6ZhweQRo4IMR5 X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:6fd2:1e36:6d8c:7c49]) (user=irogers job=sendgmr) by 2002:a25:abac:0:b0:e2b:db24:905e with SMTP id 3f1490d57ef6-e338017a945mr20217276.5.1731112690863; Fri, 08 Nov 2024 16:38:10 -0800 (PST) Date: Fri, 8 Nov 2024 16:37:55 -0800 In-Reply-To: <20241109003759.473460-1-irogers@google.com> Message-Id: <20241109003759.473460-4-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 3/7] perf test: Add hwmon filename parser test 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" Filename parsing maps a hwmon filename to constituent parts enum/int parts for the hwmon config value. Add a test case for the parsing. Signed-off-by: Ian Rogers --- tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 1 + tools/perf/tests/hwmon_pmu.c | 110 ++++++++++++++++++++++++++++++++ tools/perf/tests/tests.h | 1 + 4 files changed, 113 insertions(+) create mode 100644 tools/perf/tests/hwmon_pmu.c diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build index 01ed9335db4d..ec4e1f034742 100644 --- a/tools/perf/tests/Build +++ b/tools/perf/tests/Build @@ -66,6 +66,7 @@ perf-test-y +=3D sigtrap.o perf-test-y +=3D event_groups.o perf-test-y +=3D symbols.o perf-test-y +=3D util.o +perf-test-y +=3D hwmon_pmu.o perf-test-y +=3D tool_pmu.o =20 ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc)) diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-tes= t.c index d2cabaa8ad92..8dcf74d3c0a3 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -71,6 +71,7 @@ static struct test_suite *generic_tests[] =3D { &suite__PERF_RECORD, &suite__pmu, &suite__pmu_events, + &suite__hwmon_pmu, &suite__tool_pmu, &suite__dso_data, &suite__perf_evsel__roundtrip_name_test, diff --git a/tools/perf/tests/hwmon_pmu.c b/tools/perf/tests/hwmon_pmu.c new file mode 100644 index 000000000000..f5b58486d8d3 --- /dev/null +++ b/tools/perf/tests/hwmon_pmu.c @@ -0,0 +1,110 @@ +// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) +#include "debug.h" +#include "hwmon_pmu.h" +#include "tests.h" +#include +#include + +static int test__parse_hwmon_filename(struct test_suite *test __maybe_unus= ed, + int subtest __maybe_unused) +{ + const struct hwmon_parse_test { + const char *filename; + enum hwmon_type type; + int number; + enum hwmon_item item; + bool alarm; + bool parse_ok; + } tests[] =3D { + { + .filename =3D "cpu0_accuracy", + .type =3D HWMON_TYPE_CPU, + .number =3D 0, + .item =3D HWMON_ITEM_ACCURACY, + .alarm =3D false, + .parse_ok =3D true, + }, + { + .filename =3D "temp1_input", + .type =3D HWMON_TYPE_TEMP, + .number =3D 1, + .item =3D HWMON_ITEM_INPUT, + .alarm =3D false, + .parse_ok =3D true, + }, + { + .filename =3D "fan2_vid", + .type =3D HWMON_TYPE_FAN, + .number =3D 2, + .item =3D HWMON_ITEM_VID, + .alarm =3D false, + .parse_ok =3D true, + }, + { + .filename =3D "power3_crit_alarm", + .type =3D HWMON_TYPE_POWER, + .number =3D 3, + .item =3D HWMON_ITEM_CRIT, + .alarm =3D true, + .parse_ok =3D true, + }, + { + .filename =3D "intrusion4_average_interval_min_alarm", + .type =3D HWMON_TYPE_INTRUSION, + .number =3D 4, + .item =3D HWMON_ITEM_AVERAGE_INTERVAL_MIN, + .alarm =3D true, + .parse_ok =3D true, + }, + { + .filename =3D "badtype5_baditem", + .type =3D HWMON_TYPE_NONE, + .number =3D 5, + .item =3D HWMON_ITEM_NONE, + .alarm =3D false, + .parse_ok =3D false, + }, + { + .filename =3D "humidity6_baditem", + .type =3D HWMON_TYPE_NONE, + .number =3D 6, + .item =3D HWMON_ITEM_NONE, + .alarm =3D false, + .parse_ok =3D false, + }, + }; + + for (size_t i =3D 0; i < ARRAY_SIZE(tests); i++) { + enum hwmon_type type; + int number; + enum hwmon_item item; + bool alarm; + + TEST_ASSERT_EQUAL("parse_hwmon_filename", + parse_hwmon_filename( + tests[i].filename, + &type, + &number, + &item, + &alarm), + tests[i].parse_ok + ); + if (tests[i].parse_ok) { + TEST_ASSERT_EQUAL("parse_hwmon_filename type", type, tests[i].type); + TEST_ASSERT_EQUAL("parse_hwmon_filename number", number, tests[i].numbe= r); + TEST_ASSERT_EQUAL("parse_hwmon_filename item", item, tests[i].item); + TEST_ASSERT_EQUAL("parse_hwmon_filename alarm", alarm, tests[i].alarm); + } + } + return TEST_OK; +} + +static struct test_case tests__hwmon_pmu[] =3D { + TEST_CASE("Basic parsing test", parse_hwmon_filename), + { .name =3D NULL, } +}; + +struct test_suite suite__hwmon_pmu =3D { + .desc =3D "Hwmon PMU", + .test_cases =3D tests__hwmon_pmu, +}; diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index af284dd47e5c..cb58b43aa063 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -92,6 +92,7 @@ DECLARE_SUITE(perf_evsel__tp_sched_test); DECLARE_SUITE(syscall_openat_tp_fields); DECLARE_SUITE(pmu); DECLARE_SUITE(pmu_events); +DECLARE_SUITE(hwmon_pmu); DECLARE_SUITE(tool_pmu); DECLARE_SUITE(attr); DECLARE_SUITE(dso_data); --=20 2.47.0.277.g8800431eea-goog From nobody Sat Nov 23 22:49:53 2024 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (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 B5EC345026 for ; Sat, 9 Nov 2024 00:38:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731112696; cv=none; b=L8plzlOHGSRFySfhnvaqoGPd3woYI8tPlfRImbm41DQvEvStxj9vNxyDFqL8uqfA6qxv8O1FBVTABgAEBeQmec3Jv2SsFYpAHeVyEZGGPv3VoGSryA+FcIGTjoeqR9vJ6IhOdXt83ricHRLpxa8WBqv6QCdjXPtbiFD4mZPZ4tw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731112696; c=relaxed/simple; bh=DF29HfLYk4APYNM6PN4eXxEzIMhUOA5QnWG8bu4TeS8=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=Dt7eW5RQbfWldg+HTil+Ic1a64l1IzmSvVJeLzVVleye853t07nTc6S8K8i8H7FEn6AkYNTTgC4RPtD+UX2qOKg68a0ExyMU78r7tovs6WBjMJ1r9XGWyoeOMMqY6vQ473tdB1ODN7CYUxNmEyppRGoSYhmjU6LdIFkWuk7cpRU= 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=fKNKFPB8; arc=none smtp.client-ip=209.85.219.201 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="fKNKFPB8" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e30c7a38bd7so2931957276.0 for ; Fri, 08 Nov 2024 16:38:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1731112693; x=1731717493; 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=SKmPEjnoDqQNPKBI5I5F9OwiMicG8/7OcYSqdoUQCi4=; b=fKNKFPB8EDkKmg2iewVHGKzkkNdWzGZH6hU8fnTn8slyvgXkUmaRs7/QVHP/1jU62t KPLXTShv5UoBT6IQw2Qk991QxvdMB3w6FSdk+u1t+LrR6eBt4FoNJCUbexttrVEbYPYS e5b8CZLH6flKDgHQYe4+yzpbf/mhyX9uBcjq2Y9sFyCUdeOSC1QI2fauvQjMqINDN/+5 WMtGF2P9T1/32EVIthhVK8f0kL8LeHkosP0nYOtEyMvC8Gx//lf7Az8ozy+nD5BA4KEC MljbnsI9DL/gPWASH298G86sXpszCCoM2YKk407wkGF5bn5tHbDAWSGtx6uyLZ+8lt6Z hqCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731112693; x=1731717493; 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=SKmPEjnoDqQNPKBI5I5F9OwiMicG8/7OcYSqdoUQCi4=; b=ofuJescJm7RDXNcWP66ZCBlz1+jfGoOvf0zNWmB4jb0BVST0aehepYMz+QSs9hDJmq 1zyLcqxl/TCQeSDssvvHbg3Gy4N5d1tmprcT7XidC0T1MLuqc3ize6FhT2gt0zTu3Ryw eLx3Oua0MbLEdZejSRrYN6JV6HgNbrT2ooJ2D0hGiVfyX5ikXT8dJdnvX40OT/evuqI+ weLAvVPhM9pAZcIbOrSrbB0DhEcrPS37bUF8ckAPOpQAZ1AF6ra4xSnDSwuw5hzXbbEP YBVezHFSL+txeAdrzrkQSm0U96Eln1KJk9yBPSYX57hHrtajZQvRWN5rCTVjd3IhX3n1 DzGw== X-Forwarded-Encrypted: i=1; AJvYcCXiQJuca0a1uLQAb7ueoJD4IotyjMdHA1+sB/8ETMM1GUfk6BtvIIZBWGr4YMMjolfHcPTpoMWmTcANQE4=@vger.kernel.org X-Gm-Message-State: AOJu0Ywet2Ze3O1pKEycNC924ocSnZVlGmjXMamyPry5o3/jCIrE0aLC x/b7M6R/67GKoVxr/r4VBMJo/RCtcly/ApABM0AdexF8ehiDztYBaWw9DWr9vlLkS0zWwSj7TRq MHSCrcg== X-Google-Smtp-Source: AGHT+IGe6YYvSbH6XvUIdzf+Ra5PiGVW6RreBKcUNdPP8Dc0zQ0s5ZXhqQ6LJjzjtbfcSUav8fTAmyhjdaWF X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:6fd2:1e36:6d8c:7c49]) (user=irogers job=sendgmr) by 2002:a5b:ad0:0:b0:e2e:2c2e:277b with SMTP id 3f1490d57ef6-e337e18eb4fmr24771276.3.1731112692958; Fri, 08 Nov 2024 16:38:12 -0800 (PST) Date: Fri, 8 Nov 2024 16:37:56 -0800 In-Reply-To: <20241109003759.473460-1-irogers@google.com> Message-Id: <20241109003759.473460-5-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 4/7] perf hwmon_pmu: Add a tool PMU exposing events from hwmon in sysfs 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 a tool PMU for hwmon events but don't enable. The hwmon sysfs ABI is defined in Documentation/hwmon/sysfs-interface.rst. Create a PMU that reads the hwmon input and can be used in `perf stat` and metrics much as an uncore PMU can. For example, when enabled by a later patch, the following shows reading the CPU temperature and 2 fan speeds alongside the uncore frequency: ``` $ perf stat -e temp_cpu,fan1,hwmon_thinkpad/fan2/,tool/num_cpus_online/ -M = UNCORE_FREQ -I 1000 1.001153138 52.00 'C temp_cpu 1.001153138 2,588 rpm fan1 1.001153138 2,482 rpm hwmon_thinkpad/fan2/ 1.001153138 8 tool/num_cpus_online/ 1.001153138 1,077,101,397 UNC_CLOCK.SOCKET #= 1.08 UNCORE_FREQ 1.001153138 1,012,773,595 duration_time ... ``` The PMUs are named from /sys/class/hwmon/hwmon/name and have an alias of hwmon. Hwmon data is presented in multiple _ files. The is used to identify the event as is the followed by the contents of the _label file if it exists. The _input file gives the data read by perf. When enabled by a later patch, in `perf list` the other hwmon files are used to give a richer description, for example: ``` hwmon: temp1 [Temperature in unit acpitz named temp1. Unit: hwmon_acpitz] in0 [Voltage in unit bat0 named in0. Unit: hwmon_bat0] temp_core_0 OR temp2 [Temperature in unit coretemp named Core 0. crit=3D100'C,max=3D100'C= crit_alarm=3D0'C. Unit: hwmon_coretemp] temp_core_1 OR temp3 [Temperature in unit coretemp named Core 1. crit=3D100'C,max=3D100'C= crit_alarm=3D0'C. Unit: hwmon_coretemp] ... temp_package_id_0 OR temp1 [Temperature in unit coretemp named Package id 0. crit=3D100'C,max= =3D100'C crit_alarm=3D0'C. Unit: hwmon_coretemp] temp1 [Temperature in unit iwlwifi_1 named temp1. Unit: hwmon_iwlwifi_1] temp_composite OR temp1 [Temperature in unit nvme named Composite. alarm=3D0'C,crit=3D86.85'= C,max=3D75.85'C, min=3D-273.15'C. Unit: hwmon_nvme] temp_sensor_1 OR temp2 [Temperature in unit nvme named Sensor 1. max=3D65261.8'C,min=3D-273= .15'C. Unit: hwmon_nvme] temp_sensor_2 OR temp3 [Temperature in unit nvme named Sensor 2. max=3D65261.8'C,min=3D-273= .15'C. Unit: hwmon_nvme] fan1 [Fan in unit thinkpad named fan1. Unit: hwmon_thinkpad] fan2 [Fan in unit thinkpad named fan2. Unit: hwmon_thinkpad] ... temp_cpu OR temp1 [Temperature in unit thinkpad named CPU. Unit: hwmon_thinkpad] temp_gpu OR temp2 [Temperature in unit thinkpad named GPU. Unit: hwmon_thinkpad] curr1 [Current in unit ucsi_source_psy_usbc000_0 named curr1. max=3D1.5A. = Unit: hwmon_ucsi_source_psy_usbc000_0] in0 [Voltage in unit ucsi_source_psy_usbc000_0 named in0. max=3D5V,min= =3D5V. Unit: hwmon_ucsi_source_psy_usbc000_0] ``` As there may be multiple hwmon devices a range of PMU types are reserved for their use and to identify the PMU as belonging to the hwmon types. Signed-off-by: Ian Rogers --- tools/perf/util/hwmon_pmu.c | 682 ++++++++++++++++++++++++++++++++++++ tools/perf/util/hwmon_pmu.h | 40 +++ tools/perf/util/pmu.h | 2 + 3 files changed, 724 insertions(+) diff --git a/tools/perf/util/hwmon_pmu.c b/tools/perf/util/hwmon_pmu.c index 8791e55097dc..89acc19347c8 100644 --- a/tools/perf/util/hwmon_pmu.c +++ b/tools/perf/util/hwmon_pmu.c @@ -1,11 +1,25 @@ // SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) +#include "counts.h" #include "debug.h" +#include "evsel.h" +#include "hashmap.h" #include "hwmon_pmu.h" +#include "pmu.h" +#include +#include +#include +#include #include +#include +#include +#include #include #include #include +#include +#include #include +#include =20 /** Strings that correspond to enum hwmon_type. */ static const char * const hwmon_type_strs[HWMON_TYPE_MAX] =3D { @@ -72,6 +86,79 @@ static const char * const hwmon_item_strs[HWMON_ITEM__MA= X] =3D { }; #define LONGEST_HWMON_ITEM_STR "average_interval_max" =20 +static const char *const hwmon_units[HWMON_TYPE_MAX] =3D { + NULL, + "V", /* cpu */ + "A", /* curr */ + "J", /* energy */ + "rpm", /* fan */ + "%", /* humidity */ + "V", /* in */ + "", /* intrusion */ + "W", /* power */ + "Hz", /* pwm */ + "'C", /* temp */ +}; + +struct hwmon_pmu { + struct perf_pmu pmu; + struct hashmap events; + int hwmon_dir_fd; +}; + +/** + * union hwmon_pmu_event_key: Key for hwmon_pmu->events as such each key + * represents an event. + * + * Related hwmon files start that this key represents. + */ +union hwmon_pmu_event_key { + long type_and_num; + struct { + int num :16; + enum hwmon_type type :8; + }; +}; + +/** + * struct hwmon_pmu_event_value: Value in hwmon_pmu->events. + * + * Hwmon files are of the form _ and may have a suffix + * _alarm. + */ +struct hwmon_pmu_event_value { + /** @items: which item files are present. */ + DECLARE_BITMAP(items, HWMON_ITEM__MAX); + /** @alarm_items: which item files are present. */ + DECLARE_BITMAP(alarm_items, HWMON_ITEM__MAX); + /** @label: contents of _label if present. */ + char *label; + /** @name: name computed from label of the form _