From nobody Wed Dec 17 13:56:51 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 9C04D190692 for ; Tue, 18 Mar 2025 04:14:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742271293; cv=none; b=efyRQEh0OANvoLilyD0uP366p9YGxmCMRJopqHcx8EMx0ifbrHjE8Qnrn9JKmw7yvi7iz8dLgQ5hfC9bek8E0Un68sxh0OP9SsLlJil+Vc8FOu1FIKAj2bx+v03Bx7VD2CAzOlhe6s0IVsvKf3sjGFQ3kvDvvxE44Mo7+/9KX5c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742271293; c=relaxed/simple; bh=l1jkTLgRI/f5/qN6LeVtV033c5ilO6kZMs//pmDP2rQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=QWuGc2mhl5WY0DqtQcW0VyU8M9M9jVonMEKbM4CVOGq66olcJ055X6W3CtQAgG7Ixv2vbGRBZnnkbiygL06H20GgofyowbbTSUoeet812GSxSmxwvcMNGPyTUMLvyD6OmPe2563teLcPUCFLQJhcQNvXDEux0Q26ZQM9ulXGbBA= 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=d+4IFBgd; arc=none smtp.client-ip=209.85.216.74 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="d+4IFBgd" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2ff7cf599beso6282392a91.0 for ; Mon, 17 Mar 2025 21:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742271291; x=1742876091; 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=q/73Kpk2L7vMutO69KMLDlRxgU/lpzgb+NuxVOTOV6A=; b=d+4IFBgdlnRsARL/Mss+ihgrItD7PiQ02SUAMb3iCtSQNW0/qc88RfPiE286I2Hsz4 XCkEXvjIBxxVYgkJOCF6LOq57GirS0s8elP0xKW0+jbD1+AzXcFJAZwyyTuOusWCsnMV Nr55o/Zg8j0uutYLYa2MKm6LuilU9ExPkiQiFsuOWHzZkM7oTKvDc7MuQla/BLG57CMe gm8k1ov2bxiW+g02SPcv5+ElJsLIJ217Q5palzG4NJAGTMiD36RP72co5nEIBviG15Bi 7d82SwYiNj89XTbngmePZ3iyChiyiOFzpTTDxQTFhcZJNfrgj2R+QCyHBR5BX2qR8VQ6 Nc1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742271291; x=1742876091; 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=q/73Kpk2L7vMutO69KMLDlRxgU/lpzgb+NuxVOTOV6A=; b=V3e+PmnGCzyWfA/v2ssttowkypkr4vOfwngl2EUK86cWs3ZLfh7RA1j2HJ2/V5pDl/ 1kE+2++SqRKsljDzQtETK19cGQOUxjVRFaeLa8HAGVsYC7Dm6whHTlhb0X4lCRoZnBPH 4sP1dNI8+I6V93gd6nZqaRxFYHHg44KjQDr5mhI0rOfCowVnppAI8C0dWjCdMhUMMXkk PCMr9a+rYmzEsMpqT8Y9/0SIFAUD33qRJUxMXq/+l+E19m5UCMFuH8YzzKkBHbEP28tw GccQ4KlSZR/slCDwML1vp0SO8qcr+TxRTexbFuhxOG/H0sD6tYltbPg+P3iSc6F2w8kR vqTQ== X-Forwarded-Encrypted: i=1; AJvYcCXM62WNBsyD0An8uRwk9YO9nLYqambrOVgEn5lPV7gT6DLbC2loGlRuv3n7nWoT77ODlM7fQyRqJETUx90=@vger.kernel.org X-Gm-Message-State: AOJu0YxSI6xMrkbJfnkR1trTSocmAeznzgXnFjoB0YXxBCd8VySmvBSw xCl6eMcAjppveudS7Vcx8wThM/EeRzw0Yjt5zAbUVrGmcsuY6CunlnEBWvP2xRqBIrqZnZka0CO eOwZ/ng== X-Google-Smtp-Source: AGHT+IFcAfBEQciZiHy7t7Sm89sYmqUs7Yj7t+9M+SoNXAE5qEt6Y0tXRSIqYugJh7uXMU3uF3V9yse6JCAi X-Received: from pfl8.prod.google.com ([2002:a05:6a00:708:b0:736:3cd5:ba3a]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:4325:b0:1ee:e96a:d9ed with SMTP id adf61e73a8af0-1fa43ace812mr2992442637.7.1742271290868; Mon, 17 Mar 2025 21:14:50 -0700 (PDT) Date: Mon, 17 Mar 2025 21:14:38 -0700 In-Reply-To: <20250318041442.321230-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250318041442.321230-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.rc1.451.g8f38331e32-goog Message-ID: <20250318041442.321230-2-irogers@google.com> Subject: [PATCH v1 1/5] perf stat: Better hybrid support for the NMI watchdog warning 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 , Howard Chu , Weilin Wang , Levi Yun , "Dr. David Alan Gilbert" , Andi Kleen , James Clark , Dominique Martinet , 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': cpu_core/cycles/ = (0.00%) cpu_core/cycles/ = (0.00%) cpu_core/cycles/ = (0.00%) cpu_core/cycles/ = (0.00%) cpu_core/cycles/ = (0.00%) cpu_core/cycles/ = (0.00%) cpu_core/cycles/ = (0.00%) cpu_core/cycles/ = (0.00%) 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 --- tools/perf/util/stat-display.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c index e852ac0d9847..f311f1960e29 100644 --- a/tools/perf/util/stat-display.c +++ b/tools/perf/util/stat-display.c @@ -825,13 +825,25 @@ static bool is_mixed_hw_group(struct evsel *counter) static bool evlist__has_hybrid(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; --=20 2.49.0.rc1.451.g8f38331e32-goog