From patchwork Thu Sep 12 19:03:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13802490 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 99849EEB59D for ; Thu, 12 Sep 2024 19:05:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:To:From:Subject :Mime-Version:Message-Id:Date:Reply-To:Cc:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=2sNGvL2VOu0liFGPuoqfsWHmc/NgIkXkJDvIf2DAgOg=; b=LZFkHw9Qjlqnz4n0OwrWnHHnZD WicdlwbWQpEUpz0HEpFpObWSOrpUp38gojhO434YSSDEH0cV1NwGUg1zLZyMmHo6FMeeZCx2TwmOk SJxQj/E1/P3VYqIHftYiGsO47QF1w8628FgRpn1zSIrSJUmMkRxiRXLYTKlMAl82OWwKfMh6fpkSp RWLoc4J1uZdR1OL3tI61pqX0Pa1beFIM/XEkBVzZ1X2+5UOXzmU4bKkunBU8JzAumKcRjWRm+9YiK FByFtcdPR7sumYZYxaQ15ZFImMhEDyupGbybj6LZ7DnrEyr2UreHLVQ48lv5oHOe86Q+LMI071Bnt Ayo0168w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sop7n-0000000DzuA-10jh; Thu, 12 Sep 2024 19:05:03 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sop6e-0000000DzYQ-06hi for linux-arm-kernel@lists.infradead.org; Thu, 12 Sep 2024 19:03:53 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-69a0536b23aso28708697b3.3 for ; Thu, 12 Sep 2024 12:03:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1726167830; x=1726772630; darn=lists.infradead.org; h=to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=2sNGvL2VOu0liFGPuoqfsWHmc/NgIkXkJDvIf2DAgOg=; b=tYeyuuA5iBBI8M0HqKSRd9zZ938triSagHcuo0S+bAscho16C1arfhaLBCA5T5lCxg 9c1gpcnvr8xCwtPn/gK5tSbsoip3t+qjbqUgSk/q3bsMqIHyBZzrihn7uafRf0wYlJqg XaB46RIcJDKImvVZsMgBhxwltQo3R7hbPbz3Gdzs9r0wqiBJtiQ8MfRbs948PFCwEvS+ B7gy53x5agVSAxON9cl8aryyhnqNJ1CKV0i154TQKg2BAspgY6/DRfAO47fUN4q5kni7 lD/MxagwXqLc7wf9Ej153me4QOeiUUaWbbHTBDkjGX548LhGBTrJLImfT8KmkmNkuwL7 n9qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726167830; x=1726772630; h=to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=2sNGvL2VOu0liFGPuoqfsWHmc/NgIkXkJDvIf2DAgOg=; b=dmaFZwchD2xPbmMkuAOhA0okcgITrSAMltvLSEMA4HkBItH35beXibkjzxx6AVErt0 UO3kwMt5klkywLqrY6oDqTq3vhGFE3o1c4L88yatrnpwlOni+vgHgUaq6GlF+NgvCDpZ 6813JNrX2lU4UOvSUah51H3qfgGogxw/xZQQAqFTpHMZP7TickU0TdtOqlmU4yltTEDk JxYi+vlnUMH0BiK8UXMo/wfeVxr0Od5BqR9wjAQPTII5B00T+23hoJSQdIfFK++sZ7Pp 0UYuxEZaeTgWY4SMMS6vXugJ3uQ5s+05y9BWZVYflRoaEas8Wu9fSlS23x7p0BvVoYXe QxEw== X-Forwarded-Encrypted: i=1; AJvYcCWZ9LF6MjCtmzQE5RXfY2sBwqP7dPzaKvr+0jnIvXVo+qIHnmpEenuLXbMpanFuEqEnr/HwSkqACaA7lmHp1h0d@lists.infradead.org X-Gm-Message-State: AOJu0YwHEe8Lf0WK/24WHmRtloLO95euiFnF/lMRGcFzhKsrFBh1uydv lWv5f4V5vppfndgpHPB05QtzAQqU1HPIh0jPxNcRRLnQ4n/QzEVT2hx8vOAW69OLsSzGCI4Ib76 7oRMXxQ== X-Google-Smtp-Source: AGHT+IE2Py4W0sZ2T5cgNqZ17XiwhcfJ06rRdCbN0ZeLEM3LB0/2WFJy/hiLXZvpx6BVirC8q0nhe9qfZ2k8 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:cf0e:7a99:e672:3862]) (user=irogers job=sendgmr) by 2002:a05:690c:7449:b0:6db:cddc:a202 with SMTP id 00721157ae682-6dbcddca3d4mr15947b3.5.1726167829840; Thu, 12 Sep 2024 12:03:49 -0700 (PDT) Date: Thu, 12 Sep 2024 12:03:27 -0700 Message-Id: <20240912190341.919229-1-irogers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.46.0.662.g92d0881bb0-goog Subject: [PATCH v2 00/13] Tool and hwmon PMUs 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 , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Ravi Bangoria , Weilin Wang , Jing Zhang , Xu Yang , Sandipan Das , Benjamin Gray , Athira Jajeev , Howard Chu , Dominique Martinet , Yang Jihong , Colin Ian King , Veronika Molnarova , "Dr. David Alan Gilbert" , Oliver Upton , Changbin Du , Ze Gao , Andi Kleen , " =?utf-8?q?Cl=C3=A9ment_Le_Goffic?= " , Sun Haiyong , Junhao He , Tiezhu Yang , Yicong Yang , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240912_120352_089889_C384FF7D X-CRM114-Status: GOOD ( 17.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Rather than have fake and tool PMUs being special flags in an evsel, create special PMUs. This allows, for example, duration_time to also be tool/duration_time/. Once adding events to the tools PMU is just adding to an array, add events for nearly all the expr literals like num_cpus_online. Rather than create custom logic for finding and describing the tool events use json and add a notion of common json for the tool events. Following the convention of the tool PMU, create a hwmon PMU that exposes hwmon data for reading. For example, 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 ... ``` Additional data on the hwmon events is in perf list: ``` $ perf list ... hwmon: ... temp_core_0 OR temp2 [Temperature in unit coretemp named Core 0. crit=100'C,max=100'C crit_alarm=0'C. Unit: hwmon_coretemp] ... ``` v2: Address Namhyung's review feedback. Rebase dropping 4 patches applied by Arnaldo, fix build breakage reported by Arnaldo. Ian Rogers (13): perf pmu: Simplify an asprintf error message perf pmu: Allow hardcoded terms to be applied to attributes perf parse-events: Expose/rename config_term_name perf tool_pmu: Factor tool events into their own PMU perf tool_pmu: Rename enum perf_tool_event to tool_pmu_event perf tool_pmu: Rename perf_tool_event__* to tool_pmu__* perf tool_pmu: Move expr literals to tool_pmu perf jevents: Add tool event json under a common architecture perf tool_pmu: Switch to standard pmu functions and json descriptions perf tests: Add tool PMU test perf hwmon_pmu: Add a tool PMU exposing events from hwmon in sysfs perf test: Add hwmon "PMU" test perf docs: Document tool and hwmon events tools/perf/Documentation/perf-list.txt | 15 + tools/perf/arch/arm64/util/pmu.c | 5 +- tools/perf/arch/x86/util/intel-pt.c | 3 +- tools/perf/arch/x86/util/tsc.c | 18 +- tools/perf/builtin-list.c | 13 +- tools/perf/builtin-stat.c | 7 +- .../pmu-events/arch/common/common/tool.json | 74 ++ tools/perf/pmu-events/empty-pmu-events.c | 208 +++-- tools/perf/pmu-events/jevents.py | 16 +- tools/perf/tests/Build | 2 + tools/perf/tests/builtin-test.c | 2 + tools/perf/tests/hwmon_pmu.c | 243 ++++++ tools/perf/tests/pmu.c | 3 +- tools/perf/tests/tests.h | 2 + tools/perf/tests/tool_pmu.c | 111 +++ tools/perf/util/Build | 2 + tools/perf/util/evsel.c | 287 +----- tools/perf/util/evsel.h | 28 +- tools/perf/util/expr.c | 93 +- tools/perf/util/hwmon_pmu.c | 818 ++++++++++++++++++ tools/perf/util/hwmon_pmu.h | 154 ++++ tools/perf/util/metricgroup.c | 35 +- tools/perf/util/parse-events.c | 62 +- tools/perf/util/parse-events.h | 5 +- tools/perf/util/parse-events.l | 11 - tools/perf/util/parse-events.y | 16 - tools/perf/util/pmu.c | 104 ++- tools/perf/util/pmu.h | 9 +- tools/perf/util/pmus.c | 16 + tools/perf/util/pmus.h | 3 + tools/perf/util/print-events.c | 36 +- tools/perf/util/print-events.h | 1 - tools/perf/util/stat-display.c | 14 +- tools/perf/util/stat-shadow.c | 22 +- tools/perf/util/tool_pmu.c | 508 +++++++++++ tools/perf/util/tool_pmu.h | 56 ++ tools/perf/util/tsc.h | 2 +- 37 files changed, 2376 insertions(+), 628 deletions(-) create mode 100644 tools/perf/pmu-events/arch/common/common/tool.json create mode 100644 tools/perf/tests/hwmon_pmu.c create mode 100644 tools/perf/tests/tool_pmu.c create mode 100644 tools/perf/util/hwmon_pmu.c create mode 100644 tools/perf/util/hwmon_pmu.h create mode 100644 tools/perf/util/tool_pmu.c create mode 100644 tools/perf/util/tool_pmu.h Acked-by: Namhyung Kim