tools/power turbostat: Enable accumulated energy consumption for long time sampling

this cause turbostat not work on amd cpu.

root@localhost:~# /turbostat
turbostat version 20.09.30 - Len Brown <[email protected]>
CPUID(0): AuthenticAMD 0xd CPUID levels; 0x8000001f xlevels; family:model:stepping 0x17:18:1 (23:24:1)

Quoted 6 lines · On Mon, Mar 8, 2021 at 5:50 AM youling257 <[email protected]> wrote:

this cause turbostat not work on amd cpu.

root@localhost:~# /turbostat
turbostat version 20.09.30 - Len Brown <[email protected]>
CPUID(0): AuthenticAMD 0xd CPUID levels; 0x8000001f xlevels; family:model:stepping 0x17:18:1 (23:24:1)

There are already two fixes for this in the queue.
https://marc.info/?l=linux-pm&m=161382097503925&w=2
https://marc.info/?l=linux-pm&m=161141701219263&w=2

Hi,

Quoted 11 lines · Doug Smythies

Quoted 6 lines · On Mon, Mar 8, 2021 at 5:50 AM youling257 <[email protected]> wrote:

this cause turbostat not work on amd cpu.

root@localhost:~# /turbostat
turbostat version 20.09.30 - Len Brown <[email protected]>
CPUID(0): AuthenticAMD 0xd CPUID levels; 0x8000001f xlevels; family:model:stepping 0x17:18:1 (23:24:1)

There are already two fixes for this in the queue.
https://marc.info/?l=linux-pm&m=161382097503925&w=2
https://marc.info/?l=linux-pm&m=161141701219263&w=2

Thanks for reporting and pointing this out. I assume these two patches are both fixing the same issue? It looks like these two patches should be merged into one:
1. Bingsong's patch access MSR_PKG_ENERGY_STAT only when RAPL_AMD_F17H is set, which is consistent with the original context.
2. Bas Nieuwenhuizen's patch also fixes the issue in idx_valid()
in case RAPL_PKG was not set but with RAPL_AMD_F17H set.

thanks,
Chenyu

Hi Yu,

I am just resending your e-mail, adjusting the "To:" list to include the 3 others that have submitted similar patches.

... Doug

Quoted 23 lines · Chen Yu

Hi,

Quoted 11 lines · Doug Smythies

Quoted 6 lines · On Mon, Mar 8, 2021 at 5:50 AM youling257 <[email protected]> wrote:

this cause turbostat not work on amd cpu.

root@localhost:~# /turbostat
turbostat version 20.09.30 - Len Brown <[email protected]>
CPUID(0): AuthenticAMD 0xd CPUID levels; 0x8000001f xlevels; family:model:stepping 0x17:18:1 (23:24:1)

There are already two fixes for this in the queue.
https://marc.info/?l=linux-pm&m=161382097503925&w=2
https://marc.info/?l=linux-pm&m=161141701219263&w=2

Thanks for reporting and pointing this out. I assume these two patches are both fixing the same issue? It looks like these two patches should be merged into one:
1. Bingsong's patch access MSR_PKG_ENERGY_STAT only when RAPL_AMD_F17H is set, which is consistent with the original context.
2. Bas Nieuwenhuizen's patch also fixes the issue in idx_valid()
in case RAPL_PKG was not set but with RAPL_AMD_F17H set.

thanks,
Chenyu

Hi Yu,

I am just resending your e-mail, adjusting the "To:" list to include the 3 others that have submitted similar patches.

... Doug

Hi Youling, Bas, and Bingsong,

Quoted 7 lines · Doug Smythies

Hi Yu,

I am just resending your e-mail, adjusting the "To:" list to include the 3 others that have submitted similar patches.

... Doug

Could you please help check if the following combined patch works?

Thanks,
Chenyu

From 00e0622b1b693a5c7dc343aeb3aa51614a9e125e Mon Sep 17 00:00:00 2001
From: Bas Nieuwenhuizen <[email protected]>
Date: Fri, 12 Mar 2021 21:27:40 +0800
Subject: [PATCH] tools/power/turbostat: Fix turbostat for AMD Zen CPUs

It was reported that on Zen+ system turbostat started exiting, which was tracked down to the MSR_PKG_ENERGY_STAT read failing because offset_to_idx wasn't returning a non-negative index.

This patch combined the modification from Bingsong Si and
Bas Nieuwenhuizen and addd the MSR to the index system as alternative for MSR_PKG_ENERGY_STATUS.

Fixes 9972d5d84d76 ("tools/power turbostat: Enable accumulate RAPL

display")

Reported-by youling257 <[email protected]>

Co-developed-by Bingsong Si <[email protected]>

Signed-off-by Chen Yu <[email protected]>

---
 tools/power/x86/turbostat/turbostat.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

tools/power/x86/turbostat/turbostat.c +6 -3

index a7c4f0772e53..a7c965734fdf 100644
@@ -297,7 +297,10 @@ int idx_to_offset(int idx)
 
 	switch (idx) {
 	case IDX_PKG_ENERGY:
-		offset = MSR_PKG_ENERGY_STATUS;
+		if (do_rapl & RAPL_AMD_F17H)
+			offset = MSR_PKG_ENERGY_STAT;
+		else
+			offset = MSR_PKG_ENERGY_STATUS;
 		break;
 	case IDX_DRAM_ENERGY:
 		offset = MSR_DRAM_ENERGY_STATUS;

@@ -326,6 +329,7 @@ int offset_to_idx(int offset)
 
 	switch (offset) {
 	case MSR_PKG_ENERGY_STATUS:
+	case MSR_PKG_ENERGY_STAT:
 		idx = IDX_PKG_ENERGY;
 		break;
 	case MSR_DRAM_ENERGY_STATUS:

@@ -353,7 +357,7 @@ int idx_valid(int idx)
 {
 	switch (idx) {
 	case IDX_PKG_ENERGY:
-		return do_rapl & RAPL_PKG;
+		return do_rapl & (RAPL_PKG | RAPL_AMD_F17H);
 	case IDX_DRAM_ENERGY:
 		return do_rapl & RAPL_DRAM;
 	case IDX_PP0_ENERGY:
--

2.25.1

test this patch, turbostat can work.

2021-03-12 21:41 GMT+08:00, Chen Yu <[email protected]>:

Quoted 75 lines

Hi Youling, Bas, and Bingsong,

Quoted 7 lines · Doug Smythies

Hi Yu,

I am just resending your e-mail, adjusting the "To:" list to include the 3 others that have submitted similar patches.

... Doug

Could you please help check if the following combined patch works?

Thanks,
Chenyu

From 00e0622b1b693a5c7dc343aeb3aa51614a9e125e Mon Sep 17 00:00:00 2001
From: Bas Nieuwenhuizen <[email protected]>
Date: Fri, 12 Mar 2021 21:27:40 +0800
Subject: [PATCH] tools/power/turbostat: Fix turbostat for AMD Zen CPUs

It was reported that on Zen+ system turbostat started exiting, which was tracked down to the MSR_PKG_ENERGY_STAT read failing because offset_to_idx wasn't returning a non-negative index.

This patch combined the modification from Bingsong Si and
Bas Nieuwenhuizen and addd the MSR to the index system as alternative for MSR_PKG_ENERGY_STATUS.

Fixes 9972d5d84d76 ("tools/power turbostat: Enable accumulate RAPL

display")

Reported-by youling257 <[email protected]>

Co-developed-by Bingsong Si <[email protected]>

Signed-off-by Chen Yu <[email protected]>

---
 tools/power/x86/turbostat/turbostat.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

tools/power/x86/turbostat/turbostat.c +6 -3

index a7c4f0772e53..a7c965734fdf 100644
@@ -297,7 +297,10 @@ int idx_to_offset(int idx)
 
      switch (idx) {
      case IDX_PKG_ENERGY:
-             offset = MSR_PKG_ENERGY_STATUS;
+             if (do_rapl & RAPL_AMD_F17H)
+                     offset = MSR_PKG_ENERGY_STAT;
+             else
+                     offset = MSR_PKG_ENERGY_STATUS;
              break;
      case IDX_DRAM_ENERGY:
              offset = MSR_DRAM_ENERGY_STATUS;

@@ -326,6 +329,7 @@ int offset_to_idx(int offset)
 
      switch (offset) {
      case MSR_PKG_ENERGY_STATUS:
+     case MSR_PKG_ENERGY_STAT:
              idx = IDX_PKG_ENERGY;
              break;
      case MSR_DRAM_ENERGY_STATUS:

@@ -353,7 +357,7 @@ int idx_valid(int idx)
 {
      switch (idx) {
      case IDX_PKG_ENERGY:
-             return do_rapl & RAPL_PKG;
+             return do_rapl & (RAPL_PKG | RAPL_AMD_F17H);
      case IDX_DRAM_ENERGY:
              return do_rapl & RAPL_DRAM;
      case IDX_PP0_ENERGY:
--

2.25.1

Just resending to previously missed people who should also test this. (See other e-mail: Re: turbostat: Fix Pkg Power on Zen)

Quoted 12 lines

Quoted 12 lines

From 00e0622b1b693a5c7dc343aeb3aa51614a9e125e Mon Sep 17 00:00:00 2001
From: Bas Nieuwenhuizen <[email protected]>
Date: Fri, 12 Mar 2021 21:27:40 +0800
Subject: [PATCH] tools/power/turbostat: Fix turbostat for AMD Zen CPUs

It was reported that on Zen+ system turbostat started exiting, which was tracked down to the MSR_PKG_ENERGY_STAT read failing because offset_to_idx wasn't returning a non-negative index.

This patch combined the modification from Bingsong Si and
Bas Nieuwenhuizen and addd the MSR to the index system as alternative for MSR_PKG_ENERGY_STATUS.

Just resending to previously missed people who should also test this. (See other e-mail: Re: turbostat: Fix Pkg Power on Zen)

Quoted 60 lines · On Sat, Mar 13, 2021 at 5:49 AM youling 257 <[email protected]> wrote:

test this patch, turbostat can work.

2021-03-12 21:41 GMT+08:00, Chen Yu <[email protected]>:

Quoted 57 lines

[...]
Could you please help check if the following combined patch works?

Thanks,
Chenyu

From 00e0622b1b693a5c7dc343aeb3aa51614a9e125e Mon Sep 17 00:00:00 2001
From: Bas Nieuwenhuizen <[email protected]>
Date: Fri, 12 Mar 2021 21:27:40 +0800
Subject: [PATCH] tools/power/turbostat: Fix turbostat for AMD Zen CPUs

It was reported that on Zen+ system turbostat started exiting, which was tracked down to the MSR_PKG_ENERGY_STAT read failing because offset_to_idx wasn't returning a non-negative index.

This patch combined the modification from Bingsong Si and
Bas Nieuwenhuizen and addd the MSR to the index system as alternative for MSR_PKG_ENERGY_STATUS.

Fixes 9972d5d84d76 ("tools/power turbostat: Enable accumulate RAPL

display")

Reported-by youling257 <[email protected]>

Co-developed-by Bingsong Si <[email protected]>

Signed-off-by Chen Yu <[email protected]>

---
 tools/power/x86/turbostat/turbostat.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

tools/power/x86/turbostat/turbostat.c +5 -1

index a7c4f0772e53..a7c965734fdf 100644
@@ -297,7 +297,10 @@ int idx_to_offset(int idx)
 
      switch (idx) {
      case IDX_PKG_ENERGY:
-             offset = MSR_PKG_ENERGY_STATUS;
+             if (do_rapl & RAPL_AMD_F17H)
+                     offset = MSR_PKG_ENERGY_STAT;
+             else
+                     offset = MSR_PKG_ENERGY_STATUS;
              break;
      case IDX_DRAM_ENERGY:
              offset = MSR_DRAM_ENERGY_STATUS;

@@ -326,6 +329,7 @@ int offset_to_idx(int offset)
 
      switch (offset) {
      case MSR_PKG_ENERGY_STATUS:
+     case MSR_PKG_ENERGY_STAT:
              idx = IDX_PKG_ENERGY;
              break;
      case MSR_DRAM_ENERGY_STATUS:

@@ -353,7 +357,7 @@ int idx_valid(int idx)
 {
      switch (idx) {

Quoted 8 lines

Quoted 8 lines

tools/power/x86/turbostat/turbostat.c +1 -2

      case IDX_PKG_ENERGY:
-             return do_rapl & RAPL_PKG;
+             return do_rapl & (RAPL_PKG | RAPL_AMD_F17H);
      case IDX_DRAM_ENERGY:
              return do_rapl & RAPL_DRAM;
      case IDX_PP0_ENERGY:
--

2.25.1

2021年3月24日 下午10:44，Doug Smythies <[email protected]> 写道：

Just resending to previously missed people who should also test this. (See other e-mail: Re: turbostat: Fix Pkg Power on Zen)

Quoted 79 lines · On Sat, Mar 13, 2021 at 5:49 AM youling 257 <[email protected]> wrote:

test this patch, turbostat can work.

2021-03-12 21:41 GMT+08:00, Chen Yu <[email protected]>:

Quoted 75 lines

Hi Youling, Bas, and Bingsong,

Quoted 7 lines · Doug Smythies

Hi Yu,

I am just resending your e-mail, adjusting the "To:" list to include the 3 others that have submitted similar patches.

... Doug

Could you please help check if the following combined patch works?

Thanks,
Chenyu

From 00e0622b1b693a5c7dc343aeb3aa51614a9e125e Mon Sep 17 00:00:00 2001
From: Bas Nieuwenhuizen <[email protected]>
Date: Fri, 12 Mar 2021 21:27:40 +0800
Subject: [PATCH] tools/power/turbostat: Fix turbostat for AMD Zen CPUs

It was reported that on Zen+ system turbostat started exiting, which was tracked down to the MSR_PKG_ENERGY_STAT read failing because offset_to_idx wasn't returning a non-negative index.

This patch combined the modification from Bingsong Si and
Bas Nieuwenhuizen and addd the MSR to the index system as alternative for MSR_PKG_ENERGY_STATUS.

Fixes 9972d5d84d76 ("tools/power turbostat: Enable accumulate RAPL

display")

Reported-by youling257 <[email protected]>

Co-developed-by Bingsong Si <[email protected]>

Signed-off-by Chen Yu <[email protected]>

---
tools/power/x86/turbostat/turbostat.c | 8 ++++++--

1 file changed, 6 insertions(+), 2 deletions(-)

tools/power/x86/turbostat/turbostat.c +6 -3

index a7c4f0772e53..a7c965734fdf 100644
@@ -297,7 +297,10 @@ int idx_to_offset(int idx)
 
     switch (idx) {
     case IDX_PKG_ENERGY:
-             offset = MSR_PKG_ENERGY_STATUS;
+             if (do_rapl & RAPL_AMD_F17H)
+                     offset = MSR_PKG_ENERGY_STAT;
+             else
+                     offset = MSR_PKG_ENERGY_STATUS;
             break;
     case IDX_DRAM_ENERGY:
             offset = MSR_DRAM_ENERGY_STATUS;

@@ -326,6 +329,7 @@ int offset_to_idx(int offset)
 
     switch (offset) {
     case MSR_PKG_ENERGY_STATUS:
+     case MSR_PKG_ENERGY_STAT:
             idx = IDX_PKG_ENERGY;
             break;
     case MSR_DRAM_ENERGY_STATUS:

@@ -353,7 +357,7 @@ int idx_valid(int idx)
 {
     switch (idx) {
     case IDX_PKG_ENERGY:
-             return do_rapl & RAPL_PKG;
+             return do_rapl & (RAPL_PKG | RAPL_AMD_F17H);
     case IDX_DRAM_ENERGY:
             return do_rapl & RAPL_DRAM;
     case IDX_PP0_ENERGY:
--

2.25.1

Hi Youling, Bas, and Bingsong,

Quoted 7 lines · Doug Smythies

Hi Yu,

I am just resending your e-mail, adjusting the "To:" list to include the 3 others that have submitted similar patches.

... Doug

Could you please help check if the following combined patch works?

Thanks,
Chenyu

From 00e0622b1b693a5c7dc343aeb3aa51614a9e125e Mon Sep 17 00:00:00 2001
From: Bas Nieuwenhuizen <[email protected]>
Date: Fri, 12 Mar 2021 21:27:40 +0800
Subject: [PATCH] tools/power/turbostat: Fix turbostat for AMD Zen CPUs

It was reported that on Zen+ system turbostat started exiting, which was tracked down to the MSR_PKG_ENERGY_STAT read failing because offset_to_idx wasn't returning a non-negative index.

This patch combined the modification from Bingsong Si and
Bas Nieuwenhuizen and addd the MSR to the index system as alternative for MSR_PKG_ENERGY_STATUS.

Fixes 9972d5d84d76 ("tools/power turbostat: Enable accumulate RAPL display")

Reported-by youling257 <[email protected]>

Co-developed-by Bingsong Si <[email protected]>

Signed-off-by Chen Yu <[email protected]>

Hi Bas Nieuwenhuizen,

Quoted 28 lines · Chen Yu

Hi Youling, Bas, and Bingsong,

Quoted 7 lines · Doug Smythies

Hi Yu,

I am just resending your e-mail, adjusting the "To:" list to include the 3 others that have submitted similar patches.

... Doug

Could you please help check if the following combined patch works?

Thanks,
Chenyu

From 00e0622b1b693a5c7dc343aeb3aa51614a9e125e Mon Sep 17 00:00:00 2001
From: Bas Nieuwenhuizen <[email protected]>
Date: Fri, 12 Mar 2021 21:27:40 +0800
Subject: [PATCH] tools/power/turbostat: Fix turbostat for AMD Zen CPUs

It was reported that on Zen+ system turbostat started exiting, which was tracked down to the MSR_PKG_ENERGY_STAT read failing because offset_to_idx wasn't returning a non-negative index.

This patch combined the modification from Bingsong Si and
Bas Nieuwenhuizen and addd the MSR to the index system as alternative for MSR_PKG_ENERGY_STATUS.

Quoted 5 lines

Fixes 9972d5d84d76 ("tools/power turbostat: Enable accumulate RAPL display")

Reported-by youling257 <[email protected]>

Co-developed-by Bingsong Si <[email protected]>

Signed-off-by Chen Yu <[email protected]>

Can I add your SOB here if you are not object to it?

thanks,
Chenyu