Commit ab573844 authored by Jiri Olsa's avatar Jiri Olsa Committed by Ingo Molnar
Browse files

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: default avatarJiri Olsa <jolsa@redhat.com>
Reviewed-by: default avatarPeter 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: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1367421944-19082-5-git-send-email-jolsa@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent ddd40da4

include/linux/perf_event.h

+2 −0
Original line number Diff line number Diff line
@@ -743,6 +743,7 @@ extern unsigned int perf_output_skip(struct perf_output_handle *handle, 
				     unsigned int len);

extern int perf_swevent_get_recursion_context(void);

extern void perf_swevent_put_recursion_context(int rctx);

extern u64 perf_swevent_set_period(struct perf_event *event);

extern void perf_event_enable(struct perf_event *event);

extern void perf_event_disable(struct perf_event *event);

extern int __perf_event_disable(void *info);
@@ -782,6 +783,7 @@ static inline void perf_event_fork(struct task_struct *tsk) { } 
static inline void perf_event_init(void)				{ }

static inline int  perf_swevent_get_recursion_context(void)		{ return -1; }

static inline void perf_swevent_put_recursion_context(int rctx)		{ }

static inline u64 perf_swevent_set_period(struct perf_event *event)	{ return 0; }

static inline void perf_event_enable(struct perf_event *event)		{ }

static inline void perf_event_disable(struct perf_event *event)		{ }

static inline int __perf_event_disable(void *info)			{ return -1; }

kernel/events/core.c

+1 −1
Original line number Diff line number Diff line
@@ -4961,7 +4961,7 @@ static DEFINE_PER_CPU(struct swevent_htable, swevent_htable); 
 * sign as trigger.

 */



static u64 perf_swevent_set_period(struct perf_event *event)

u64 perf_swevent_set_period(struct perf_event *event)

{

	struct hw_perf_event *hwc = &event->hw;

	u64 period = hwc->last_period;

kernel/events/hw_breakpoint.c

+5 −0
Original line number Diff line number Diff line
@@ -612,6 +612,11 @@ static int hw_breakpoint_add(struct perf_event *bp, int flags) 
	if (!(flags & PERF_EF_START))

		bp->hw.state = PERF_HES_STOPPED;



	if (is_sampling_event(bp)) {

		bp->hw.last_period = bp->hw.sample_period;

		perf_swevent_set_period(bp);

	}



	return arch_install_hw_breakpoint(bp);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE