mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-03 17:14:14 +08:00
Urgent power management fixes for 4.18
- Use ACPI FADT preferred PM Profile to distinguish Skylake
desktop processors from some server ones with the same model
number in order to limit the scope of the recent IO-wait boost
optimization to servers, as intended (Srinivas Pandruvada).
- Fix several issues in the turbostat utility:
* Fix the -S option on 1-CPU systems (Len Brown).
* Fix computations using incorrect processor core counts (Artem
Bityutskiy).
* Fix the x2apic debug message (Len Brown).
* Fix logical node enumeration to allow for non-sequential
physical nodes (Prarit Bhargava).
* Fix reported family on modern AMD processors (Calvin Walton).
* Clarify the RAPL column information in the man page (Len Brown).
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJbYX7gAAoJEILEb/54YlRxTbwP/1M/2o7qoh6nF5R118bLnRVN
Nwlh68QrBNOIsx5De5cdBSt01I30n70nD0IPp7NW9apZo3SgX18kCF6j8HAhutgt
8LZWHJ8FDERU1jk9NYPf9JhpeI1hIeVEgmMttjz/q1GUzmnq3iSBF3WLAV8tteHV
DgrgS6kEZWphxpk7g8pw8MDhWUY38I7NgquUOcqUDrvbgmYLqIg4YjJbtqepYBZd
h74lqB5DHUv2OcyjZheqSY0NIh6ILDIdYk7eDTADVxC3/wuqqFHT5NXIyNwUzXof
5PAWg6zxdZGITRBgvsxadxeZQD97R6lneaJwodXxtn3rWot8UjPxMsh1MC0KSdaY
CD8pOFk0kRz5F9X43rPlJP6TjjU66TUYPBaNm+fNnuaKDwitnIU93bsOjdOv/BWs
AF1E4rEzB6LCEwn6K8TG6J5OW5V3PiCqoqvWr5j+Uqhfj/DoQS2vJMichwVPSE2B
j1YBfgJmNZW74pM0p219KibiTX564GOHmaeSiJFm6wSq/2l6l8WqlJnqxoAhDAvA
tyAsDNBiNt/MlxjcWaX+MvZalEb1+GufKZMs7u/zb7K+kp1yA2JquPodKdztiKfl
3ng+ZNeYVG13W62neMjlqRgrkChMaqwAUujilaUTOFuXNZ1imAP5kYi8q2FjWP5P
1i6Nw1KwiHDEmyRV9xEs
=oMfR
-----END PGP SIGNATURE-----
Merge tag 'pm-urgent-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki:
"These fix the scope of a recent intel_pstate driver optimization used
incorrectly on some systems due to processor identification ambiguity
and fix a few issues in the turbostat utility, including three recent
regressions.
Specifics:
- Use ACPI FADT preferred PM Profile to distinguish Skylake desktop
processors from some server ones with the same model number in
order to limit the scope of the recent IO-wait boost optimization
to servers, as intended (Srinivas Pandruvada).
- Fix several issues in the turbostat utility:
* Fix the -S option on 1-CPU systems (Len Brown).
* Fix computations using incorrect processor core counts (Artem
Bityutskiy).
* Fix the x2apic debug message (Len Brown).
* Fix logical node enumeration to allow for non-sequential
physical nodes (Prarit Bhargava).
* Fix reported family on modern AMD processors (Calvin Walton).
* Clarify the RAPL column information in the man page (Len Brown)"
* tag 'pm-urgent-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
cpufreq: intel_pstate: Limit the scope of HWP dynamic boost platforms
tools/power turbostat: version 18.07.27
tools/power turbostat: Read extended processor family from CPUID
tools/power turbostat: Fix logical node enumeration to allow for non-sequential physical nodes
tools/power turbostat: fix x2apic debug message output file
tools/power turbostat: fix bogus summary values
tools/power turbostat: fix -S on UP systems
tools/power turbostat: Update turbostat(8) RAPL throttling column description
This commit is contained in:
Linus Torvalds
commit
f390b7bffd
@ -311,12 +311,20 @@ static DEFINE_MUTEX(intel_pstate_limits_lock);
|
||||
|
||||
#ifdef CONFIG_ACPI
|
||||
|
||||
static bool intel_pstate_get_ppc_enable_status(void)
|
||||
static bool intel_pstate_acpi_pm_profile_server(void)
|
||||
{
|
||||
if (acpi_gbl_FADT.preferred_profile == PM_ENTERPRISE_SERVER ||
|
||||
acpi_gbl_FADT.preferred_profile == PM_PERFORMANCE_SERVER)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool intel_pstate_get_ppc_enable_status(void)
|
||||
{
|
||||
if (intel_pstate_acpi_pm_profile_server())
|
||||
return true;
|
||||
|
||||
return acpi_ppc;
|
||||
}
|
||||
|
||||
@ -459,6 +467,11 @@ static inline void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *pol
|
||||
static inline void intel_pstate_exit_perf_limits(struct cpufreq_policy *policy)
|
||||
{
|
||||
}
|
||||
|
||||
static inline bool intel_pstate_acpi_pm_profile_server(void)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
static inline void update_turbo_state(void)
|
||||
@ -1841,7 +1854,7 @@ static int intel_pstate_init_cpu(unsigned int cpunum)
|
||||
intel_pstate_hwp_enable(cpu);
|
||||
|
||||
id = x86_match_cpu(intel_pstate_hwp_boost_ids);
|
||||
if (id)
|
||||
if (id && intel_pstate_acpi_pm_profile_server())
|
||||
hwp_boost = true;
|
||||
}
|
||||
|
||||
|
||||
@ -106,7 +106,7 @@ The system configuration dump (if --quiet is not used) is followed by statistics
|
||||
\fBC1%, C2%, C3%\fP The residency percentage that Linux requested C1, C2, C3.... The system summary is the average of all CPUs in the system. Note that these are software, reflecting what was requested. The hardware counters reflect what was actually achieved.
|
||||
\fBCPU%c1, CPU%c3, CPU%c6, CPU%c7\fP show the percentage residency in hardware core idle states. These numbers are from hardware residency counters.
|
||||
\fBCoreTmp\fP Degrees Celsius reported by the per-core Digital Thermal Sensor.
|
||||
\fBPkgTtmp\fP Degrees Celsius reported by the per-package Package Thermal Monitor.
|
||||
\fBPkgTmp\fP Degrees Celsius reported by the per-package Package Thermal Monitor.
|
||||
\fBGFX%rc6\fP The percentage of time the GPU is in the "render C6" state, rc6, during the measurement interval. From /sys/class/drm/card0/power/rc6_residency_ms.
|
||||
\fBGFXMHz\fP Instantaneous snapshot of what sysfs presents at the end of the measurement interval. From /sys/class/graphics/fb0/device/drm/card0/gt_cur_freq_mhz.
|
||||
\fBPkg%pc2, Pkg%pc3, Pkg%pc6, Pkg%pc7\fP percentage residency in hardware package idle states. These numbers are from hardware residency counters.
|
||||
@ -114,7 +114,7 @@ The system configuration dump (if --quiet is not used) is followed by statistics
|
||||
\fBCorWatt\fP Watts consumed by the core part of the package.
|
||||
\fBGFXWatt\fP Watts consumed by the Graphics part of the package -- available only on client processors.
|
||||
\fBRAMWatt\fP Watts consumed by the DRAM DIMMS -- available only on server processors.
|
||||
\fBPKG_%\fP percent of the interval that RAPL throttling was active on the Package.
|
||||
\fBPKG_%\fP percent of the interval that RAPL throttling was active on the Package. Note that the system summary is the sum of the package throttling time, and thus may be higher than 100% on a multi-package system. Note that the meaning of this field is model specific. For example, some hardware increments this counter when RAPL responds to thermal limits, but does not increment this counter when RAPL responds to power limits. Comparing PkgWatt and PkgTmp to system limits is necessary.
|
||||
\fBRAM_%\fP percent of the interval that RAPL throttling was active on DRAM.
|
||||
.fi
|
||||
.SH TOO MUCH INFORMATION EXAMPLE
|
||||
|
||||
@ -1163,9 +1163,7 @@ void format_all_counters(struct thread_data *t, struct core_data *c, struct pkg_
|
||||
if (!printed || !summary_only)
|
||||
print_header("\t");
|
||||
|
||||
if (topo.num_cpus > 1)
|
||||
format_counters(&average.threads, &average.cores,
|
||||
&average.packages);
|
||||
format_counters(&average.threads, &average.cores, &average.packages);
|
||||
|
||||
printed = 1;
|
||||
|
||||
@ -1692,7 +1690,7 @@ void get_apic_id(struct thread_data *t)
|
||||
t->x2apic_id = edx;
|
||||
|
||||
if (debug && (t->apic_id != t->x2apic_id))
|
||||
fprintf(stderr, "cpu%d: apic 0x%x x2apic 0x%x\n", t->cpu_id, t->apic_id, t->x2apic_id);
|
||||
fprintf(outf, "cpu%d: apic 0x%x x2apic 0x%x\n", t->cpu_id, t->apic_id, t->x2apic_id);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -2473,55 +2471,43 @@ int get_core_id(int cpu)
|
||||
|
||||
void set_node_data(void)
|
||||
{
|
||||
char path[80];
|
||||
FILE *filep;
|
||||
int pkg, node, cpu;
|
||||
int pkg, node, lnode, cpu, cpux;
|
||||
int cpu_count;
|
||||
|
||||
struct pkg_node_info {
|
||||
int count;
|
||||
int min;
|
||||
} *pni;
|
||||
/* initialize logical_node_id */
|
||||
for (cpu = 0; cpu <= topo.max_cpu_num; ++cpu)
|
||||
cpus[cpu].logical_node_id = -1;
|
||||
|
||||
pni = calloc(topo.num_packages, sizeof(struct pkg_node_info));
|
||||
if (!pni)
|
||||
err(1, "calloc pkg_node_count");
|
||||
|
||||
for (pkg = 0; pkg < topo.num_packages; pkg++)
|
||||
pni[pkg].min = topo.num_cpus;
|
||||
|
||||
for (node = 0; node <= topo.max_node_num; node++) {
|
||||
/* find the "first" cpu in the node */
|
||||
sprintf(path, "/sys/bus/node/devices/node%d/cpulist", node);
|
||||
filep = fopen(path, "r");
|
||||
if (!filep)
|
||||
continue;
|
||||
fscanf(filep, "%d", &cpu);
|
||||
fclose(filep);
|
||||
|
||||
pkg = cpus[cpu].physical_package_id;
|
||||
pni[pkg].count++;
|
||||
|
||||
if (node < pni[pkg].min)
|
||||
pni[pkg].min = node;
|
||||
cpu_count = 0;
|
||||
for (pkg = 0; pkg < topo.num_packages; pkg++) {
|
||||
lnode = 0;
|
||||
for (cpu = 0; cpu <= topo.max_cpu_num; ++cpu) {
|
||||
if (cpus[cpu].physical_package_id != pkg)
|
||||
continue;
|
||||
/* find a cpu with an unset logical_node_id */
|
||||
if (cpus[cpu].logical_node_id != -1)
|
||||
continue;
|
||||
cpus[cpu].logical_node_id = lnode;
|
||||
node = cpus[cpu].physical_node_id;
|
||||
cpu_count++;
|
||||
/*
|
||||
* find all matching cpus on this pkg and set
|
||||
* the logical_node_id
|
||||
*/
|
||||
for (cpux = cpu; cpux <= topo.max_cpu_num; cpux++) {
|
||||
if ((cpus[cpux].physical_package_id == pkg) &&
|
||||
(cpus[cpux].physical_node_id == node)) {
|
||||
cpus[cpux].logical_node_id = lnode;
|
||||
cpu_count++;
|
||||
}
|
||||
}
|
||||
lnode++;
|
||||
if (lnode > topo.nodes_per_pkg)
|
||||
topo.nodes_per_pkg = lnode;
|
||||
}
|
||||
if (cpu_count >= topo.max_cpu_num)
|
||||
break;
|
||||
}
|
||||
|
||||
for (pkg = 0; pkg < topo.num_packages; pkg++)
|
||||
if (pni[pkg].count > topo.nodes_per_pkg)
|
||||
topo.nodes_per_pkg = pni[0].count;
|
||||
|
||||
/* Fake 1 node per pkg for machines that don't
|
||||
* expose nodes and thus avoid -nan results
|
||||
*/
|
||||
if (topo.nodes_per_pkg == 0)
|
||||
topo.nodes_per_pkg = 1;
|
||||
|
||||
for (cpu = 0; cpu < topo.num_cpus; cpu++) {
|
||||
pkg = cpus[cpu].physical_package_id;
|
||||
node = cpus[cpu].physical_node_id;
|
||||
cpus[cpu].logical_node_id = node - pni[pkg].min;
|
||||
}
|
||||
free(pni);
|
||||
|
||||
}
|
||||
|
||||
int get_physical_node_id(struct cpu_topology *thiscpu)
|
||||
@ -4471,7 +4457,9 @@ void process_cpuid()
|
||||
family = (fms >> 8) & 0xf;
|
||||
model = (fms >> 4) & 0xf;
|
||||
stepping = fms & 0xf;
|
||||
if (family == 6 || family == 0xf)
|
||||
if (family == 0xf)
|
||||
family += (fms >> 20) & 0xff;
|
||||
if (family >= 6)
|
||||
model += ((fms >> 16) & 0xf) << 4;
|
||||
|
||||
if (!quiet) {
|
||||
@ -4840,16 +4828,8 @@ void topology_probe()
|
||||
siblings = get_thread_siblings(&cpus[i]);
|
||||
if (siblings > max_siblings)
|
||||
max_siblings = siblings;
|
||||
if (cpus[i].thread_id != -1)
|
||||
if (cpus[i].thread_id == 0)
|
||||
topo.num_cores++;
|
||||
|
||||
if (debug > 1)
|
||||
fprintf(outf,
|
||||
"cpu %d pkg %d node %d core %d thread %d\n",
|
||||
i, cpus[i].physical_package_id,
|
||||
cpus[i].physical_node_id,
|
||||
cpus[i].physical_core_id,
|
||||
cpus[i].thread_id);
|
||||
}
|
||||
|
||||
topo.cores_per_node = max_core_id + 1;
|
||||
@ -4875,6 +4855,20 @@ void topology_probe()
|
||||
topo.threads_per_core = max_siblings;
|
||||
if (debug > 1)
|
||||
fprintf(outf, "max_siblings %d\n", max_siblings);
|
||||
|
||||
if (debug < 1)
|
||||
return;
|
||||
|
||||
for (i = 0; i <= topo.max_cpu_num; ++i) {
|
||||
fprintf(outf,
|
||||
"cpu %d pkg %d node %d lnode %d core %d thread %d\n",
|
||||
i, cpus[i].physical_package_id,
|
||||
cpus[i].physical_node_id,
|
||||
cpus[i].logical_node_id,
|
||||
cpus[i].physical_core_id,
|
||||
cpus[i].thread_id);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void
|
||||
@ -5102,7 +5096,7 @@ int get_and_dump_counters(void)
|
||||
}
|
||||
|
||||
void print_version() {
|
||||
fprintf(outf, "turbostat version 18.06.20"
|
||||
fprintf(outf, "turbostat version 18.07.27"
|
||||
" - Len Brown <lenb@kernel.org>\n");
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user