linux-kernel - Re: [PATCH v2] tools/power turbostat: Fix RAPL summary collection on AMD processors

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 23 Apr 2021 22:27:49 +0800
From:   Chen Yu <yu.c.chen@...el.com>
To:     Calvin Walton <calvin.walton@...stin.ca>
Cc:     Borislav Petkov <bp@...e.de>, Terry Bowman <terry.bowman@....com>,
        lenb@...nel.org, linux-pm@...r.kernel.org,
        linux-kernel@...r.kernel.org, wei.huang2@....com, aros@....com,
        rui.zhang@...el.com
Subject: Re: [PATCH v2] tools/power turbostat: Fix RAPL summary collection on
 AMD processors

On Fri, Apr 23, 2021 at 10:04:10AM -0400, Calvin Walton wrote:
> On Fri, 2021-04-23 at 20:16 +0800, Chen Yu wrote
> > 
> > Calvin, could you please take a look at the following version if it
> > is suitible?
> 
> I assume this patch is adapted from my earlier submission of the
> complete fix to be an incremental fix on top of the already applied
> patch? If so, you are OK to add
> 
> Signed-off-by: Calvin Walton <calvin.walton@...stin.ca>
>
Thanks Calvin. BTW, I did not receive your incremental patch on top of
already applied one, so I post this patch in the name of yours. 
> > From b2e63fe4f02e17289414b4f61237da822df115fb Mon Sep 17 00:00:00
> > 2001
> > From: Calvin Walton <calvin.walton@...stin.ca>
> > Date: Fri, 23 Apr 2021 17:32:13 +0800
> > Subject: [PATCH 3/5] tools/power turbostat: Fix offset overflow issue
> > in index
> >  converting
> > 
> > The idx_to_offset() function returns type int (32-bit signed), but
> > MSR_PKG_ENERGY_STAT is greater than INT_MAX (or rather, would be
> > interpreted as a negative number). The end result is that it hits
> > the if (offset < 0) check in update_msr_sum() resulting in the timer
> > callback for updating the stat in the background when long durations
> > are used to not happen. The similar issue exists in offset_to_idx()
> > and update_msr_sum().
> > 
> > This patch fixes this issue by converting the 'int' type to 'off_t'
> > accordingly.
> 
> This patch covers all of the places I know about which had type issues
> - it should be good. Thanks!
> 
Okay, as per Boris' suggestion, this patch has changed the off_t to unsigned int,
and the print format is kept the same as '%x' without casting, how about this:


>From d5923502d0010d5e4d722c2a01ee8bda4a13bf75 Mon Sep 17 00:00:00 2001
From: Calvin Walton <calvin.walton@...stin.ca>
Date: Fri, 23 Apr 2021 17:32:13 +0800
Subject: [PATCH 3/5] tools/power turbostat: Fix offset overflow issue in index
 converting

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().

This patch fixes this issue by converting the 'int' to 'unsigned int'
accordingly.

Fixes: 9972d5d84d76 ("tools/power turbostat: Enable accumulate RAPL display")
Signed-off-by: Calvin Walton <calvin.walton@...stin.ca>
Signed-off-by: Chen Yu <yu.c.chen@...el.com>
---
 tools/power/x86/turbostat/turbostat.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index a211264b57fd..dcde41784059 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -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)
+unsigned int idx_to_offset(int idx)
 {
-	int offset;
+	unsigned int 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(unsigned int 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;
+		unsigned int offset;
 
 		if (!idx_valid(i))
 			continue;
-- 
2.25.1

> -- 
> Calvin Walton <calvin.walton@...stin.ca>
>