static unsigned int do_dts;
static unsigned int do_ptm;
static unsigned int tcc_activation_temp;
-static unsigned int tcc_activation_temp_override;
static double rapl_energy_units;
#define RAPL_PKG (1 << 0)
int aperf_mperf_unstable;
int backwards_count;
-cpu_set_t *cpu_present_set, *cpu_affinity_set;
-size_t cpu_present_setsize, cpu_affinity_setsize;
+cpu_set_t *cpu_present_set, *cpu_affinity_set, *cpu_saved_affinity_set;
+size_t cpu_present_setsize, cpu_affinity_setsize, cpu_saved_affinity_setsize;
struct thread_data {
unsigned long long tsc;
unsigned int energy_gfx; /* MSR_PP1_ENERGY_STATUS */
unsigned int rapl_pkg_perf_status; /* MSR_PKG_PERF_STATUS */
unsigned int rapl_dram_perf_status; /* MSR_DRAM_PERF_STATUS */
+ unsigned int tcc_activation_temp;
unsigned int pkg_temp_c;
-
} *package_even, *package_odd;
#define ODD_COUNTERS thread_odd, core_odd, package_odd
enum return_values {
OK = 0,
ERR_CPU_MIGRATE,
+ ERR_CPU_SAVE_SCHED_AFFINITY,
ERR_MSR_IA32_APERF,
ERR_MSR_IA32_MPERF,
ERR_MSR_SMI_COUNT,
}
static int __attribute__((warn_unused_result))
-cpu_migrate(int cpu)
-{
- CPU_ZERO_S(cpu_affinity_setsize, cpu_affinity_set);
- CPU_SET_S(cpu, cpu_affinity_setsize, cpu_affinity_set);
- if (sched_setaffinity(0, cpu_affinity_setsize, cpu_affinity_set) == -1)
- return -ERR_CPU_MIGRATE;
- else
- return 0;
-}
-
-static int __attribute__((warn_unused_result))
-open_msr(int cpu)
+open_msr(int cpu, _Bool multiple_read)
{
char pathname[32];
int fd;
- /* FIXME: Do we really need this, why? */
- if (cpu_migrate(cpu)) {
- ERROR("Could not migrate to CPU %d", cpu);
- return -ERR_CPU_MIGRATE;
+ /*
+ * If we need to do multiple read, let's migrate to the CPU
+ * Otherwise, we would lose time calling functions on another CPU
+ *
+ * If we are not yet initialized (cpu_affinity_setsize = 0),
+ * we need to skip this optimisation.
+ */
+ if (multiple_read && cpu_affinity_setsize) {
+ CPU_ZERO_S(cpu_affinity_setsize, cpu_affinity_set);
+ CPU_SET_S(cpu, cpu_affinity_setsize, cpu_affinity_set);
+ if (sched_setaffinity(0, cpu_affinity_setsize, cpu_affinity_set) == -1) {
+ ERROR("Could not migrate to CPU %d", cpu);
+ return -ERR_CPU_MIGRATE;
+ }
}
ssnprintf(pathname, sizeof(pathname), "/dev/cpu/%d/msr", cpu);
ssize_t retval;
int fd;
- fd = open_msr(cpu);
+ fd = open_msr(cpu, 0);
if (fd < 0)
return fd;
retval = read_msr(fd, offset, msr);
int msr_fd;
int retval = 0;
- msr_fd = open_msr(cpu);
+ msr_fd = open_msr(cpu, 1);
if (msr_fd < 0)
return msr_fd;
if (do_dts) {
READ_MSR(MSR_IA32_THERM_STATUS, &msr);
- c->core_temp_c = tcc_activation_temp - ((msr >> 16) & 0x7F);
+ c->core_temp_c = p->tcc_activation_temp - ((msr >> 16) & 0x7F);
}
/* collect package counters only for 1st core in package */
}
if (do_ptm) {
READ_MSR(MSR_IA32_PACKAGE_THERM_STATUS, &msr);
- p->pkg_temp_c = tcc_activation_temp - ((msr >> 16) & 0x7F);
+ p->pkg_temp_c = p->tcc_activation_temp - ((msr >> 16) & 0x7F);
}
out:
cpu_affinity_set = NULL;
cpu_affinity_setsize = 0;
+ CPU_FREE(cpu_saved_affinity_set);
+ cpu_saved_affinity_set = NULL;
+ cpu_saved_affinity_setsize = 0;
+
free(thread_even);
free(core_even);
free(package_even);
return -ERR_CPU_NOT_PRESENT;
}
+ /* Saving the scheduling affinity, as it will be modified by get_counters */
+ if (sched_getaffinity(0, cpu_saved_affinity_setsize, cpu_saved_affinity_set) != 0)
+ return -ERR_CPU_SAVE_SCHED_AFFINITY;
+
if (!initialized) {
if ((ret = for_all_cpus(get_counters, EVEN_COUNTERS)) < 0)
- return ret;
+ goto out;
gettimeofday(&tv_even, (struct timezone *)NULL);
is_even = 1;
initialized = 1;
- return 0;
+ ret = 0;
+ goto out;
}
if (is_even) {
if ((ret = for_all_cpus(get_counters, ODD_COUNTERS)) < 0)
- return ret;
+ goto out;
gettimeofday(&tv_odd, (struct timezone *)NULL);
is_even = 0;
timersub(&tv_odd, &tv_even, &tv_delta);
if ((ret = for_all_cpus_2(delta_cpu, ODD_COUNTERS, EVEN_COUNTERS)) < 0)
- return ret;
+ goto out;
if ((ret = for_all_cpus(submit_counters, EVEN_COUNTERS)) < 0)
- return ret;
+ goto out;
} else {
if ((ret = for_all_cpus(get_counters, EVEN_COUNTERS)) < 0)
- return ret;
+ goto out;
gettimeofday(&tv_even, (struct timezone *)NULL);
is_even = 1;
timersub(&tv_even, &tv_odd, &tv_delta);
if ((ret = for_all_cpus_2(delta_cpu, EVEN_COUNTERS, ODD_COUNTERS)) < 0)
- return ret;
+ goto out;
if ((ret = for_all_cpus(submit_counters, ODD_COUNTERS)) < 0)
- return ret;
+ goto out;
}
- return 0;
+ ret = 0;
+out:
+ /*
+ * Let's restore the affinity
+ * This might fail if the number of CPU changed, but we can't do anything in that case..
+ */
+ (void)sched_setaffinity(0, cpu_saved_affinity_setsize, cpu_saved_affinity_set);
+ return ret;
}
static int __attribute__((warn_unused_result))
if (!(t->flags & CPU_IS_FIRST_THREAD_IN_CORE) || !(t->flags & CPU_IS_FIRST_CORE_IN_PACKAGE))
return 0;
- if (tcc_activation_temp_override != 0) {
- tcc_activation_temp = tcc_activation_temp_override;
- ERROR("cpu%d: Using cmdline TCC Target (%d C)\n",
- cpu, tcc_activation_temp);
+ if (tcc_activation_temp != 0) {
+ p->tcc_activation_temp = tcc_activation_temp;
return 0;
}
if (target_c_local < 85 || target_c_local > 127)
goto guess;
- tcc_activation_temp = target_c_local;
+ p->tcc_activation_temp = target_c_local;
return 0;
guess:
- tcc_activation_temp = TJMAX_DEFAULT;
- WARNING("cpu%d: Guessing tjMax %d C, Please use -T to specify",
- t->cpu_id, tcc_activation_temp);
+ p->tcc_activation_temp = TJMAX_DEFAULT;
+ WARNING("cpu%d: Guessing tjMax %d C, Please use TCCActivationTemp to specify",
+ t->cpu_id, p->tcc_activation_temp);
return 0;
}
/*
+ * Allocate and initialize cpu_saved_affinity_set
+ */
+ cpu_saved_affinity_set = CPU_ALLOC((topo.max_cpu_num + 1));
+ if (cpu_saved_affinity_set == NULL) {
+ free(cpus);
+ ERROR("CPU_ALLOC");
+ return -ERR_CPU_ALLOC;
+ }
+ cpu_saved_affinity_setsize = CPU_ALLOC_SIZE((topo.max_cpu_num + 1));
+ CPU_ZERO_S(cpu_saved_affinity_setsize, cpu_saved_affinity_set);
+
+
+ /*
* For online cpus
* find max_core_id, max_package_id
*/
DO_OR_GOTO_ERR(check_dev_msr());
DO_OR_GOTO_ERR(setup_all_buffers());
DO_OR_GOTO_ERR(for_all_cpus(set_temperature_target, EVEN_COUNTERS));
+ DO_OR_GOTO_ERR(for_all_cpus(set_temperature_target, ODD_COUNTERS));
plugin_register_complex_read(NULL, PLUGIN_NAME, turbostat_read, NULL, NULL);
return ret;
}
+static const char *config_keys[] =
+{
+ "TCCActivationTemp",
+};
+static const int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
+
+static int
+turbostat_config(const char *key, const char *value)
+{
+ long unsigned int tmp_val;
+ char *end;
+
+ if (strcasecmp("TCCActivationTemp", key) == 0) {
+ tmp_val = strtoul(value, &end, 0);
+ if (*end != '\0' || tmp_val > UINT_MAX)
+ return -1;
+ tcc_activation_temp = (unsigned int) tmp_val;
+ } else {
+ return -1;
+ }
+ return 0;
+}
+
void module_register(void);
void module_register(void)
{
plugin_register_init(PLUGIN_NAME, turbostat_init);
+ plugin_register_config(PLUGIN_NAME, turbostat_config, config_keys, config_keys_num);
}