Skip to content

Commit 6842d98

Browse files
torvaldstorvalds
committed
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull powertool update from Len Brown: "This updates the tree w/ the latest version of turbostat, which reports temperature and - on SNB and later - Watts." Fix up semantic merge conflict as per Len. * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: tools: Allow tools to be installed in a user specified location tools/power: turbostat: make Makefile a bit more capable tools/power x86_energy_perf_policy: close /proc/stat in for_every_cpu() tools/power turbostat: v3.0: monitor Watts and Temperature tools/power turbostat: fix output buffering issue tools/power turbostat: prevent infinite loop on migration error path x86 power: define RAPL MSRs tools/power/x86/turbostat: share kernel MSR #defines
2 parents 758338e + 55f1f54 commit 6842d98

File tree

6 files changed

+765
-81
lines changed

6 files changed

+765
-81
lines changed

‎arch/x86/include/uapi/asm/msr-index.h

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,14 @@
3535
#define MSR_IA32_PERFCTR0 0x000000c1
3636
#define MSR_IA32_PERFCTR1 0x000000c2
3737
#define MSR_FSB_FREQ 0x000000cd
38+
#define MSR_NHM_PLATFORM_INFO 0x000000ce
3839

3940
#define MSR_NHM_SNB_PKG_CST_CFG_CTL 0x000000e2
4041
#define NHM_C3_AUTO_DEMOTE (1UL << 25)
4142
#define NHM_C1_AUTO_DEMOTE (1UL << 26)
4243
#define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25)
44+
#define SNB_C1_AUTO_UNDEMOTE (1UL << 27)
45+
#define SNB_C3_AUTO_UNDEMOTE (1UL << 28)
4346

4447
#define MSR_MTRRcap 0x000000fe
4548
#define MSR_IA32_BBL_CR_CTL 0x00000119
@@ -55,6 +58,8 @@
5558

5659
#define MSR_OFFCORE_RSP_0 0x000001a6
5760
#define MSR_OFFCORE_RSP_1 0x000001a7
61+
#define MSR_NHM_TURBO_RATIO_LIMIT 0x000001ad
62+
#define MSR_IVT_TURBO_RATIO_LIMIT 0x000001ae
5863

5964
#define MSR_LBR_SELECT 0x000001c8
6065
#define MSR_LBR_TOS 0x000001c9
@@ -103,6 +108,38 @@
103108
#define MSR_IA32_MC0_ADDR 0x00000402
104109
#define MSR_IA32_MC0_MISC 0x00000403
105110

111+
/* C-state Residency Counters */
112+
#define MSR_PKG_C3_RESIDENCY 0x000003f8
113+
#define MSR_PKG_C6_RESIDENCY 0x000003f9
114+
#define MSR_PKG_C7_RESIDENCY 0x000003fa
115+
#define MSR_CORE_C3_RESIDENCY 0x000003fc
116+
#define MSR_CORE_C6_RESIDENCY 0x000003fd
117+
#define MSR_CORE_C7_RESIDENCY 0x000003fe
118+
#define MSR_PKG_C2_RESIDENCY 0x0000060d
119+
120+
/* Run Time Average Power Limiting (RAPL) Interface */
121+
122+
#define MSR_RAPL_POWER_UNIT 0x00000606
123+
124+
#define MSR_PKG_POWER_LIMIT 0x00000610
125+
#define MSR_PKG_ENERGY_STATUS 0x00000611
126+
#define MSR_PKG_PERF_STATUS 0x00000613
127+
#define MSR_PKG_POWER_INFO 0x00000614
128+
129+
#define MSR_DRAM_POWER_LIMIT 0x00000618
130+
#define MSR_DRAM_ENERGY_STATUS 0x00000619
131+
#define MSR_DRAM_PERF_STATUS 0x0000061b
132+
#define MSR_DRAM_POWER_INFO 0x0000061c
133+
134+
#define MSR_PP0_POWER_LIMIT 0x00000638
135+
#define MSR_PP0_ENERGY_STATUS 0x00000639
136+
#define MSR_PP0_POLICY 0x0000063a
137+
#define MSR_PP0_PERF_STATUS 0x0000063b
138+
139+
#define MSR_PP1_POWER_LIMIT 0x00000640
140+
#define MSR_PP1_ENERGY_STATUS 0x00000641
141+
#define MSR_PP1_POLICY 0x00000642
142+
106143
#define MSR_AMD64_MC0_MASK 0xc0010044
107144

108145
#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x))

‎tools/power/x86/turbostat/Makefile

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
1+
CC = $(CROSS_COMPILE)gcc
2+
BUILD_OUTPUT := $(PWD)
3+
PREFIX := /usr
4+
DESTDIR :=
5+
16
turbostat : turbostat.c
27
CFLAGS += -Wall
8+
CFLAGS += -I../../../../arch/x86/include/uapi/
9+
10+
%: %.c
11+
@mkdir -p $(BUILD_OUTPUT)
12+
$(CC) $(CFLAGS) $< -o $(BUILD_OUTPUT)/$@
313

14+
.PHONY : clean
415
clean :
5-
rm -f turbostat
16+
@rm -f $(BUILD_OUTPUT)/turbostat
617

7-
install :
8-
install turbostat /usr/bin/turbostat
9-
install turbostat.8 /usr/share/man/man8
18+
install : turbostat
19+
install -d $(DESTDIR)$(PREFIX)/bin
20+
install $(BUILD_OUTPUT)/turbostat $(DESTDIR)$(PREFIX)/bin/turbostat
21+
install -d $(DESTDIR)$(PREFIX)/share/man/man8
22+
install turbostat.8 $(DESTDIR)$(PREFIX)/share/man/man8

‎tools/power/x86/turbostat/turbostat.8

Lines changed: 67 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ turbostat \- Report processor frequency and idle statistics
1111
.RB [ Options ]
1212
.RB [ "\-i interval_sec" ]
1313
.SH DESCRIPTION
14-
\fBturbostat \fP reports processor topology, frequency
15-
and idle power state statistics on modern X86 processors.
14+
\fBturbostat \fP reports processor topology, frequency,
15+
idle power-state statistics, temperature and power on modern X86 processors.
1616
Either \fBcommand\fP is forked and statistics are printed
1717
upon its completion, or statistics are printed periodically.
1818

1919
\fBturbostat \fP
20-
requires that the processor
20+
must be run on root, and
21+
minimally requires that the processor
2122
supports an "invariant" TSC, plus the APERF and MPERF MSRs.
22-
\fBturbostat \fP will report idle cpu power state residency
23-
on processors that additionally support C-state residency counters.
23+
Additional information is reported depending on hardware counter support.
2424

2525
.SS Options
2626
The \fB-p\fP option limits output to the 1st thread in 1st core of each package.
@@ -57,7 +57,15 @@ Note that multiple CPUs per core indicate support for Intel(R) Hyper-Threading T
5757
\fBGHz\fP average clock rate while the CPU was in c0 state.
5858
\fBTSC\fP average GHz that the TSC ran during the entire interval.
5959
\fB%c1, %c3, %c6, %c7\fP show the percentage residency in hardware core idle states.
60+
\fBCTMP\fP Degrees Celsius reported by the per-core Digital Thermal Sensor.
61+
\fBPTMP\fP Degrees Celsius reported by the per-package Package Thermal Monitor.
6062
\fB%pc2, %pc3, %pc6, %pc7\fP percentage residency in hardware package idle states.
63+
\fBPkg_W\fP Watts consumed by the whole package.
64+
\fBCor_W\fP Watts consumed by the core part of the package.
65+
\fBGFX_W\fP Watts consumed by the Graphics part of the package -- available only on client processors.
66+
\fBRAM_W\fP Watts consumed by the DRAM DIMMS -- available only on server processors.
67+
\fBPKG_%\fP percent of the interval that RAPL throttling was active on the Package.
68+
\fBRAM_%\fP percent of the interval that RAPL throttling was active on DRAM.
6169
.fi
6270
.PP
6371
.SH EXAMPLE
@@ -66,50 +74,73 @@ Without any parameters, turbostat prints out counters ever 5 seconds.
6674
for turbostat to fork).
6775

6876
The first row of statistics is a summary for the entire system.
69-
Note that the summary is a weighted average.
77+
For residency % columns, the summary is a weighted average.
78+
For Temperature columns, the summary is the column maximum.
79+
For Watts columns, the summary is a system total.
7080
Subsequent rows show per-CPU statistics.
7181

7282
.nf
73-
[root@x980]# ./turbostat
74-
cor CPU %c0 GHz TSC %c1 %c3 %c6 %pc3 %pc6
75-
0.09 1.62 3.38 1.83 0.32 97.76 1.26 83.61
76-
0 0 0.15 1.62 3.38 10.23 0.05 89.56 1.26 83.61
77-
0 6 0.05 1.62 3.38 10.34
78-
1 2 0.03 1.62 3.38 0.07 0.05 99.86
79-
1 8 0.03 1.62 3.38 0.06
80-
2 4 0.21 1.62 3.38 0.10 1.49 98.21
81-
2 10 0.02 1.62 3.38 0.29
82-
8 1 0.04 1.62 3.38 0.04 0.08 99.84
83-
8 7 0.01 1.62 3.38 0.06
84-
9 3 0.53 1.62 3.38 0.10 0.20 99.17
85-
9 9 0.02 1.62 3.38 0.60
86-
10 5 0.01 1.62 3.38 0.02 0.04 99.92
87-
10 11 0.02 1.62 3.38 0.02
83+
[root@sandy]# ./turbostat
84+
cor CPU %c0 GHz TSC %c1 %c3 %c6 %c7 CTMP PTMP %pc2 %pc3 %pc6 %pc7 Pkg_W Cor_W GFX_W
85+
0.06 0.80 2.29 0.11 0.00 0.00 99.83 47 40 0.26 0.01 0.44 98.78 3.49 0.12 0.14
86+
0 0 0.07 0.80 2.29 0.07 0.00 0.00 99.86 40 40 0.26 0.01 0.44 98.78 3.49 0.12 0.14
87+
0 4 0.03 0.80 2.29 0.12
88+
1 1 0.04 0.80 2.29 0.25 0.01 0.00 99.71 40
89+
1 5 0.16 0.80 2.29 0.13
90+
2 2 0.05 0.80 2.29 0.06 0.01 0.00 99.88 40
91+
2 6 0.03 0.80 2.29 0.08
92+
3 3 0.05 0.80 2.29 0.08 0.00 0.00 99.87 47
93+
3 7 0.04 0.84 2.29 0.09
8894
.fi
8995
.SH SUMMARY EXAMPLE
9096
The "-s" option prints the column headers just once,
9197
and then the one line system summary for each sample interval.
9298

9399
.nf
94-
[root@x980]# ./turbostat -s
95-
%c0 GHz TSC %c1 %c3 %c6 %pc3 %pc6
96-
0.23 1.67 3.38 2.00 0.30 97.47 1.07 82.12
97-
0.10 1.62 3.38 1.87 2.25 95.77 12.02 72.60
98-
0.20 1.64 3.38 1.98 0.11 97.72 0.30 83.36
99-
0.11 1.70 3.38 1.86 1.81 96.22 9.71 74.90
100+
[root@wsm]# turbostat -S
101+
%c0 GHz TSC %c1 %c3 %c6 CTMP %pc3 %pc6
102+
1.40 2.81 3.38 10.78 43.47 44.35 42 13.67 2.09
103+
1.34 2.90 3.38 11.48 58.96 28.23 41 19.89 0.15
104+
1.55 2.72 3.38 26.73 37.66 34.07 42 2.53 2.80
105+
1.37 2.83 3.38 16.95 60.05 21.63 42 5.76 0.20
100106
.fi
101107
.SH VERBOSE EXAMPLE
102108
The "-v" option adds verbosity to the output:
103109

104110
.nf
105-
GenuineIntel 11 CPUID levels; family:model:stepping 0x6:2c:2 (6:44:2)
106-
12 * 133 = 1600 MHz max efficiency
107-
25 * 133 = 3333 MHz TSC frequency
108-
26 * 133 = 3467 MHz max turbo 4 active cores
109-
26 * 133 = 3467 MHz max turbo 3 active cores
110-
27 * 133 = 3600 MHz max turbo 2 active cores
111-
27 * 133 = 3600 MHz max turbo 1 active cores
112-
111+
[root@ivy]# turbostat -v
112+
turbostat v3.0 November 23, 2012 - Len Brown <lenb@kernel.org>
113+
CPUID(0): GenuineIntel 13 CPUID levels; family:model:stepping 0x6:3a:9 (6:58:9)
114+
CPUID(6): APERF, DTS, PTM, EPB
115+
RAPL: 851 sec. Joule Counter Range
116+
cpu0: MSR_NHM_PLATFORM_INFO: 0x81010f0012300
117+
16 * 100 = 1600 MHz max efficiency
118+
35 * 100 = 3500 MHz TSC frequency
119+
cpu0: MSR_NHM_SNB_PKG_CST_CFG_CTL: 0x1e008402 (UNdemote-C3, UNdemote-C1, demote-C3, demote-C1, locked: pkg-cstate-limit=2: pc6-noret)
120+
cpu0: MSR_NHM_TURBO_RATIO_LIMIT: 0x25262727
121+
37 * 100 = 3700 MHz max turbo 4 active cores
122+
38 * 100 = 3800 MHz max turbo 3 active cores
123+
39 * 100 = 3900 MHz max turbo 2 active cores
124+
39 * 100 = 3900 MHz max turbo 1 active cores
125+
cpu0: MSR_IA32_ENERGY_PERF_BIAS: 0x00000006 (balanced)
126+
cpu0: MSR_RAPL_POWER_UNIT: 0x000a1003 (0.125000 Watts, 0.000015 Joules, 0.000977 sec.)
127+
cpu0: MSR_PKG_POWER_INFO: 0x01e00268 (77 W TDP, RAPL 60 - 0 W, 0.000000 sec.)
128+
cpu0: MSR_PKG_POWER_LIMIT: 0x830000148268 (UNlocked)
129+
cpu0: PKG Limit #1: ENabled (77.000000 Watts, 1.000000 sec, clamp DISabled)
130+
cpu0: PKG Limit #2: ENabled (96.000000 Watts, 0.000977* sec, clamp DISabled)
131+
cpu0: MSR_PP0_POLICY: 0
132+
cpu0: MSR_PP0_POWER_LIMIT: 0x00000000 (UNlocked)
133+
cpu0: Cores Limit: DISabled (0.000000 Watts, 0.000977 sec, clamp DISabled)
134+
cpu0: MSR_PP1_POLICY: 0
135+
cpu0: MSR_PP1_POWER_LIMIT: 0x00000000 (UNlocked)
136+
cpu0: GFX Limit: DISabled (0.000000 Watts, 0.000977 sec, clamp DISabled)
137+
cpu0: MSR_IA32_TEMPERATURE_TARGET: 0x00691400 (105 C)
138+
cpu0: MSR_IA32_PACKAGE_THERM_STATUS: 0x884e0000 (27 C)
139+
cpu0: MSR_IA32_THERM_STATUS: 0x88560000 (19 C +/- 1)
140+
cpu1: MSR_IA32_THERM_STATUS: 0x88560000 (19 C +/- 1)
141+
cpu2: MSR_IA32_THERM_STATUS: 0x88540000 (21 C +/- 1)
142+
cpu3: MSR_IA32_THERM_STATUS: 0x884e0000 (27 C +/- 1)
143+
...
113144
.fi
114145
The \fBmax efficiency\fP frequency, a.k.a. Low Frequency Mode, is the frequency
115146
available at the minimum package voltage. The \fBTSC frequency\fP is the nominal
@@ -142,7 +173,7 @@ cor CPU %c0 GHz TSC %c1 %c3 %c6 %pc3 %pc6
142173
10 5 1.42 3.43 3.38 2.14 30.99 65.44
143174
10 11 0.16 2.88 3.38 3.40
144175
.fi
145-
Above the cycle soaker drives cpu7 up its 3.6 Ghz turbo limit
176+
Above the cycle soaker drives cpu7 up its 3.6 GHz turbo limit
146177
while the other processors are generally in various states of idle.
147178

148179
Note that cpu1 and cpu7 are HT siblings within core8.

0 commit comments

Comments
 (0)