From nobody Thu Apr 17 19:29:14 2025
Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com
[209.85.215.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 740681F03EC
for <linux-kernel@vger.kernel.org>; Wed, 2 Apr 2025 20:16:16 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=209.85.215.202
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1743624978; cv=none;
b=JABK65fJxcXN7JrVeWa76Ql3wsPZSlqPogGBRbiK2zsnPAr7xQoJFvPWHNRpvCqRZxoYn09/yyKlyltV5iuf2q1ih/vijftCedWSgcK/sF4MwBlZeYrrlDXyQEmd5Bzbxm06/QsnHNzPlnV/mw1ZIZGg8Mpcc6iYty/5i/TTik8=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1743624978; c=relaxed/simple;
bh=mdSSrhP7G24frprN16593VOBIgMZgeUhPBNK6wrZNsk=;
h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From:
To:Content-Type;
b=eT9iCLRt/9gA23FtTUvyawvAWslJRsb/YKi4pK58xy3XRbe9ksm3yN5lAhnliLb5HQDcVf42SI3sIjBnbAS+VJsI+3zERgjQn4PlZVrcSuXQeiqDWBZrPRstMkGx3iGBQzbxcMZ7zyyIoZCwL2rqIuxlDAWx1Jf58ke77q08Czs=
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=yipm/8kr; arc=none smtp.client-ip=209.85.215.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="yipm/8kr"
Received: by mail-pg1-f202.google.com with SMTP id
41be03b00d2f7-af570998077so184576a12.0
for <linux-kernel@vger.kernel.org>;
Wed, 02 Apr 2025 13:16:16 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=google.com; s=20230601; t=1743624976; x=1744229776;
darn=vger.kernel.org;
h=to:from:subject:message-id:references:mime-version:in-reply-to:date
:from:to:cc:subject:date:message-id:reply-to;
bh=32l0Pu2pjVOQ0/rzRKMg0Sp9sEBo5wkzEsYD7DuEcpE=;
b=yipm/8krmTWExkLJlePo7dM92sbC8vgIf9wYAbnKVgszX2MF5rE+rPzGlZHvEeYCaL
isLFRNZ22EUSaFZ1FyPE5llzowUU3vQkqke+sPJHr99Z03/ZIh88EdQEL0IEG76Z/i5b
fYg43pJVOuZ9itpKAcLXO7hZFCPxyiHsH9rf6NxkTYmX117tO3YDTfugjTgH59VbztEs
HynIv2mMVSNeH4/KD58y5Lqr0rA7gFqCNvfnQjOUWbTKYOd9ex17RGb1noaBpxMr4reT
ty5jmyekQg+SDiL4C93/D5ERD/QkeefvlJ9BCbiInAlZ6C+WyRXziXFQU+fGug4cFMM9
0/oQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1743624976; x=1744229776;
h=to:from:subject:message-id:references:mime-version:in-reply-to:date
:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=32l0Pu2pjVOQ0/rzRKMg0Sp9sEBo5wkzEsYD7DuEcpE=;
b=jrBkmKTYNEdY8+whT8WcM4fnOQg8PJiPEwAhLO3sTR3v6QcOIeURY+mnOgFkkTfjo3
dc8+PqhMXewtmDO0ra2ZmeFk0SkCmmugyXbIw0AvE2diVkcbOl4dVg3Snv/eEkFUAhKd
5qKHJcy9SCeuFKaKRHB/hvBU2DASEasyMEQA/jC5qhW4J2vdmEjaChV1Gd5GulUz8bxo
jHGwYAb0Q14blLLDE8qDLfw2C+pBJGWAnhA5skzntdTnimMgyp9LfQXvrlhT1SOy/u48
2wQNUKb/F85frC0o+YgrBWqFwnVRFyW/m9Dq7pOHLQlGaQHGiDSlz6jWBv9y56O6Pwtf
q+vg==
X-Forwarded-Encrypted: i=1;
AJvYcCV65FnOawSQkX40/ZfRY0xUidJnJbJVy1TgHcKuQg/bOa+Z9WZrCq3ojb1j1X1srUJUeqQm2CKIu8uNKUE=@vger.kernel.org
X-Gm-Message-State: AOJu0YyuFAtUCSvde5aE3PMU3QoYIUnGucEc887QU9TeD+4vDe3LeC0L
3pSTKw8ibNSWto+hdLeq2HRBw25LJAy1JlKuKZrrdCt5cY+5Othz2YEPl3uIiDy9plMEy38b6AT
eytGHkQ==
X-Google-Smtp-Source:
AGHT+IEA5HC2pgKufmc8BlDFZQkWT4SBZPM+GdUwHnsP32QmD9Uj4LuXnzm5s7gHWkyrTRUYBQU+oV3zK5zf
X-Received: from plxx10.prod.google.com ([2002:a17:902:e04a:b0:223:5416:c809])
(user=irogers job=prod-delivery.src-stubby-dispatcher) by
2002:a17:902:ea03:b0:220:c813:dfcc
with SMTP id d9443c01a7336-2292f9fa333mr300249905ad.40.1743624975684; Wed, 02
Apr 2025 13:16:15 -0700 (PDT)
Date: Wed, 2 Apr 2025 13:15:45 -0700
In-Reply-To: <20250402201549.4090305-1-irogers@google.com>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
Mime-Version: 1.0
References: <20250402201549.4090305-1-irogers@google.com>
X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog
Message-ID: <20250402201549.4090305-2-irogers@google.com>
Subject: [PATCH v3 1/5] perf stat: Better hybrid support for the NMI watchdog
warning
From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>,
Ian Rogers <irogers@google.com>, Adrian Hunter <adrian.hunter@intel.com>,
Kan Liang <kan.liang@linux.intel.com>, Howard Chu <howardchu95@gmail.com>,
Dominique Martinet <asmadeus@codewreck.org>, Levi Yun <yeoreum.yun@arm.com>,
"Dr. David Alan Gilbert" <linux@treblig.org>,
Andi Kleen <ak@linux.intel.com>,
James Clark <james.clark@linaro.org>, Weilin Wang <weilin.wang@intel.com>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"
Prior to this patch evlist__has_hybrid would return false if the
processor wasn't hybrid or the evlist didn't contain any core
events. If the only PMU used by events was cpu_core then it would
true even though there are no cpu_atom events. For example:
```
$ perf stat --cputype=3Dcpu_core -e '{cycles,cycles,cycles,cycles,cycles,cy=
cles,cycles,cycles,cycles}' true
Performance counter stats for 'true':
<not counted> cpu_core/cycles/ =
(0.00%)
<not counted> cpu_core/cycles/ =
(0.00%)
<not counted> cpu_core/cycles/ =
(0.00%)
<not counted> cpu_core/cycles/ =
(0.00%)
<not counted> cpu_core/cycles/ =
(0.00%)
<not counted> cpu_core/cycles/ =
(0.00%)
<not counted> cpu_core/cycles/ =
(0.00%)
<not counted> cpu_core/cycles/ =
(0.00%)
<not counted> cpu_core/cycles/ =
(0.00%)
0.001981900 seconds time elapsed
0.002311000 seconds user
0.000000000 seconds sys
```
This patch changes evlist__has_hybrid to return true only if the
evlist contains events from >1 core PMU. This means the NMI watchdog
warning is shown for the case above.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/stat-display.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index e852ac0d9847..1115efb380fb 100644
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -822,16 +822,28 @@ static bool is_mixed_hw_group(struct evsel *counter)
return false;
}
=20
-static bool evlist__has_hybrid(struct evlist *evlist)
+static bool evlist__has_hybrid_pmus(struct evlist *evlist)
{
struct evsel *evsel;
+ struct perf_pmu *last_core_pmu =3D NULL;
=20
if (perf_pmus__num_core_pmus() =3D=3D 1)
return false;
=20
evlist__for_each_entry(evlist, evsel) {
- if (evsel->core.is_pmu_core)
+ if (evsel->core.is_pmu_core) {
+ struct perf_pmu *pmu =3D evsel__find_pmu(evsel);
+
+ if (pmu =3D=3D last_core_pmu)
+ continue;
+
+ if (last_core_pmu =3D=3D NULL) {
+ last_core_pmu =3D pmu;
+ continue;
+ }
+ /* A distinct core PMU. */
return true;
+ }
}
=20
return false;
@@ -872,7 +884,7 @@ static void printout(struct perf_stat_config *config, s=
truct outstate *os,
ok =3D false;
=20
if (counter->supported) {
- if (!evlist__has_hybrid(counter->evlist)) {
+ if (!evlist__has_hybrid_pmus(counter->evlist)) {
config->print_free_counters_hint =3D 1;
if (is_mixed_hw_group(counter))
config->print_mixed_hw_group_error =3D 1;
--=20
2.49.0.504.g3bcea36a83-goog