forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
commit 13a779de41 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Calvin Walton 2021-04-28 17:09:16 +08:00 • committed by Greg Kroah-Hartman
commit ea6803ff2c
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -291,9 +291,9 @@ struct msr_sum_array {
/* The percpu MSR sum array.*/ /* The percpu MSR sum array.*/
struct msr_sum_array *per_cpu_msr_sum; 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) { switch (idx) {
case IDX_PKG_ENERGY: case IDX_PKG_ENERGY:
@ -323,7 +323,7 @@ int idx_to_offset(int idx)
return offset; return offset;
} }
int offset_to_idx(int offset) int offset_to_idx(off_t offset)
{ {
int idx; int idx;
@ -3249,7 +3249,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++) { for (i = IDX_PKG_ENERGY; i < IDX_COUNT; i++) {
unsigned long long msr_cur, msr_last; unsigned long long msr_cur, msr_last;
int offset; off_t offset;
if (!idx_valid(i)) if (!idx_valid(i))
continue; continue;
@ -3258,7 +3258,8 @@ static int update_msr_sum(struct thread_data *t, struct core_data *c, struct pkg
continue; continue;
ret = get_msr(cpu, offset, &msr_cur); ret = get_msr(cpu, offset, &msr_cur);
if (ret) { 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; continue;
} }