aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/events
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@redhat.com>2013-05-01 11:25:44 -0400
committerIngo Molnar <mingo@kernel.org>2013-05-28 02:59:54 -0400
commitab573844e3058eef2788803d373019f8bebead57 (patch)
tree8d040ef2da05caccabce8ccb5f4b168ee3f63216 /kernel/events
parentddd40da4ccbabdd2e941837aa987e08dfa4396b4 (diff)
perf: Fix hw breakpoints overflow period sampling
The hw breakpoint pmu 'add' function is missing the period_left update needed for SW events. The perf HW breakpoint events use the SW events framework to process the overflow, so it needs to be properly initialized in the PMU 'add' method. Signed-off-by: Jiri Olsa <jolsa@redhat.com> Reviewed-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Cc: Ingo Molnar <mingo@elte.hu> Cc: Paul Mackerras <paulus@samba.org> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Vince Weaver <vincent.weaver@maine.edu> Cc: Stephane Eranian <eranian@google.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1367421944-19082-5-git-send-email-jolsa@redhat.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events')
-rw-r--r--kernel/events/core.c2
-rw-r--r--kernel/events/hw_breakpoint.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 9dc297faf7c0..e0dcced282e4 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -4961,7 +4961,7 @@ static DEFINE_PER_CPU(struct swevent_htable, swevent_htable);
4961 * sign as trigger. 4961 * sign as trigger.
4962 */ 4962 */
4963 4963
4964static u64 perf_swevent_set_period(struct perf_event *event) 4964u64 perf_swevent_set_period(struct perf_event *event)
4965{ 4965{
4966 struct hw_perf_event *hwc = &event->hw; 4966 struct hw_perf_event *hwc = &event->hw;
4967 u64 period = hwc->last_period; 4967 u64 period = hwc->last_period;
diff --git a/kernel/events/hw_breakpoint.c b/kernel/events/hw_breakpoint.c
index a64f8aeb5c1f..966a241e8616 100644
--- a/kernel/events/hw_breakpoint.c
+++ b/kernel/events/hw_breakpoint.c
@@ -612,6 +612,11 @@ static int hw_breakpoint_add(struct perf_event *bp, int flags)
612 if (!(flags & PERF_EF_START)) 612 if (!(flags & PERF_EF_START))
613 bp->hw.state = PERF_HES_STOPPED; 613 bp->hw.state = PERF_HES_STOPPED;
614 614
615 if (is_sampling_event(bp)) {
616 bp->hw.last_period = bp->hw.sample_period;
617 perf_swevent_set_period(bp);
618 }
619
615 return arch_install_hw_breakpoint(bp); 620 return arch_install_hw_breakpoint(bp);
616} 621}
617 622