perf,x86: add Intel RAPL PMU support
Subsystems (2)
cover perf,x86: add Intel RAPL PMU support
This patch adds a new uncore PMU to expose the Intel RAPL energy consumption counters. Up to 3 counters, each counting a particular RAPL event are exposed.
The RAPL counters are available on Intel SandyBridge, IvyBridge, Haswell. The server skus add a 3rd counter.
The following events are available nd exposed in sysfs:
- rapl-energy-cores: power consumption of all cores on socket
- rapl-energy-pkg: power consumption of all cores + LLc cache
- rapl-energy-dram: power consumption of DRAM
The RAPL PMU is uncore by nature and is implemented such that it only works in system-wide mode. Measuring only one CPU per socket is sufficient. The /sys/devices/rapl/cpumask is exported and can be used by tools to figure out which CPU to monitor by default. For instance, on a 2-socket system, 2 CPUs (one on each socket) will be shown.
The counters all count in the same unit. The perf_events API exposes all RAPL counters as 64-bit integers counting in unit of 1/2^32 Joules (or 0.23 nJ). User level tools must convert the counts by multiplying them by 0.23 and divide 10^9 to obtain Joules. The reason for this is that the kernel avoids doing floating point math whenever possible because it is expensive (user floating-point state must be saved). The method used avoids kernel floating-point and minimizes the loss of precision (bits). Thanks to PeterZ for suggesting this approach.
To convert the raw count in Watt: W = C * 0.23 / (1e9 * time)
RAPL PMU is a new standalone PMU which registers with the perf_event core subsystem. The PMU type (attr->type) is dynamically allocated and is available from /sys/device/rapl/type.
Sampling is not supported by the RAPL PMU. There is no privilege level filtering either.
The PMU exports a cpumask in /sys/devices/uncore/cpumask. It is used by perf to ensure only one instance of each RAPL event is measured per processor socket. Hotplug CPU is also supported.
We artificially limit the number of simultaneous RAPL events to a max of 1 instance of each (so up to 3). That helps track events and is sufficient given that RAPL events do not support any filters, i.e., no gain in measuring the same event twice in an event group.
The second patch adds a hrtimer to poll the counters given that they do no interrupt on overflow. Hardware counters are 32-bit wide.
Supported CPUs: SandyBridge, IvyBridge, Haswell.
$ perf stat -a -e rapl/rapl-energy-cores/,rapl/rapl-energy-pkg/ -I 1000 sleep 10
time counts events
1.000345931 772 278 493 rapl/rapl-energy-cores/
1.000345931 55 539 138 560 rapl/rapl-energy-pkg/
2.000836387 771 751 936 rapl/rapl-energy-cores/
2.000836387 55 326 015 488 rapl/rapl-energy-pkg/Stephane Eranian (2):
perf,x86: add Intel RAPL PMU support
perf,x86: add RAPL hrtimer support
arch/x86/kernel/cpu/Makefile | 2 +- arch/x86/kernel/cpu/perf_event_intel_rapl.c | 649 +++++++++++++++++++++++++++ tools/perf/util/evsel.c | 1 - 3 files changed, 650 insertions(+), 2 deletions(-) create mode 100644 arch/x86/kernel/cpu/perf_event_intel_rapl.c
Signature · 1 line
1.7.9.5
PATCH 1/2 perf,x86: add Intel RAPL PMU support
This patch adds a new uncore PMU to expose the Intel RAPL energy consumption counters. Up to 3 counters, each counting a particular RAPL event are exposed.
The RAPL counters are available on Intel SandyBridge, IvyBridge, Haswell. The server skus add a 3rd counter.
The following events are available nd exposed in sysfs:
- rapl-energy-cores: power consumption of all cores on socket
- rapl-energy-pkg: power consumption of all cores + LLc cache
- rapl-energy-dram: power consumption of DRAM
The RAPL PMU is uncore by nature and is implemented such that it only works in system-wide mode. Measuring only one CPU per socket is sufficient. The /sys/devices/rapl/cpumask is exported and can be used by tools to figure out which CPU to monitor by default. For instance, on a 2-socket system, 2 CPUs (one on each socket) will be shown.
The counters all count in the same unit. The perf_events API exposes all RAPL counters as 64-bit integers counting in unit of 1/2^32 Joules (or 0.23 nJ). User level tools must convert the counts by multiplying them by 0.23 and divide 10^9 to obtain Joules. The reason for this is that the kernel avoids doing floating point math whenever possible because it is expensive (user floating-point state must be saved). The method used avoids kernel floating-point and minimizes the loss of precision (bits). Thanks to PeterZ for suggesting this approach.
To convert the raw count in Watt: W = C * 0.23 / (1e9 * time)
RAPL PMU is a new standalone PMU which registers with the perf_event core subsystem. The PMU type (attr->type) is dynamically allocated and is available from /sys/device/rapl/type.
Sampling is not supported by the RAPL PMU. There is no privilege level filtering either.
We artificially limit the number of simultaneous RAPL events to a max of 1 instance of each (so up to 3). That helps track events and is sufficient given that RAPL events do not support any filters, i.e., no gain in measuring the same event twice in an event group.
--- arch/x86/kernel/cpu/Makefile | 2 +- arch/x86/kernel/cpu/perf_event_intel_rapl.c | 580 +++++++++++++++++++++++++++ tools/perf/util/evsel.c | 1 - 3 files changed, 581 insertions(+), 2 deletions(-) create mode 100644 arch/x86/kernel/cpu/perf_event_intel_rapl.c
arch/x86/kernel/cpu/Makefile +1 -1
@@ -36,7 +36,7 @@ obj-$(CONFIG_CPU_SUP_AMD) += perf_event_amd_iommu.o endif obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_p6.o perf_event_knc.o perf_event_p4.o obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_lbr.o perf_event_intel_ds.o perf_event_intel.o -obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_uncore.o +obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_uncore.o perf_event_intel_rapl.o endif
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +580 -0
580 lines not on this page · raw message
tools/perf/util/evsel.c +0 -1
@@ -895,7 +895,6 @@ int __perf_evsel__read(struct perf_evsel *evsel,if (readn (FD (evsel, cpu, thread), &count, nv *sizeof (u64)) <0 )return -errno; - aggr->val += count.val;if (scale) { aggr->ena += count.ena;
Signature · 1 line
1.7.9.5
Quick review. Thanks for working on this. It should work nicely with ucevent -- people already asked for reporting power numbers there.
arch/x86/kernel/cpu/perf_event_intel_rapl.c
Quoted 6 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +0
-0@@ -0,0 +1,580 @@
Having a comment at the beginning of each file with two sentences what the file roughly does and what "RAPL" actually is would be useful.
Also a pointer to the SDM chapters is also useful.
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 97
Quoted 13 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +13
-0+static u64 rapl_event_update (struct perf_event *event) +{ +struct hw_perf_event *hwc = &event->hw; +u64 prev_raw_count, new_raw_count; +s64 delta, sdelta; +int shift =RAPL_CNTR_WIDTH ; + +again: + prev_raw_count =local64_read (&hwc->prev_count); +rdmsrl (event->hw.event_base, new_raw_count); + +if (local64_cmpxchg (&hwc->prev_count, prev_raw_count, + new_raw_count) != prev_raw_count)
Add a cpu_relax()
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 129
Quoted 12 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +12
-0+ goto again; + +struct rapl_pmu *pmu =__get_cpu_var (rapl_pmu); + +if (WARN_ON_ONCE (!(event->hw.state &PERF_HES_STOPPED ))) +return ; + + event->hw.state =0 ; + +local64_set (&event->hw.prev_count,rapl_read_counter (event)); + + pmu->n_active++;
What lock protects this add?
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 288
Quoted 6 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +6
-0+} + +static ssize_t rapl_get_attr_cpumask (struct device *dev, +struct device_attribute *attr,char *buf) +{ +int n =cpulist_scnprintf (buf,PAGE_SIZE -2 , &rapl_cpu_mask);
Check n here in case it overflowed
Quoted 10 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +7
-0+ + buf[n++] ='\n' ; + buf[n] ='\0' ; +return n; +for_each_online_cpu (i) { + pmu2 =per_cpu (rapl_pmu, i); +
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 446
Quoted 10 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +10
-0+if (!pmu2 || i == cpu) +continue ; + +if (pmu2->phys_id == phys_id) { +per_cpu (rapl_pmu, cpu) = pmu2; +per_cpu (rapl_pmu_kfree, cpu) = pmu1; +atomic_inc (&pmu2->refcnt); +break ; + } + }
Doesn't this need a lock of some form? AFAIK we can do parallel CPU startup now.
Similar to the other code walking the CPUs.
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 520
Quoted 4 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +4
-0+static int __init rapl_pmu_init (void ) +{ +struct rapl_pmu *pmu; +int i, cpu, ret;
You need to check for Intel CPU here, as this is called unconditionally.
A more modern way to do this is to use x86_cpu_id.
This would in principle allow making it a module later (if perf ever supports that)
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 526
Quoted 6 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +6
-0+ +/* check supported CPU */ +switch (boot_cpu_data.x86_model) { +case 42 :/* Sandy Bridge */ +case 58 :/* Ivy Bridge */ +case 60 :/* Haswell */
Need more model numbers for Haswell (see the main perf driver)
tools/perf/util/evsel.c int __perf_evsel__read(struct perf_evsel *evsel, · line 900
Quoted 12 lines
tools/perf/util/evsel.c +0
-1@@ -895,7 +895,6 @@ int __perf_evsel__read(struct perf_evsel *evsel,if (readn (FD (evsel, cpu, thread), &count, nv *sizeof (u64)) <0 )return -errno; - aggr->val += count.val;if (scale) { aggr->ena += count.ena;
Bogus hunk
-Andi
Signature · 1 line
[email protected] -- Speaking for myself only
Peter Zijlstra
maintainerQuoted 2 lines · Andi Kleen
This would in principle allow making it a module later (if perf ever supports that)
IIRC its a few EXPORTs away from being able to do that.
Quoted 5 lines · Peter Zijlstra
Quoted 2 lines · Andi Kleen
This would in principle allow making it a module later (if perf ever supports that)
IIRC its a few EXPORTs away from being able to do that.
Great. With ~700k text that would be a good thing. After all most users don't develop.
Hopefully we can get there soon.
Is anyone actively working on it?
-Andi
Signature · 1 line
[email protected] -- Speaking for myself only
Peter Zijlstra
maintainerQuoted 5 lines · Andi Kleen
Quoted 4 lines · Peter Zijlstra
Quoted 2 lines · Andi Kleen
This would in principle allow making it a module later (if perf ever supports that)
Quoted 8 lines
Quoted 1 line
IIRC its a few EXPORTs away from being able to do that.
Great. With ~700k text that would be a good thing. After all most users don't develop.
Hopefully we can get there soon.
Is anyone actively working on it?
All of perf being a module; no and that's not actually going to happen. PMU driver modules should be fairly simple though.
Dunno if anybody is working on that, I typically consider my .config broken if its got =m in it.
Quoted 8 lines · Andi Kleen
Quoted 5 lines · Peter Zijlstra
Quoted 2 lines · Andi Kleen
This would in principle allow making it a module later (if perf ever supports that)
IIRC its a few EXPORTs away from being able to do that.
Great. With ~700k text that would be a good thing.
Nonsense, the real overhead of core perf + PMU drivers on x86-64 is around 150k.
The 700k overhead you claimed is not reproducible, at all, and I tested it with your own config:
https://lkml.org/lkml/2013/10/8/62
700k in perf is nonsensical - it's an obvious lie really, the code sizes of the relevant perf .o objects are nowhere even _close_ to that amount:
hubble:~/tip> size $(find . -name '*perf*.o')
text data bss dec hex filename
887 0 32 919 397 ./arch/x86/kernel/cpu/perfctr-watchdog.o
2932 680 96 3708 e7c ./arch/x86/kernel/cpu/perf_event_amd_uncore.o
14117 6361 1 20479 4fff ./arch/x86/kernel/cpu/perf_event_intel.o
23787 19541 264 43592 aa48 ./arch/x86/kernel/cpu/perf_event_intel_uncore.o
4531 1572 0 6103 17d7 ./arch/x86/kernel/cpu/perf_event_p4.o
1728 1121 0 2849 b21 ./arch/x86/kernel/cpu/perf_event_knc.o
4591 811 32 5434 153a ./arch/x86/kernel/cpu/perf_event_amd_ibs.o
13394 6797 116 20307 4f53 ./arch/x86/kernel/cpu/perf_event.o
3156 1483 32 4671 123f ./arch/x86/kernel/cpu/perf_event_amd_iommu.o
5322 4396 0 9718 25f6 ./arch/x86/kernel/cpu/perf_event_intel_ds.o
11383 1 0 11384 2c78 ./arch/x86/kernel/cpu/perf_event_intel_lbr.o
3636 1125 0 4761 1299 ./arch/x86/kernel/cpu/perf_event_amd.o
1282 544 0 1826 722 ./arch/x86/kernel/cpu/perf_event_p6.o
278 1 0 279 117 ./arch/x86/kernel/perf_regs.o
4844 88 12 4944 1350 ./drivers/acpi/processor_perflib.o
77 96 0 173 ad ./drivers/cpufreq/cpufreq_performance.o
232 64 0 296 128 ./drivers/devfreq/governor_performance.o 1972 4 64 2040 7f8 ./kernel/trace/trace_event_perf.o
So stop making that ridiculous claim without posting exact .config's publicly.
Thanks,
Ingo
Quoted 4 lines · Andi Kleen
Quick review. Thanks for working on this. It should work nicely with ucevent -- people already asked for reporting power numbers there.
Yes, got some requests myself too. So I implemented this.
Quoted 10 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c
Quoted 6 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +0
-0@@ -0,0 +1,580 @@Having a comment at the beginning of each file with two sentences what the file roughly does and what "RAPL" actually is would be useful.
Quoted 2 lines
Also a pointer to the SDM chapters is also useful.
Forgot to add that. Will do in V2.
Quoted 7 lines
Quoted 7 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +7
-0+static u64 rapl_event_update (struct perf_event *event) +{ +struct hw_perf_event *hwc = &event->hw; +u64 prev_raw_count, new_raw_count; +s64 delta, sdelta; +int shift =RAPL_CNTR_WIDTH ; +
Quoted 9 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 97
Quoted 6 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +6
-0+again: + prev_raw_count =local64_read (&hwc->prev_count); +rdmsrl (event->hw.event_base, new_raw_count); + +if (local64_cmpxchg (&hwc->prev_count, prev_raw_count, + new_raw_count) != prev_raw_count)Add a
cpu_relax()
But then it should be in perf_event_*.c as well.
It's a verbatim copy of the existing code. Now given that RAPL does not interrupt, the only risk here would be preemption. I did not verify whether this function was always called with interrupts disabled. So I left the retry loop.
Quoted 6 lines
Quoted 6 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +6
-0+ goto again; + +struct rapl_pmu *pmu =__get_cpu_var (rapl_pmu); + +if (WARN_ON_ONCE (!(event->hw.state &PERF_HES_STOPPED ))) +return ;
Quoted 9 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 129
Quoted 6 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +6
-0+ + event->hw.state =0 ; + +local64_set (&event->hw.prev_count,rapl_read_counter (event)); + + pmu->n_active++;What lock protects this add?
None. I will add one. Bu then I am wondering about if it is really necessary given
that RAPL event are system-wide and this pinned to a CPU. If the call came from another CPU, then it IPI there, and that means that CPU is executing that code. Any other CPU will need IPI too, and that interrupt will be kept pending. Am I missing a test case here? Are IPI reentrant?
Quoted 9 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 288
Quoted 6 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +6
-0+} + +static ssize_t rapl_get_attr_cpumask (struct device *dev, +struct device_attribute *attr,char *buf) +{ +int n =cpulist_scnprintf (buf,PAGE_SIZE -2 , &rapl_cpu_mask);Check n here in case it overflowed
But isn't that what the -2 and the below \n\0 are for?
Quoted 7 lines
Quoted 4 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +4
-0+ + buf[n++] ='\n' ; + buf[n] ='\0' ; +return n;
Quoted 17 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 446
Quoted 13 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +13
-0+for_each_online_cpu (i) { + pmu2 =per_cpu (rapl_pmu, i); + +if (!pmu2 || i == cpu) +continue ; + +if (pmu2->phys_id == phys_id) { +per_cpu (rapl_pmu, cpu) = pmu2; +per_cpu (rapl_pmu_kfree, cpu) = pmu1; +atomic_inc (&pmu2->refcnt); +break ; + } + }Doesn't this need a lock of some form? AFAIK we can do parallel CPU startup now.
Did not know about this change? But then that means all the other perf_event *_starting() and maybe even _*prepare() routines must also use locks. I can add that to RAPL.
Quoted 9 lines
Similar to the other code walking the CPUs.
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 520
Quoted 4 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +4
-0+static int __init rapl_pmu_init (void ) +{ +struct rapl_pmu *pmu; +int i, cpu, ret;You need to check for Intel CPU here, as this is called unconditionally.
Quoted 4 lines
A more modern way to do this is to use
x86_cpu_id.
This would in principle allow making it a module later (if perf ever supports that)
Forgot that, will fix it.
Quoted 9 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 526
Quoted 6 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +6
-0+ +/* check supported CPU */ +switch (boot_cpu_data.x86_model) { +case 42 :/* Sandy Bridge */ +case 58 :/* Ivy Bridge */ +case 60 :/* Haswell */ Need more model numbers for Haswell (see the main perf driver)
Don't have all the models to test...
Quoted 6 lines
Quoted 6 lines
tools/perf/util/evsel.c +0
-0@@ -895,7 +895,6 @@ int __perf_evsel__read(struct perf_evsel *evsel, if (readn(FD(evsel, cpu, thread),
Quoted 9 lines
tools/perf/util/evsel.c int __perf_evsel__read(struct perf_evsel *evsel, · line 900
Quoted 6 lines
tools/perf/util/evsel.c +0
-1&count, nv * sizeof(u64)) < 0)return -errno; - aggr->val += count.val;if (scale) { aggr->ena += count.ena;Bogus hunk
Arg, yes. It should not be here.
Thanks for the review.
Quoted 16 lines · Stephane Eranian
Quoted 16 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 129
Quoted 13 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +12
-0+ goto again; + +struct rapl_pmu *pmu =__get_cpu_var (rapl_pmu); + +if (WARN_ON_ONCE (!(event->hw.state &PERF_HES_STOPPED ))) +return ; + + event->hw.state =0 ; + +local64_set (&event->hw.prev_count,rapl_read_counter (event)); + + pmu->n_active++;What lock protects this add?
Quoted 6 lines
None. I will add one. Bu then I am wondering about if it is really necessary given
that RAPL event are system-wide and this pinned to a CPU. If the call came from another CPU, then it IPI there, and that means that CPU is executing that code. Any other CPU will need IPI too, and that interrupt will be kept pending. Am I missing a test case here? Are IPI reentrant?
they can be if interrupts are enabled (likely here)
Quoted 11 lines
Quoted 10 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 288
Quoted 7 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +6
-0+} + +static ssize_t rapl_get_attr_cpumask (struct device *dev, +struct device_attribute *attr,char *buf) +{ +int n =cpulist_scnprintf (buf,PAGE_SIZE -2 , &rapl_cpu_mask);Check n here in case it overflowed
But isn't that what the -2 and the below \n\0 are for?
I know it's very unlikely and other stuff would break, but
Assuming you have a system with some many CPUs that they don't fit into a page. Then the scnprintf would fail, but you would corrupt random data because you write before the buffer.
Quoted 6 lines
Quoted 3 lines
Doesn't this need a lock of some form? AFAIK we can do parallel CPU startup now.
Did not know about this change? But then that means all the other
perf_event*_starting()and maybe even _*prepare() routines must also use locks. I can add that to RAPL.
Yes may be broken everywhere.
Quoted 9 lines
Quoted 8 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 526
Quoted 5 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +5
-0+/* check supported CPU */ +switch (boot_cpu_data.x86_model) { +case 42 :/* Sandy Bridge */ +case 58 :/* Ivy Bridge */ +case 60 :/* Haswell */ Need more model numbers for Haswell (see the main perf driver)
Don't have all the models to test...
It should be all the same.
-Andi
Signature · 1 line
[email protected] -- Speaking for myself only
Quoted 17 lines · Andi Kleen
Quoted 16 lines · Stephane Eranian
Quoted 16 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 129
Quoted 13 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +12
-0+ goto again; + +struct rapl_pmu *pmu =__get_cpu_var (rapl_pmu); + +if (WARN_ON_ONCE (!(event->hw.state &PERF_HES_STOPPED ))) +return ; + + event->hw.state =0 ; + +local64_set (&event->hw.prev_count,rapl_read_counter (event)); + + pmu->n_active++;What lock protects this add?
Quoted 9 lines
Quoted 6 lines
None. I will add one. Bu then I am wondering about if it is really necessary given
that RAPL event are system-wide and this pinned to a CPU. If the call came from another CPU, then it IPI there, and that means that CPU is executing that code. Any other CPU will need IPI too, and that interrupt will be kept pending. Am I missing a test case here? Are IPI reentrant?they can be if interrupts are enabled (likely here)
I will check on that.
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 288
Quoted 7 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +6
-0+} + +static ssize_t rapl_get_attr_cpumask (struct device *dev, +struct device_attribute *attr,char *buf) +{ +int n =cpulist_scnprintf (buf,PAGE_SIZE -2 , &rapl_cpu_mask);Check n here in case it overflowed
Quoted 8 lines
Quoted 1 line
But isn't that what the -2 and the below \n\0 are for?
I know it's very unlikely and other stuff would break, but
Assuming you have a system with some many CPUs that they don't fit into a page. Then the scnprintf would fail, but you would corrupt random data because you write before the buffer.
My understanding is that cpulist_scnprintf() behaves like snprintf(). It generates up to PAGE_SIZE-2 characters in the buffer. So if you have a very large number of CPUs, the generation of the output string in buf will stop, i.e., truncated string. The return value is the length of the string. That n cannot be negative. So how you could write buffer the buffer (buf)?
The part I don't like about the API of rapl_get_attr_cpumask() here is that it assumes that the buf is PAGE_SIZE. Its size is not passed as an argument. But maybe this is what you are pointing out to me.
Quoted 15 lines
Quoted 6 lines
Quoted 3 lines
Doesn't this need a lock of some form? AFAIK we can do parallel CPU startup now.
Did not know about this change? But then that means all the other
perf_event*_starting()and maybe even _*prepare() routines must also use locks. I can add that to RAPL.Yes may be broken everywhere.
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +5
-0+/* check supported CPU */ +switch (boot_cpu_data.x86_model) { +case 42 :/* Sandy Bridge */ +case 58 :/* Ivy Bridge */ +case 60 :/* Haswell */
Quoted 6 lines
Quoted 3 lines
Quoted 2 lines
Need more model numbers for Haswell (see the main perf driver)
Don't have all the models to test...
It should be all the same.
Need to know which ones are client vs. servers. Not have the same number of RAPL events.
Thanks.
Andi,
Quoted 17 lines · Andi Kleen
Quoted 16 lines · Stephane Eranian
Quoted 16 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c line 129
Quoted 13 lines
arch/x86/kernel/cpu/perf_event_intel_rapl.c new file +12
-0+ goto again; + +struct rapl_pmu *pmu =__get_cpu_var (rapl_pmu); + +if (WARN_ON_ONCE (!(event->hw.state &PERF_HES_STOPPED ))) +return ; + + event->hw.state =0 ; + +local64_set (&event->hw.prev_count,rapl_read_counter (event)); + + pmu->n_active++;What lock protects this add?
Quoted 9 lines
Quoted 6 lines
None. I will add one. Bu then I am wondering about if it is really necessary given
that RAPL event are system-wide and this pinned to a CPU. If the call came from another CPU, then it IPI there, and that means that CPU is executing that code. Any other CPU will need IPI too, and that interrupt will be kept pending. Am I missing a test case here? Are IPI reentrant?they can be if interrupts are enabled (likely here)
So, I spent some time trying to figure this out via instrumentation and it seems it is never the case that this function or in fact __perf_event_enable() for a syswide event is called with interrupts enabled. Why?
Well, it has to do with cpu_function_call() which is ALWAYS called for a syswide event on the perf_event_enable() code path.
If you are calling for an event on the same CPU, you end up executing:smp_call_function_single()
if (cpu == this_cpu) {
local_irq_save(flags);
func(info);
local_irq_restore(flags);If you are calling a remote CPU, then you end up in the APIC code to send an IPI. On the receiving side, I could not find the local_irq_save() call, but I verified that upon entry, __perf_event_enable() has interrupts disabled. And that's either because I missed the interrupt masking call OR because the HW does it automatically for us. I could not yet figure this out.
In any case, looks like both the start() and stop() routine are protected from interrupts and thus preemption, so we may not need a lock to protect n_active.
PATCH 2/2 perf,x86: add RAPL hrtimer support
In reply to Stephane EranianThe RAPL PMU counters do not interrupt on overflow. Therefore, the kernel needs to poll the counters to avoid missing an overflow. This patch adds the hrtimer code to do this.
The timer internval is calculated at boot time based on the power unit used by the HW.
--- arch/x86/kernel/cpu/perf_event_intel_rapl.c | 75 +++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_rapl.c +72 -3
@@ -54,6 +54,8 @@ struct rapl_pmu {int hw_unit;/* 1/2^hw_unit Joule */ int phys_id;int n_active;/* number of active events */ +ktime_t timer_interval;/* in ktime_t unit */ +struct hrtimer hrtimer;unsigned long active_mask[BITS_TO_LONGS (RAPL_IDX_MAX )];struct perf_event *events[RAPL_IDX_MAX ]; };
@@ -82,6 +84,18 @@ static inline u64 rapl_scale(u64 v)return v << (32 -__get_cpu_var (rapl_pmu)->hw_unit); } +static void rapl_start_hrtimer (struct rapl_pmu *pmu) +{ +__hrtimer_start_range_ns (&pmu->hrtimer, + pmu->timer_interval,0 , +HRTIMER_MODE_REL_PINNED ,0 ); +} + +static void rapl_stop_hrtimer (struct rapl_pmu *pmu) +{ +hrtimer_cancel (&pmu->hrtimer); +} +static u64 rapl_event_update (struct perf_event *event) {struct hw_perf_event *hwc = &event->hw;
@@ -115,6 +129,38 @@ static u64 rapl_event_update(struct perf_event *event)return new_raw_count; } +static enum hrtimer_restart rapl_hrtimer_handle (struct hrtimer *hrtimer) +{ + struct rapl_pmu *pmu = container_of(hrtimer, struct rapl_pmu, hrtimer); +unsigned long flags; +int i; + +if (!pmu->n_active) +return HRTIMER_NORESTART ; + +local_irq_save (flags); + +for_each_set_bit (i, pmu->active_mask,RAPL_IDX_MAX ) { +rapl_event_update (pmu->events[i]); + } + +local_irq_restore (flags); + +hrtimer_forward_now (&pmu->hrtimer, pmu->timer_interval); + + +return HRTIMER_RESTART ; +} + +static void rapl_hrtimer_init (struct rapl_pmu *pmu) +{ +hrtimer_init (&pmu->hrtimer,CLOCK_MONOTONIC ,HRTIMER_MODE_REL ); + pmu->hrtimer.function = rapl_hrtimer_handle; +} + + + +static void rapl_pmu_event_start (struct perf_event *event,int flags) {struct rapl_pmu *pmu =__get_cpu_var (rapl_pmu);
@@ -127,6 +173,8 @@ static void rapl_pmu_event_start(struct perf_event *event, int flags)local64_set (&event->hw.prev_count,rapl_read_counter (event)); pmu->n_active++; +if (pmu->n_active ==1 ) +rapl_start_hrtimer (pmu); }static int rapl_pmu_event_add (struct perf_event *event,int flags)
@@ -158,6 +206,9 @@ static void rapl_pmu_event_stop(struct perf_event *event, int flags)if (__test_and_clear_bit (hwc->idx, pmu->active_mask)) {WARN_ON_ONCE (pmu->n_active <=0 ); pmu->n_active--; +if (pmu->n_active ==0 ) +rapl_stop_hrtimer (pmu); + pmu->events[hwc->idx] =NULL ;WARN_ON_ONCE (hwc->state &PERF_HES_STOPPED ); hwc->state |=PERF_HES_STOPPED ;
@@ -394,6 +445,7 @@ static int rapl_cpu_prepare(int cpu) {struct rapl_pmu *pmu =per_cpu (rapl_pmu, cpu);int phys_id =topology_physical_package_id (cpu); +u64 ms;if (pmu)return 0 ;
@@ -415,6 +467,20 @@ static int rapl_cpu_prepare(int cpu)rdmsrl (MSR_RAPL_POWER_UNIT , pmu->hw_unit); pmu->hw_unit = (pmu->hw_unit >>8 ) &0x1FULL ; +/* +* use reference of 200W for scaling the timeout +* to avoid missing counter overflows. +* 200W = 200 Joules/sec +* divide interval by 2 to avoid lockstep (2 * 100) +* if hw unit is 32, then we use 2 ms 1/200/2 +*/ +if (pmu->hw_unit <32 ) + ms =1000 * (1ULL << (32 - pmu->hw_unit -1 )) / (2 *100 ); +else + ms =2 ; + + pmu->timer_interval =ms_to_ktime (ms); +/* set RAPL pmu for this cpu for now */ per_cpu (rapl_pmu_kfree, cpu) =NULL ;per_cpu (rapl_pmu, cpu) = pmu;
@@ -559,6 +625,7 @@ static int __init rapl_pmu_init(void) }rapl_cpu_prepare (cpu);cpumask_set_cpu (cpu, &rapl_cpu_mask); +rapl_hrtimer_init (per_cpu (rapl_pmu, cpu)); }perf_cpu_notifier (rapl_cpu_notifier);
@@ -567,11 +634,13 @@ static int __init rapl_pmu_init(void)WARN_ON (ret); pmu =__get_cpu_var (rapl_pmu); -pr_info ("RAPL PMU detected, hw unit 2^-%d Joules, " +pr_info ("RAPL PMU detected, hw unit 2^-%d Joules," " API unit is 2^-32 Joules," -" %d fixed counters\n" , +" %d fixed counters," , +" %Lu ms ovfl timer\n" , pmu->hw_unit, -hweight32 (rapl_cntr_mask)); +hweight32 (rapl_cntr_mask), +ktime_to_ms (pmu->timer_interval));put_online_cpus ();
Signature · 1 line
1.7.9.5
Borislav Petkov
maintainerQuoted 11 lines · Stephane Eranian
The counters all count in the same unit. The
perf_eventsAPI exposes all RAPL counters as 64-bit integers counting in unit of 1/2^32 Joules (or 0.23 nJ). User level tools must convert the counts by multiplying them by 0.23 and divide 10^9 to obtain Joules. The reason for this is that the kernel avoids doing floating point math whenever possible because it is expensive (user floating-point state must be saved). The method used avoids kernel floating-point and minimizes the loss of precision (bits). Thanks to PeterZ for suggesting this approach.To convert the raw count in Watt: W = C * 0.23 / (1e9 * time)
...
Quoted 6 lines
$ perf stat -a -e rapl/rapl-energy-cores/,rapl/rapl-energy-pkg/ -I 1000 sleep 10
time counts events
1.000345931 772 278 493 rapl/rapl-energy-cores/
1.000345931 55 539 138 560 rapl/rapl-energy-pkg/
2.000836387 771 751 936 rapl/rapl-energy-cores/
2.000836387 55 326 015 488 rapl/rapl-energy-pkg/So can we do the Watt conversion in perf tool and make that "counts" output more human-friendly like what those numbers are, to which core/LLC they belong, etc, etc?
Thanks.
Signature · 5 lines
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--Quoted 22 lines · Borislav Petkov
Quoted 11 lines · Stephane Eranian
The counters all count in the same unit. The
perf_eventsAPI exposes all RAPL counters as 64-bit integers counting in unit of 1/2^32 Joules (or 0.23 nJ). User level tools must convert the counts by multiplying them by 0.23 and divide 10^9 to obtain Joules. The reason for this is that the kernel avoids doing floating point math whenever possible because it is expensive (user floating-point state must be saved). The method used avoids kernel floating-point and minimizes the loss of precision (bits). Thanks to PeterZ for suggesting this approach.To convert the raw count in Watt: W = C * 0.23 / (1e9 * time)
...
Quoted 6 lines
$ perf stat -a -e rapl/rapl-energy-cores/,rapl/rapl-energy-pkg/ -I 1000 sleep 10 time counts events 1.000345931 772 278 493 rapl/rapl-energy-cores/ 1.000345931 55 539 138 560 rapl/rapl-energy-pkg/ 2.000836387 771 751 936 rapl/rapl-energy-cores/ 2.000836387 55 326 015 488 rapl/rapl-energy-pkg/
Quoted 4 lines
So can we do the Watt conversion in perf tool and make that "counts" output more human-friendly like what those numbers are, to which core/LLC they belong, etc, etc?
We could but that means we would need to special case the events in perf. I was trying to avoid that.
Quoted 8 lines
Thanks.
--
Regards/Gruss,
Boris.Sent from a fat crate under my desk. Formatting is fine. --
Borislav Petkov
maintainerQuoted 2 lines · Stephane Eranian
We could but that means we would need to special case the events in perf. I was trying to avoid that.
Maybe we could use some sort of a post-processing hook on those events' output which is defined only for that type of events...
Signature · 5 lines
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--Peter Zijlstra
maintainerQuoted 11 lines · Stephane Eranian
The counters all count in the same unit. The
perf_eventsAPI exposes all RAPL counters as 64-bit integers counting in unit of 1/2^32 Joules (or 0.23 nJ). User level tools must convert the counts by multiplying them by 0.23 and divide 10^9 to obtain Joules. The reason for this is that the kernel avoids doing floating point math whenever possible because it is expensive (user floating-point state must be saved). The method used avoids kernel floating-point and minimizes the loss of precision (bits). Thanks to PeterZ for suggesting this approach.To convert the raw count in Watt: W = C * 0.23 / (1e9 * time)
Right, so the output is in 32.32 fixed point. So if you want to convert to double you'd do something like:
double watt = ldexp(counter, -32);