qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools/power/turbostat: Fix uncore frequency file string 

JIRA: https://issues.redhat.com/browse/RHEL-34610
JIRA: https://issues.redhat.com/browse/RHEL-29239

commit 60add818ab2543b7e4f2bfeaacf2504743c1eb50
Author: Justin Ernst <justin.ernst@hpe.com>
Date:   Tue Apr 2 13:40:29 2024 -0400

    tools/power/turbostat: Fix uncore frequency file string

    Running turbostat on a 16 socket HPE Scale-up Compute 3200 (SapphireRapids) fails with:
    turbostat: /sys/devices/system/cpu/intel_uncore_frequency/package_010_die_00/current_freq_khz: open failed: No such file or directory

    We observe the sysfs uncore frequency directories named:
    ...
    package_09_die_00/
    package_10_die_00/
    package_11_die_00/
    ...
    package_15_die_00/

    The culprit is an incorrect sprintf format string "package_0%d_die_0%d" used
    with each instance of reading uncore frequency files. uncore-frequency-common.c
    creates the sysfs directory with the format "package_%02d_die_%02d". Once the
    package value reaches double digits, the formats diverge.

    Change each instance of "package_0%d_die_0%d" to "package_%02d_die_%02d".

    [lenb: deleted the probe part of this patch, as it was already fixed]

    Signed-off-by: Justin Ernst <justin.ernst@hpe.com>
    Reviewed-by: Thomas Renninger <trenn@suse.de>
    Signed-off-by: Len Brown <len.brown@intel.com>

Signed-off-by: David Arcari <darcari@redhat.com>
This commit is contained in:
David Arcari 2024-04-26 16:25:39 -04:00
parent 7578b78103
commit 569d22a1dc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2939,7 +2939,7 @@ unsigned long long get_uncore_mhz(int package, int die)
{
char path[128];
sprintf(path, "/sys/devices/system/cpu/intel_uncore_frequency/package_0%d_die_0%d/current_freq_khz", package,
sprintf(path, "/sys/devices/system/cpu/intel_uncore_frequency/package_%02d_die_%02d/current_freq_khz", package,
die);
return (snapshot_sysfs_counter(path) / 1000);