mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
tools/power turbostat: Introduce functions to accumulate RAPL consumption
Since the RAPL Joule Counter is 32 bit, turbostat would only print a *star* instead of printing the actual energy consumed to indicate the overflow due to long duration. This does not meet the requirement from servers as the sampling time of turbostat is usually very long on servers. So maintain a set of MSR buffer, and update them periodically before the 32bit MSR register is wrapped round, so as to avoid the overflow. The idea is similar to the implementation of ktime_get(): Periodical MSR timer: total_rapl_sum += (current_rapl_msr - last_rapl_msr); Using get_msr_sum() to get the accumulated RAPL: return (current_rapl_msr - last_rapl_msr) + total_rapl_sum; The accumulated RAPL mechanism will be turned on in next patch. Originally-by: Aaron Lu <aaron.lwe@gmail.com> Reviewed-by: Doug Smythies <dsmythies@telus.net> Tested-by: Doug Smythies <dsmythies@telus.net> Signed-off-by: Chen Yu <yu.c.chen@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
7c2ccc507b
commit
87e15da957
2 changed files with 219 additions and 7 deletions
|
@ -16,7 +16,7 @@ override CFLAGS += -D_FORTIFY_SOURCE=2
|
|||
|
||||
%: %.c
|
||||
@mkdir -p $(BUILD_OUTPUT)
|
||||
$(CC) $(CFLAGS) $< -o $(BUILD_OUTPUT)/$@ $(LDFLAGS) -lcap
|
||||
$(CC) $(CFLAGS) $< -o $(BUILD_OUTPUT)/$@ $(LDFLAGS) -lcap -lrt
|
||||
|
||||
.PHONY : clean
|
||||
clean :
|
||||
|
|
|
@ -259,6 +259,113 @@ struct msr_counter {
|
|||
#define SYSFS_PERCPU (1 << 1)
|
||||
};
|
||||
|
||||
/*
|
||||
* The accumulated sum of MSR is defined as a monotonic
|
||||
* increasing MSR, it will be accumulated periodically,
|
||||
* despite its register's bit width.
|
||||
*/
|
||||
enum {
|
||||
IDX_PKG_ENERGY,
|
||||
IDX_DRAM_ENERGY,
|
||||
IDX_PP0_ENERGY,
|
||||
IDX_PP1_ENERGY,
|
||||
IDX_PKG_PERF,
|
||||
IDX_DRAM_PERF,
|
||||
IDX_COUNT,
|
||||
};
|
||||
|
||||
int get_msr_sum(int cpu, off_t offset, unsigned long long *msr);
|
||||
|
||||
struct msr_sum_array {
|
||||
/* get_msr_sum() = sum + (get_msr() - last) */
|
||||
struct {
|
||||
/*The accumulated MSR value is updated by the timer*/
|
||||
unsigned long long sum;
|
||||
/*The MSR footprint recorded in last timer*/
|
||||
unsigned long long last;
|
||||
} entries[IDX_COUNT];
|
||||
};
|
||||
|
||||
/* The percpu MSR sum array.*/
|
||||
struct msr_sum_array *per_cpu_msr_sum;
|
||||
|
||||
int idx_to_offset(int idx)
|
||||
{
|
||||
int offset;
|
||||
|
||||
switch (idx) {
|
||||
case IDX_PKG_ENERGY:
|
||||
offset = MSR_PKG_ENERGY_STATUS;
|
||||
break;
|
||||
case IDX_DRAM_ENERGY:
|
||||
offset = MSR_DRAM_ENERGY_STATUS;
|
||||
break;
|
||||
case IDX_PP0_ENERGY:
|
||||
offset = MSR_PP0_ENERGY_STATUS;
|
||||
break;
|
||||
case IDX_PP1_ENERGY:
|
||||
offset = MSR_PP1_ENERGY_STATUS;
|
||||
break;
|
||||
case IDX_PKG_PERF:
|
||||
offset = MSR_PKG_PERF_STATUS;
|
||||
break;
|
||||
case IDX_DRAM_PERF:
|
||||
offset = MSR_DRAM_PERF_STATUS;
|
||||
break;
|
||||
default:
|
||||
offset = -1;
|
||||
}
|
||||
return offset;
|
||||
}
|
||||
|
||||
int offset_to_idx(int offset)
|
||||
{
|
||||
int idx;
|
||||
|
||||
switch (offset) {
|
||||
case MSR_PKG_ENERGY_STATUS:
|
||||
idx = IDX_PKG_ENERGY;
|
||||
break;
|
||||
case MSR_DRAM_ENERGY_STATUS:
|
||||
idx = IDX_DRAM_ENERGY;
|
||||
break;
|
||||
case MSR_PP0_ENERGY_STATUS:
|
||||
idx = IDX_PP0_ENERGY;
|
||||
break;
|
||||
case MSR_PP1_ENERGY_STATUS:
|
||||
idx = IDX_PP1_ENERGY;
|
||||
break;
|
||||
case MSR_PKG_PERF_STATUS:
|
||||
idx = IDX_PKG_PERF;
|
||||
break;
|
||||
case MSR_DRAM_PERF_STATUS:
|
||||
idx = IDX_DRAM_PERF;
|
||||
break;
|
||||
default:
|
||||
idx = -1;
|
||||
}
|
||||
return idx;
|
||||
}
|
||||
|
||||
int idx_valid(int idx)
|
||||
{
|
||||
switch (idx) {
|
||||
case IDX_PKG_ENERGY:
|
||||
return do_rapl & RAPL_PKG;
|
||||
case IDX_DRAM_ENERGY:
|
||||
return do_rapl & RAPL_DRAM;
|
||||
case IDX_PP0_ENERGY:
|
||||
return do_rapl & RAPL_CORES_ENERGY_STATUS;
|
||||
case IDX_PP1_ENERGY:
|
||||
return do_rapl & RAPL_GFX;
|
||||
case IDX_PKG_PERF:
|
||||
return do_rapl & RAPL_PKG_PERF_STATUS;
|
||||
case IDX_DRAM_PERF:
|
||||
return do_rapl & RAPL_DRAM_PERF_STATUS;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
struct sys_counters {
|
||||
unsigned int added_thread_counters;
|
||||
unsigned int added_core_counters;
|
||||
|
@ -1250,12 +1357,12 @@ delta_package(struct pkg_data *new, struct pkg_data *old)
|
|||
|
||||
old->gfx_mhz = new->gfx_mhz;
|
||||
|
||||
DELTA_WRAP32(new->energy_pkg, old->energy_pkg);
|
||||
DELTA_WRAP32(new->energy_cores, old->energy_cores);
|
||||
DELTA_WRAP32(new->energy_gfx, old->energy_gfx);
|
||||
DELTA_WRAP32(new->energy_dram, old->energy_dram);
|
||||
DELTA_WRAP32(new->rapl_pkg_perf_status, old->rapl_pkg_perf_status);
|
||||
DELTA_WRAP32(new->rapl_dram_perf_status, old->rapl_dram_perf_status);
|
||||
old->energy_pkg = new->energy_pkg - old->energy_pkg;
|
||||
old->energy_cores = new->energy_cores - old->energy_cores;
|
||||
old->energy_gfx = new->energy_gfx - old->energy_gfx;
|
||||
old->energy_dram = new->energy_dram - old->energy_dram;
|
||||
old->rapl_pkg_perf_status = new->rapl_pkg_perf_status - old->rapl_pkg_perf_status;
|
||||
old->rapl_dram_perf_status = new->rapl_dram_perf_status - old->rapl_dram_perf_status;
|
||||
|
||||
for (i = 0, mp = sys.pp; mp; i++, mp = mp->next) {
|
||||
if (mp->format == FORMAT_RAW)
|
||||
|
@ -3053,6 +3160,111 @@ void do_sleep(void)
|
|||
}
|
||||
}
|
||||
|
||||
int get_msr_sum(int cpu, off_t offset, unsigned long long *msr)
|
||||
{
|
||||
int ret, idx;
|
||||
unsigned long long msr_cur, msr_last;
|
||||
|
||||
if (!per_cpu_msr_sum)
|
||||
return 1;
|
||||
|
||||
idx = offset_to_idx(offset);
|
||||
if (idx < 0)
|
||||
return idx;
|
||||
/* get_msr_sum() = sum + (get_msr() - last) */
|
||||
ret = get_msr(cpu, offset, &msr_cur);
|
||||
if (ret)
|
||||
return ret;
|
||||
msr_last = per_cpu_msr_sum[cpu].entries[idx].last;
|
||||
DELTA_WRAP32(msr_cur, msr_last);
|
||||
*msr = msr_last + per_cpu_msr_sum[cpu].entries[idx].sum;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
timer_t timerid;
|
||||
|
||||
/* Timer callback, update the sum of MSRs periodically. */
|
||||
static int update_msr_sum(struct thread_data *t, struct core_data *c, struct pkg_data *p)
|
||||
{
|
||||
int i, ret;
|
||||
int cpu = t->cpu_id;
|
||||
|
||||
for (i = IDX_PKG_ENERGY; i < IDX_COUNT; i++) {
|
||||
unsigned long long msr_cur, msr_last;
|
||||
int offset;
|
||||
|
||||
if (!idx_valid(i))
|
||||
continue;
|
||||
offset = idx_to_offset(i);
|
||||
if (offset < 0)
|
||||
continue;
|
||||
ret = get_msr(cpu, offset, &msr_cur);
|
||||
if (ret) {
|
||||
fprintf(outf, "Can not update msr(0x%x)\n", offset);
|
||||
continue;
|
||||
}
|
||||
|
||||
msr_last = per_cpu_msr_sum[cpu].entries[i].last;
|
||||
per_cpu_msr_sum[cpu].entries[i].last = msr_cur & 0xffffffff;
|
||||
|
||||
DELTA_WRAP32(msr_cur, msr_last);
|
||||
per_cpu_msr_sum[cpu].entries[i].sum += msr_last;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
msr_record_handler(union sigval v)
|
||||
{
|
||||
for_all_cpus(update_msr_sum, EVEN_COUNTERS);
|
||||
}
|
||||
|
||||
void msr_sum_record(void)
|
||||
{
|
||||
struct itimerspec its;
|
||||
struct sigevent sev;
|
||||
|
||||
per_cpu_msr_sum = calloc(topo.max_cpu_num + 1, sizeof(struct msr_sum_array));
|
||||
if (!per_cpu_msr_sum) {
|
||||
fprintf(outf, "Can not allocate memory for long time MSR.\n");
|
||||
return;
|
||||
}
|
||||
/*
|
||||
* Signal handler might be restricted, so use thread notifier instead.
|
||||
*/
|
||||
memset(&sev, 0, sizeof(struct sigevent));
|
||||
sev.sigev_notify = SIGEV_THREAD;
|
||||
sev.sigev_notify_function = msr_record_handler;
|
||||
|
||||
sev.sigev_value.sival_ptr = &timerid;
|
||||
if (timer_create(CLOCK_REALTIME, &sev, &timerid) == -1) {
|
||||
fprintf(outf, "Can not create timer.\n");
|
||||
goto release_msr;
|
||||
}
|
||||
|
||||
its.it_value.tv_sec = 0;
|
||||
its.it_value.tv_nsec = 1;
|
||||
/*
|
||||
* A wraparound time has been calculated early.
|
||||
* Some sources state that the peak power for a
|
||||
* microprocessor is usually 1.5 times the TDP rating,
|
||||
* use 2 * TDP for safety.
|
||||
*/
|
||||
its.it_interval.tv_sec = rapl_joule_counter_range / 2;
|
||||
its.it_interval.tv_nsec = 0;
|
||||
|
||||
if (timer_settime(timerid, 0, &its, NULL) == -1) {
|
||||
fprintf(outf, "Can not set timer.\n");
|
||||
goto release_timer;
|
||||
}
|
||||
return;
|
||||
|
||||
release_timer:
|
||||
timer_delete(timerid);
|
||||
release_msr:
|
||||
free(per_cpu_msr_sum);
|
||||
}
|
||||
|
||||
void turbostat_loop()
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue