From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.161.69 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794988526; b=R5yQJe7LnYXlmRR/G9GX0W8zkefG33IG+KE85Kr/F8TGMKstB7FTJp4cp4txaoEMd9Qr gu39l5QHMcAIm5UBa1xtYy3BlUvFss7dt4eQaqDb3Ap3kKcyJ+slNbBTXQfE9hN1mPQsT D1xRY3sI1hzM8kr79PuC40KZH62urIjQPg66bobiIyADx1CC4GbagrFYjywsIe/Tzq2A7 Xzl8fFnYKRSkt3nikBAEFR+cDRPG97d64VlegVE4xwweZm7c3aHxj9Spqnfa/5FlDVdSO CxNBzW905GHFi0088/8yp7WjimatZDjn2hmNHpJ9+cOdKOrOdG5nP7RYznI7WpjyhtA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794988526; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=5DboQG35Wnbme+vu2GzT8Sr2q49b+BE2rknnKDhVsEM=; b=FBbaN7lXOeaRGMpAFdS0XGf8JjDZR/c/wYCB5Dcv8SY44gsQJ7q02cH56vDuvPdSuW4X XMmWdVGKHDbFY1WBKdwO2XgR88UHl6XMuCHE3O6Ka26wCBmBx53kWfCpz4xcVB+X0YBJp Xr9CvewAJUEohhdIEKNENbkMSOno+UJ7xJwc6y80TqWGsVBt5AARpsYNCrzr0x4jY07+f ixNZf8wBU481OW6swZzh8681A8itrkl0HwItkBh4Gz6qjOLA9ouMdnY9HjDbLx5FU6flr 6PC8Mr4nU9QYL6AQTuKG2rap97ViX87w4Vd1lmXnEG3Bkq2F0wEgjqpCrx1Nvt62eUg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b="AQQ/L8vO"; arc=none smtp.remote-ip=209.85.161.69 Received: from mail-oo1-f69.google.com (mail-oo1-f69.google.com [209.85.161.69]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 01842606A885 for ; Wed, 18 Nov 2026 07:55:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 01842606A885 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.a=rsa-sha256 header.s=20260707 header.b=AQQ/L8vO Received: by mail-oo1-f69.google.com with SMTP id 006d021491bc7-71adbbb6b26so865558eaf.3 for ; Tue, 17 Nov 2026 23:55:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794988525; x=1795593325; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=5DboQG35Wnbme+vu2GzT8Sr2q49b+BE2rknnKDhVsEM=; b=AQQ/L8vOOgjQs8+YpYQIJxCvxusw4ebii6H3YezaRzLkwaeODjW6b/+tNgvuPwrrB2 USnR+i+HCZWOt9xIxM3p3070M4AmbpscZrHeIkWPa6MuK/E2L6x5ixuCDLU+/eEKdWSK iE91CWSnXzxI1Adhzf8Tr/I5uiyFt/ShdYItltY2QPMMYaR8BjRcRIwAF4xLg4zJ47b1 87t4jpDgEVVAOctbH3lljq5q6CjCyVDU99tk4MIcsCUEgYuPoxXT/A+2Zao1w/wccQsu Atpcl/Iq9kvaerq9lSu9DygMYJLuF72RLTYAQJv4IaXbV2nan/+fr+8CLK/H5ZqD1B/F AgWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794988525; x=1795593325; h=content-type:cc: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:content-type; bh=5DboQG35Wnbme+vu2GzT8Sr2q49b+BE2rknnKDhVsEM=; b=SUnFamXJ2GW1yeshjOT3LvYSKn8zkayr/Ei5sMxvxrX4L037hIDaBEdG8Dj0+9FByd gsNFarWjU0Hy1HsmkefII7RfUHXShVZMOskbEDgOofLD0RdXaxz7GJUZHd88doc4NVPO +6CRhPt9gvI8pvIjiO1bBJp51R7wGnkJ/eYfsGGQaOXbIu/of7BNdY/m0zsLT38AjBII 5ReOYDEGCcV6FbIm2gOkj3w/uKfKefUMUwkkC23KMyhICyR+ssjlLjjD9Cw04wN71xcx m3XH3CYwDkcupE19oHV2Zzn6IvODEpnDOIljxxm5ggb/D6fH47ToNn4Z63zLqIMpE7Pm aBng== X-Forwarded-Encrypted: i=1; AL+hErF2aj6FyIvrhMp49Zgsp0C+oXPh3xVn5Y7D31azN61sHOyd6SehOamWteyAcfBRkqD9u8cojA6yFe6I1IWIMUZy@vger.kernel.org X-Gm-Message-State: APuU4Z93Rjj26uBh3yz37dQzu4NwzUxvinSfN2/rfs+xVstKruBIBWOP j41LR15E0KGFragLb8x2YsdLlWAkhv8RknuA3o6/oE1ks2bpEe4/iDyqUVQS2qusie/J0kDmZtH Orl+0A++VwA== X-Received: from oabmp13.prod.google.com ([2002:a05:6870:e0d:b0:4ad:bdb3:7d44]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6820:338e:10b0:71a:e62f:62ee with SMTP id 006d021491bc7-71b1843fdc0mr997029eaf.23.1794988524703; Tue, 17 Nov 2026 23:55:24 -0800 (PST) Date: Tue, 17 Nov 2026 23:55:13 -0800 In-Reply-To: <20261118075516.1278903-1-irogers@google.com> X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261118075516.1278903-1-irogers@google.com> X-Mailer: git-send-email 2.56.1.703.gf848ed807c-goog Message-ID: <20261118075516.1278903-3-irogers@google.com> Subject: [PATCH v1 2/4] perf stat: Don't corrupt zero or prev_raw_counts on skipped per-pkg CPUs From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim Cc: Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" In process_counter_values(), when check_per_pkg() sets skip = true for a secondary CPU in an already-counted package/die, count was pointed at a local 'static struct perf_counts_values zero' before calling evsel__compute_deltas(). evsel__compute_deltas() saves *count into evsel->prev_raw_counts and subtracts the previous interval's raw counts from *count in place. If a CPU had non-zero counts in an earlier interval and is later skipped, subtracting tmp from zero underflows the static zero struct in place (corrupting all subsequent skipped CPUs for the remainder of the perf stat run) and overwrites prev_raw_counts for that CPU with zeros. Make zero a zero-initialized stack variable, compute interval deltas on the real CPU counter values first so prev_raw_counts stays accurate, and only substitute &zero afterwards when skipping aggregation. Fixes: 779d0b997e07 ("perf stat: Add support for per-pkg counters") Signed-off-by: Ian Rogers --- tools/perf/util/stat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c index 6da3dbb..267e280 100644 --- a/tools/perf/util/stat.c +++ b/tools/perf/util/stat.c @@ -398,7 +398,7 @@ process_counter_values(struct perf_stat_config *config, struct evsel *evsel, struct perf_counts_values *count) { struct perf_stat_evsel *ps = evsel->stats; - static struct perf_counts_values zero; + struct perf_counts_values zero = {}; bool skip = false; if (check_per_pkg(evsel, count, cpu_map_idx, &skip)) { @@ -406,12 +406,12 @@ process_counter_values(struct perf_stat_config *config, struct evsel *evsel, return -1; } - if (skip) - count = &zero; - if (!evsel->snapshot) evsel__compute_deltas(evsel, cpu_map_idx, thread, count); - perf_counts_values__scale(count, config->scale, NULL); + if (skip) + count = &zero; + else + perf_counts_values__scale(count, config->scale, NULL); if (config->aggr_mode == AGGR_THREAD) { struct perf_counts_values *aggr_counts = &ps->aggr[thread].counts; -- 2.56.1.703.gf848ed807c-goog