From: 徐福海 <xufuhai1992@gmail.com>
To: shuah@kernel.org, Shuah Khan <skhan@linuxfoundation.org>,
Thomas Renninger <trenn@suse.com>
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
lishujin@kuaishou.com, xufuhai <xufuhai@kuaishou.com>
Subject: [PATCH v3 2/2] cpupower: Fix amd cpu (family >= 0x17) active state issue
Date: Sun, 18 Apr 2021 11:30:38 +0800 [thread overview]
Message-ID: <6e35df20-753a-6c9c-8786-3fc87cdd17ba@gmail.com> (raw)
From: xufuhai <xufuhai@kuaishou.com>
If the read_msr function is executed by a non-root user, the function returns
-1, which means that there is no permission to access /dev/cpu/%d/msr, but
cpufreq_has_boost_support should also return -1 immediately, and should not
follow the original logic to return 0, which will cause amd The cpupower tool
returns the boost active state as 0.
Reproduce procedure:
cpupower frequency-info
Reported-by: yangrui <yangrui@kuaishou.com>
Signed-off-by: xufuhai <xufuhai@kuaishou.com>
Signed-off-by: chenguanqiao <chenguanqiao@kuaishou.com>
Signed-off-by: lishujin <lishujin@kuaishou.com>
Reviewed-by: Thomas Renninger <trenn@suse.com>
---
tools/power/cpupower/utils/helpers/misc.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/tools/power/cpupower/utils/helpers/misc.c b/tools/power/cpupower/utils/helpers/misc.c
index fc6e34511721..565f8c414396 100644
--- a/tools/power/cpupower/utils/helpers/misc.c
+++ b/tools/power/cpupower/utils/helpers/misc.c
@@ -16,7 +16,7 @@
int cpufreq_has_boost_support(unsigned int cpu, int *support, int *active,
int *states)
{
- int ret;
+ int ret = 0;
unsigned long long val;
*support = *active = *states = 0;
@@ -30,18 +30,21 @@ int cpufreq_has_boost_support(unsigned int cpu, int *support, int *active,
*/
if (cpupower_cpu_info.caps & CPUPOWER_CAP_AMD_CPB_MSR) {
- if (!read_msr(cpu, MSR_AMD_HWCR, &val)) {
+ /*
+ * no permission to access /dev/cpu/%d/msr, return -1 immediately,
+ * and should not follow the original logic to return 0
+ */
+ ret = read_msr(cpu, MSR_AMD_HWCR, &val);
+ if (!ret) {
if (!(val & CPUPOWER_AMD_CPBDIS))
*active = 1;
}
} else {
ret = amd_pci_get_num_boost_states(active, states);
- if (ret)
- return ret;
}
} else if (cpupower_cpu_info.caps & CPUPOWER_CAP_INTEL_IDA)
*support = *active = 1;
- return 0;
+ return ret;
}
int cpupower_intel_get_perf_bias(unsigned int cpu)
--
2.24.3 (Apple Git-128)
reply other threads:[~2021-04-18 3:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6e35df20-753a-6c9c-8786-3fc87cdd17ba@gmail.com \
--to=xufuhai1992@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=lishujin@kuaishou.com \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=trenn@suse.com \
--cc=xufuhai@kuaishou.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).