From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EAE96158DDC; Mon, 22 Apr 2024 23:59:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713830365; cv=none; b=oY9tMLJIZNbek7KpTgilcOC0gqWPtqQK8xxn4bSrULsFTnhccZ0H9aVnaVrHukAWObONfdJnC/tbqcqxQA+q+oHqNgQzj343MU/+Ttd35BHAFNJF0ZyEz2isI66WAGg5gCxzyyRl3TdVNcu1OoQCfr+qhDkUSPJ8dxq6SUc+r8w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713830365; c=relaxed/simple; bh=MKNiflqIXRrj5lN/lsjcmJ8q/CWlbL4S4sZU9z/kAEA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=mUWJliNqnBUOHaTE5e/5d3pRouDBgxAjDL+U1sLNOgODLO4xgZJmjTQZQ8vhDgBStWD8OvgF7US3BCzFnclVZFNdlBcyqqEfuubgzoB9RsKJSnHkTMcPwRoApWSAZAqZB8VDkvsfkWjiPNdvthav/RCc5iWH/t/0vSN10vM7oOc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=adqn84gQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="adqn84gQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD095C113CC; Mon, 22 Apr 2024 23:59:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713830363; bh=MKNiflqIXRrj5lN/lsjcmJ8q/CWlbL4S4sZU9z/kAEA=; h=From:To:Cc:Subject:Date:From; b=adqn84gQbCpMMA6do/+Ng3xsa8iQ3OfBg7L/2eJhGaNj6BWAXtEaJxJcNkziDD0Ay 4tBD6P8iMlQeuKBvMtitemYx1LmuTSFKcBcB24E3w5ylqpZcD4bzyxi/Stc4E3qiCb E6sLYMSXVy6aKAs4QMprlo4Ams0+5HVzoZvh8Vk+bNezNMXR6GAtFj8hR6hlSTO7rM S3S/+9PJ0AR8pJ60b0XY3uUP4zEcaZdFmWQ2p/Db5CVrXTepqFu055vMgQy577I/xe Eq2DiFFM04bR4jUACgfbg6PUBnSaXiUGYjJvnHsrZvanmiPlrjMa3gk2zcqFiAK99a wHVKfGIrGE7/Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Doug Smythies , Len Brown , Sasha Levin , lenb@kernel.org, linux-pm@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 1/7] tools/power turbostat: Fix added raw MSR output Date: Mon, 22 Apr 2024 19:20:33 -0400 Message-ID: <20240422232040.1616527-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.19.312 Content-Transfer-Encoding: 8bit From: Doug Smythies [ Upstream commit e5f4e68eed85fa8495d78cd966eecc2b27bb9e53 ] When using --Summary mode, added MSRs in raw mode always print zeros. Print the actual register contents. Example, with patch: note the added column: --add msr0x64f,u32,package,raw,REASON Where: 0x64F is MSR_CORE_PERF_LIMIT_REASONS Busy% Bzy_MHz PkgTmp PkgWatt CorWatt REASON 0.00 4800 35 1.42 0.76 0x00000000 0.00 4801 34 1.42 0.76 0x00000000 80.08 4531 66 108.17 107.52 0x08000000 98.69 4530 66 133.21 132.54 0x08000000 99.28 4505 66 128.26 127.60 0x0c000400 99.65 4486 68 124.91 124.25 0x0c000400 99.63 4483 68 124.90 124.25 0x0c000400 79.34 4481 41 99.80 99.13 0x0c000000 0.00 4801 41 1.40 0.73 0x0c000000 Where, for the test processor (i5-10600K): PKG Limit #1: 125.000 Watts, 8.000000 sec MSR bit 26 = log; bit 10 = status PKG Limit #2: 136.000 Watts, 0.002441 sec MSR bit 27 = log; bit 11 = status Example, without patch: Busy% Bzy_MHz PkgTmp PkgWatt CorWatt REASON 0.01 4800 35 1.43 0.77 0x00000000 0.00 4801 35 1.39 0.73 0x00000000 83.49 4531 66 112.71 112.06 0x00000000 98.69 4530 68 133.35 132.69 0x00000000 99.31 4500 67 127.96 127.30 0x00000000 99.63 4483 69 124.91 124.25 0x00000000 99.61 4481 69 124.90 124.25 0x00000000 99.61 4481 71 124.92 124.25 0x00000000 59.35 4479 42 75.03 74.37 0x00000000 0.00 4800 42 1.39 0.73 0x00000000 0.00 4801 42 1.42 0.76 0x00000000 c000000 [lenb: simplified patch to apply only to package scope] Signed-off-by: Doug Smythies Signed-off-by: Len Brown Signed-off-by: Sasha Levin --- tools/power/x86/turbostat/turbostat.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 2233cf722c692..0eeb339482c06 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -1524,9 +1524,10 @@ int sum_counters(struct thread_data *t, struct core_data *c, average.packages.rapl_dram_perf_status += p->rapl_dram_perf_status; for (i = 0, mp = sys.pp; mp; i++, mp = mp->next) { - if (mp->format == FORMAT_RAW) - continue; - average.packages.counter[i] += p->counter[i]; + if ((mp->format == FORMAT_RAW) && (topo.num_packages == 0)) + average.packages.counter[i] = p->counter[i]; + else + average.packages.counter[i] += p->counter[i]; } return 0; } -- 2.43.0