Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-06 05:13:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools/power turbostat: Fix offset overflow issue in index converting

Browse Source 
The idx_to_offset() function returns type int (32-bit signed), but
MSR_PKG_ENERGY_STAT is u32 and would be interpreted as a negative number.
The end result is that it hits the if (offset < 0) check in update_msr_sum()
which prevents the timer callback from updating the stat in the background when
long durations are used. The similar issue exists in offset_to_idx() and
update_msr_sum(). Fix this issue by converting the 'int' to 'off_t' accordingly.

Fixes: 9972d5d84d ("tools/power turbostat: Enable accumulate RAPL display")
Signed-off-by: Calvin Walton <calvin.walton@kepstin.ca>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Calvin Walton 2021-04-28 17:09:16 +08:00 committed by Len Brown
parent 301b1d3a91
commit 13a779de41
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/power/x86/turbostat/turbostat.c
View File

@ -296,9 +296,9 @@ struct msr_sum_array {
/* The percpu MSR sum array.*/
struct msr_sum_array *per_cpu_msr_sum;
int idx_to_offset(int idx)
off_t idx_to_offset(int idx)
{
int offset;
off_t offset;
switch (idx) {
case IDX_PKG_ENERGY:
@ -328,7 +328,7 @@ int idx_to_offset(int idx)
return offset;
}
int offset_to_idx(int offset)
int offset_to_idx(off_t offset)
{
int idx;
@ -3338,7 +3338,7 @@ static int update_msr_sum(struct thread_data *t, struct core_data *c, struct pkg
for (i = IDX_PKG_ENERGY; i < IDX_COUNT; i++) {
unsigned long long msr_cur, msr_last;
int offset;
off_t offset;
if (!idx_valid(i))
continue;
@ -3347,7 +3347,8 @@ static int update_msr_sum(struct thread_data *t, struct core_data *c, struct pkg
continue;
ret = get_msr(cpu, offset, &msr_cur);
if (ret) {
fprintf(outf, "Can not update msr(0x%x)\n", offset);
fprintf(outf, "Can not update msr(0x%llx)\n",
(unsigned long long)offset);
continue;
}