aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2011-06-29 11:42:37 -0400
committerIngo Molnar <mingo@elte.hu>2011-07-01 05:06:40 -0400
commit26ca5c11fb45ae2b2ac7e3574b8db6b3a3c7d350 (patch)
tree01f430828eaacf7ba3e0eb541f8d946f3d855696
parent0af3ac1fdb9d5c297b4b07c9e0172531d42b6716 (diff)
perf: export perf_event_refresh() to modules
KVM needs one-shot samples, since a PMC programmed to -X will fire after X events and then again after 2^40 events (i.e. variable period). Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1309362157-6596-4-git-send-email-avi@redhat.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/linux/perf_event.h5
-rw-r--r--kernel/events/core.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 2a08cacb1628..3f2711ccf910 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -955,6 +955,7 @@ extern void perf_pmu_disable(struct pmu *pmu);
955extern void perf_pmu_enable(struct pmu *pmu); 955extern void perf_pmu_enable(struct pmu *pmu);
956extern int perf_event_task_disable(void); 956extern int perf_event_task_disable(void);
957extern int perf_event_task_enable(void); 957extern int perf_event_task_enable(void);
958extern int perf_event_refresh(struct perf_event *event, int refresh);
958extern void perf_event_update_userpage(struct perf_event *event); 959extern void perf_event_update_userpage(struct perf_event *event);
959extern int perf_event_release_kernel(struct perf_event *event); 960extern int perf_event_release_kernel(struct perf_event *event);
960extern struct perf_event * 961extern struct perf_event *
@@ -1149,6 +1150,10 @@ static inline void perf_event_delayed_put(struct task_struct *task) { }
1149static inline void perf_event_print_debug(void) { } 1150static inline void perf_event_print_debug(void) { }
1150static inline int perf_event_task_disable(void) { return -EINVAL; } 1151static inline int perf_event_task_disable(void) { return -EINVAL; }
1151static inline int perf_event_task_enable(void) { return -EINVAL; } 1152static inline int perf_event_task_enable(void) { return -EINVAL; }
1153static inline int perf_event_refresh(struct perf_event *event, int refresh)
1154{
1155 return -EINVAL;
1156}
1152 1157
1153static inline void 1158static inline void
1154perf_sw_event(u32 event_id, u64 nr, struct pt_regs *regs, u64 addr) { } 1159perf_sw_event(u32 event_id, u64 nr, struct pt_regs *regs, u64 addr) { }
diff --git a/kernel/events/core.c b/kernel/events/core.c
index ba8e0f4a20e6..0567e32d71aa 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -1764,7 +1764,7 @@ out:
1764 raw_spin_unlock_irq(&ctx->lock); 1764 raw_spin_unlock_irq(&ctx->lock);
1765} 1765}
1766 1766
1767static int perf_event_refresh(struct perf_event *event, int refresh) 1767int perf_event_refresh(struct perf_event *event, int refresh)
1768{ 1768{
1769 /* 1769 /*
1770 * not supported on inherited events 1770 * not supported on inherited events
@@ -1777,6 +1777,7 @@ static int perf_event_refresh(struct perf_event *event, int refresh)
1777 1777
1778 return 0; 1778 return 0;
1779} 1779}
1780EXPORT_SYMBOL_GPL(perf_event_refresh);
1780 1781
1781static void ctx_sched_out(struct perf_event_context *ctx, 1782static void ctx_sched_out(struct perf_event_context *ctx,
1782 struct perf_cpu_context *cpuctx, 1783 struct perf_cpu_context *cpuctx,