From nobody Tue Nov 26 01:30:23 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 6D9A71C9B8C for ; Tue, 22 Oct 2024 18:06:30 +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=1729620391; cv=none; b=D9jQjidC9QGY7gsTnUI2/eRbnVguM9VegtYtOMdi1DFY/NmKMzzwIzCf0xFW8EyX1c2Kh4M2AAKcWmhWxMF5iSWwZCx2hisu/3LpG7+hupapysyKxQ9glL0Y0ndUAk0ALulfiOgEw8mAl0pdwyFuObSMY5sl7+r/JMdvKpVNVYw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729620391; c=relaxed/simple; bh=bweGjO6oLNWqHtRm9v/TYQZ87rq8+41CpklWuS6lDx4=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=ufRf3Nm/eErJhNU6C1h2K47ks/8NNB3OtTwxfRuCXBU7BRqMdQvUGcLV2/vBg5SNO1n4iYdDnpOOLS+TQjxCQbERaPN3DFj8EDz9uJsPGjQU5fO/P+In/jWFxz7BOMSrJP/vDh+lVOTMIqke421k0vToAA7FwCdUmQlCE+2Lo/c= 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=lvg6ck0a; 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="lvg6ck0a" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e297a366304so9388367276.2 for ; Tue, 22 Oct 2024 11:06:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1729620389; x=1730225189; 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=r1LYQ4XDiQ2MYrJtEXc2JnLlBCPdfCYTDh4HOwGTpkA=; b=lvg6ck0arVwGMsKj0KKoM8LRKi+Tn5XhoWTdC7OO0ZjH3JlOUdZEReb/L5HcV9FP6p 688WBThuUkx3t5QVNIKNjJSYwLXmslUjP666WCxo6BQchYupJIdHR+G2R/Otg6seDbL0 29SfhWKpQNE8pFtKnh9OtGxCfCpwTllTJPmO3wrkQQyDN2PFcUhkpr5bpgdPT2aoDHho xvKDKcIcWo5bpN5Jd/qSbG003cqxCuIwoVHN+B1eKMSS7Acq6c176cuoJPkolNEB2nmW WLOPZT7o/TrmMppQ+POp464ctl5/+IceiynXLNRWld/Y8zW1T0U5Vx/fgCJIzrM2GxYH nKSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729620389; x=1730225189; 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=r1LYQ4XDiQ2MYrJtEXc2JnLlBCPdfCYTDh4HOwGTpkA=; b=PA36tInVp3NQK8XQ+8NldikkaGr6xrAWlxFfu1iLFaPLpzOcfF/GUPVw5TfM7yZTwA VO/x6leFiorq4JSKmr9V8oLOUb3CpvJDPO0x2Vnr5RDY++PypH5eJx/CDcfXz11S/r9Q /Q+2SPyKouRTguKJsHNxLO2nRaSXmNluMJkZWu2UWMte4DXvMfJgmY9C1Mx/We1VHNxj FoygAu7xppA6cm8MrSxjgooGGb6AdvME54oequyZyVFm01jI2Ildo3HZ98QA0OjDROmQ 2k9cKhjxu1OwzmpsY70NLmrp7n1W9R+q+g+5ATMU3VGDeT0spV1eBzC8EwerOdvGAyDF 4cFQ== X-Forwarded-Encrypted: i=1; AJvYcCWVEsstgD2WTTWomaeNVssOeJOe7pUqiRL3caK1c7rafriPHv5CDjY9Ecp9aEw7NM98xYNunLxLqe4Qa0w=@vger.kernel.org X-Gm-Message-State: AOJu0YxYeluwjDX9DJayHRAMYr9GsJ+bZvWKgKPyfaEDrAwsLqzg7aNY iB/A6SbhwSr+HdvBN0DBo7FS5pRBJ8MSGVfRDMKHppOYS71MuXMhPXeTuHNEzaVFPF7TI9/BCZ6 56/igUQ== X-Google-Smtp-Source: AGHT+IHYqPK5wSTyVxjQTNYNNDQqiXBqxM1jJkCNN3xQAoA0ajpRbBIJPrPvwnkV5A3tBEOwdvq/sL/XWAfu X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:57ba:88e0:aaf6:282]) (user=irogers job=sendgmr) by 2002:a25:8407:0:b0:e28:e4a7:3206 with SMTP id 3f1490d57ef6-e2bb16d434dmr67225276.8.1729620389353; Tue, 22 Oct 2024 11:06:29 -0700 (PDT) Date: Tue, 22 Oct 2024 11:06:19 -0700 In-Reply-To: <20241022180623.463131-1-irogers@google.com> Message-Id: <20241022180623.463131-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: <20241022180623.463131-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog Subject: [PATCH v6 1/5] 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.163.g1226f6d8fa-goog From nobody Tue Nov 26 01:30:23 2024 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.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 AFCC81C9EA5 for ; Tue, 22 Oct 2024 18:06:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729620397; cv=none; b=NqQNbKuA610+UjuZ4pjAmUITnuu6+MHIEESXS7orfhHD3qx95i0FFAClsit2Z/hZ+4lexeKjEkmUo0x1UgNmFTMmlAh7t6+6TyHoi22MYzrFhkIi8kjEk1gLvqpaHTRGuSf5rRziFTRdJ1IPvkosxstfNEbZ8c1i9V5+6NoXDKU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729620397; c=relaxed/simple; bh=i56TutELJyju747PW/jC+vBmQ2fL3V8vBk/xbMdaWSk=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=DkAmdyY2WfIJEICmnmdS8z9BZAAyTUY+bjhZGhlhGQ/PrJImJYN4wLbF+jUnkM9PRwaz6B2aL8stE1/HUDkk1lcLI9NQ1mbTH+wyGnseoH9RXZBKlErCHErOgC9KslW4xNZIJEqISKdBC4Kc98ugxruSokjBLZ/ddlJVjEYIlyY= 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=rPjx/AMM; arc=none smtp.client-ip=209.85.128.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="rPjx/AMM" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6e3c638cc27so102644717b3.0 for ; Tue, 22 Oct 2024 11:06:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1729620392; x=1730225192; 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=pHVi0wiTCZ8XNVDWfm2kgVQ2vxCnevL6aW8uooVxNmE=; b=rPjx/AMMQue3asGoNLnD2T9a8OP9d1lXZ9SREuOjEaYY5KBg5zKH82f1Gwl2j2MO6J GCcIHlo/C44C4OBOwL+VGe/xP/FaOEwGBRD4ou+BCCuEvsYQM/2fCbF9ryixUQ3tebx/ nHa1cCoY0u8y0iIkhxJlezXhJ73fPO+DD0DwUUDBx6VPDcX8nakrdYHrp1mgMQmcEJ6a iq95wj6Fxtc/gIZOiCY4cF7aRTduVdqTVUpMGuLGaaf7gxdtk47BAUnIKxPoVGfn8I2e MEhJJxYB14pUKnXHxk0URjDXT/fpfkCJD7l+Zze8bzb+Ca25EA5Nc09aD0imkwVblJkq tswA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729620392; x=1730225192; 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=pHVi0wiTCZ8XNVDWfm2kgVQ2vxCnevL6aW8uooVxNmE=; b=JIMGwUKrulle9MAFl+rYD0RCFdVewnMSupz5+O8HyPH1n8qz2z4Cn28qq430SDQdZX XERaO67y9fEGWb1wvGiVm3jjfkzjXipYU8eQInKj4QJtTs88lfBYnKhsb/u65iu0bX7m b1lrcNt31Pnc1NgCyGCEXWl3M4jMZIZgS5lp1JfrPmb9Z871EDj/DMbPIuxkdKaRf6Lj TqJ4NE8eIHYJMngryVkm5P12bxIZ+kWabKktYYhCDJOUBEGdrsgVNON8MgzCK29UwOY2 jc+DDwjyb5rVnbvNqT6hG1RgSgzFU2cOyKRnb95lE4YFPpsq/WCEnGw4zWL8bGIpTbhy LU0w== X-Forwarded-Encrypted: i=1; AJvYcCUg7qR7TLC+uo5ZWVZl48ebrWDwjIABu7QR1c9B+981m8LRKRAj6R51gvfd9k6Ree7TnQx6Em1yNWaHywE=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9LQI36QVahW+h3v5wQAhNprt1A47n/ClPDws1nxpFYucOvB1P 9ruJ2a7uPD2O54iff06cNABY+5Jish9OcxIDKEvwa0NCSW4TShrPC9u48vASsTe1fI3f9bFOIHy hC3N/Cg== X-Google-Smtp-Source: AGHT+IHWXb5pNuPOjRzop1VQ7upGfc6wl0InK9yt+qEFebMqJoA7EY4i/nW0ZtPH+V9Kj5uH2ZfKqyilg+qr X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:57ba:88e0:aaf6:282]) (user=irogers job=sendgmr) by 2002:a05:690c:2e90:b0:6e3:1627:e866 with SMTP id 00721157ae682-6e5bfbd836bmr1480067b3.3.1729620391682; Tue, 22 Oct 2024 11:06:31 -0700 (PDT) Date: Tue, 22 Oct 2024 11:06:20 -0700 In-Reply-To: <20241022180623.463131-1-irogers@google.com> Message-Id: <20241022180623.463131-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: <20241022180623.463131-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog Subject: [PATCH v6 2/5] 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/Build | 1 + tools/perf/util/hwmon_pmu.c | 821 ++++++++++++++++++++++++++++++++++++ tools/perf/util/hwmon_pmu.h | 154 +++++++ tools/perf/util/pmu.h | 2 + 4 files changed, 978 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..519f2a8e512e --- /dev/null +++ b/tools/perf/util/hwmon_pmu.c @@ -0,0 +1,821 @@ +// 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 + +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" + +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 */ +}; + +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" + +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 _