Re: [3/3,v3] tools/power turbostat: Enable accumulate RAPL display

[Kurt Garloff]

Hi Doug,

Am 24.03.21 um 15:44 schrieb Doug Smythies:
> Just resending to previously missed people who should also test this.
> (See other e-mail: Re: turbostat: Fix Pkg Power on Zen)
>
> On Sat, Mar 13, 2021 at 5:49 AM youling 257 <youling257@xxxxxxxxx> wrote:
>> test this patch, turbostat can work.
>>
>> 2021-03-12 21:41 GMT+08:00, Chen Yu <yu.c.chen@xxxxxxxxx>:
>>> [...]
>>> 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 <bas@xxxxxxxxxxxxxxxxxxx>
>>> 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 <youling257@xxxxxxxxx>
>>> Co-developed-by: Bingsong Si <owen.si@xxxxxxxxx>
>>> Signed-off-by: Chen Yu <yu.c.chen@xxxxxxxxx>
>>> ---
>>>  tools/power/x86/turbostat/turbostat.c | 8 ++++++--
>>>  1 file changed, 6 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/tools/power/x86/turbostat/turbostat.c
>>> b/tools/power/x86/turbostat/turbostat.c
>>> index a7c4f0772e53..a7c965734fdf 100644
>>> --- a/tools/power/x86/turbostat/turbostat.c
>>> +++ b/tools/power/x86/turbostat/turbostat.c
>>> @@ -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
Unsurprisingly, the patch from Bas works for me as well.
(Tested on a Zen 3 and an embedded Zen.)

Tested-by: Kurt Garloff <kurt@xxxxxxxxxx>
Signed-off-by: Kurt Garloff <kurt@xxxxxxxxxx>

Thanks,

-- 
Kurt Garloff <kurt@xxxxxxxxxx>, Cologne, Germany