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 9012E30146A; Tue, 26 Aug 2025 13:50: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=1756216223; cv=none; b=QMO9e/aSc73L5NsV8f+NOkksfCTeFpxwKCE9441XXEZH9yp5qgS3WZC7BGubHBDqfewsdvPfMywl1K2lDCHk201DUGjKEnj9fM+tYSIFxUd3zDLw4qxJkj4VqU3gfI0gUrGV+mWjvs3sak8Nr5lSTk+mCevVw3Lh24cu6pSd+U0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756216223; c=relaxed/simple; bh=YUlF677zbDRk7Ye0C4XNk30QvBbjc1CpYXkitdWsAhQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Mg/LddR6gpH6Q7ShfFoCvO5HLpdpAFkESYZgRh6zwIKafBE0bCHOf+R3JyFYUbCl2nGpicRh57UVupqPjYonexZLf6ALjXdvmP8At30JNNBNKnFnBmIT/bPHljNc+hg90lRZg6qpMc3UBU9wayC51XcLwHfXPpGrxlmMiqE4Da8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0UCkz/Jm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="0UCkz/Jm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B614C4CEF1; Tue, 26 Aug 2025 13:50:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756216223; bh=YUlF677zbDRk7Ye0C4XNk30QvBbjc1CpYXkitdWsAhQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0UCkz/JmVCXwUJG3U0IWYhRJXNqkq3fKAdlashiQaEI6xdIpEjW4xPI+BZBxMdIqd Q9mvWdtnPLyBp7AVXi9B85xESG7sRfLLo5BGFrgQAQvY8octzOu1iD0tv9liL8K8YY MbuZ6I2UPaCc2O4ndiVhhhOwwMMv3Z2Imsms3MUo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Gautham R. Shenoy" , Shuah Khan , Sasha Levin Subject: [PATCH 5.15 329/644] pm: cpupower: Fix the snapshot-order of tsc,mperf, clock in mperf_stop() Date: Tue, 26 Aug 2025 13:07:00 +0200 Message-ID: <20250826110954.539404498@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110946.507083938@linuxfoundation.org> References: <20250826110946.507083938@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Gautham R. Shenoy [ Upstream commit cda7ac8ce7de84cf32a3871ba5f318aa3b79381e ] In the function mperf_start(), mperf_monitor snapshots the time, tsc and finally the aperf,mperf MSRs. However, this order of snapshotting in is reversed in mperf_stop(). As a result, the C0 residency (which is computed as delta_mperf * 100 / delta_tsc) is under-reported on CPUs that is 100% busy. Fix this by snapshotting time, tsc and then aperf,mperf in mperf_stop() in the same order as in mperf_start(). Link: https://lore.kernel.org/r/20250612122355.19629-2-gautham.shenoy@amd.com Signed-off-by: Gautham R. Shenoy Signed-off-by: Shuah Khan Signed-off-by: Sasha Levin --- tools/power/cpupower/utils/idle_monitor/mperf_monitor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/power/cpupower/utils/idle_monitor/mperf_monitor.c b/tools/power/cpupower/utils/idle_monitor/mperf_monitor.c index 08a399b0be28..6ab9139f16af 100644 --- a/tools/power/cpupower/utils/idle_monitor/mperf_monitor.c +++ b/tools/power/cpupower/utils/idle_monitor/mperf_monitor.c @@ -240,9 +240,9 @@ static int mperf_stop(void) int cpu; for (cpu = 0; cpu < cpu_count; cpu++) { - mperf_measure_stats(cpu); - mperf_get_tsc(&tsc_at_measure_end[cpu]); clock_gettime(CLOCK_REALTIME, &time_end[cpu]); + mperf_get_tsc(&tsc_at_measure_end[cpu]); + mperf_measure_stats(cpu); } return 0; -- 2.39.5