Skip to content

Commit

Permalink
perf_events: Add new start/stop PMU callbacks
Browse files Browse the repository at this point in the history
In certain situations, the kernel may need to stop and start the same
event rapidly. The current PMU callbacks do not distinguish between stop
and release (i.e., stop + free the resource). Thus, a counter may be
released, then it will be immediately re-acquired. Event scheduling will
again take place with no guarantee to assign the same counter. On some
processors, this may event yield to failure to assign the event back due
to competion between cores.

This patch is adding a new pair of callback to stop and restart a counter
without actually release the underlying counter resource. On stop, the
counter is stopped, its values saved and that's it. On start, the value
is reloaded and counter is restarted (on x86, actual restart is delayed
until perf_enable()).

Signed-off-by: Stephane Eranian <eranian@google.com>
[ added fallback to ->enable/->disable for all other PMUs
  fixed x86_pmu_start() to call x86_pmu.enable()
  merged __x86_pmu_disable into x86_pmu_stop() ]
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <4b703875.0a04d00a.7896.ffffb824@mx.google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Stephane Eranian authored and Ingo Molnar committed Feb 26, 2010
1 parent 3a0304e commit d76a081
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 6 deletions.
24 changes: 20 additions & 4 deletions arch/x86/kernel/cpu/perf_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -1495,7 +1495,7 @@ static inline int match_prev_assignment(struct hw_perf_event *hwc,
hwc->last_tag == cpuc->tags[i];
}

static void __x86_pmu_disable(struct perf_event *event, struct cpu_hw_events *cpuc);
static void x86_pmu_stop(struct perf_event *event);

void hw_perf_enable(void)
{
Expand Down Expand Up @@ -1533,7 +1533,7 @@ void hw_perf_enable(void)
match_prev_assignment(hwc, cpuc, i))
continue;

__x86_pmu_disable(event, cpuc);
x86_pmu_stop(event);

hwc->idx = -1;
}
Expand Down Expand Up @@ -1801,6 +1801,19 @@ static int x86_pmu_enable(struct perf_event *event)
return 0;
}

static int x86_pmu_start(struct perf_event *event)
{
struct hw_perf_event *hwc = &event->hw;

if (hwc->idx == -1)
return -EAGAIN;

x86_perf_event_set_period(event, hwc, hwc->idx);
x86_pmu.enable(hwc, hwc->idx);

return 0;
}

static void x86_pmu_unthrottle(struct perf_event *event)
{
struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
Expand Down Expand Up @@ -1924,8 +1937,9 @@ static void intel_pmu_drain_bts_buffer(struct cpu_hw_events *cpuc)
event->pending_kill = POLL_IN;
}

static void __x86_pmu_disable(struct perf_event *event, struct cpu_hw_events *cpuc)
static void x86_pmu_stop(struct perf_event *event)
{
struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
struct hw_perf_event *hwc = &event->hw;
int idx = hwc->idx;

Expand Down Expand Up @@ -1954,7 +1968,7 @@ static void x86_pmu_disable(struct perf_event *event)
struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
int i;

__x86_pmu_disable(event, cpuc);
x86_pmu_stop(event);

for (i = 0; i < cpuc->n_events; i++) {
if (event == cpuc->event_list[i]) {
Expand Down Expand Up @@ -2667,6 +2681,8 @@ static inline void x86_pmu_read(struct perf_event *event)
static const struct pmu pmu = {
.enable = x86_pmu_enable,
.disable = x86_pmu_disable,
.start = x86_pmu_start,
.stop = x86_pmu_stop,
.read = x86_pmu_read,
.unthrottle = x86_pmu_unthrottle,
};
Expand Down
2 changes: 2 additions & 0 deletions include/linux/perf_event.h
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,8 @@ struct perf_event;
struct pmu {
int (*enable) (struct perf_event *event);
void (*disable) (struct perf_event *event);
int (*start) (struct perf_event *event);
void (*stop) (struct perf_event *event);
void (*read) (struct perf_event *event);
void (*unthrottle) (struct perf_event *event);
};
Expand Down
20 changes: 18 additions & 2 deletions kernel/perf_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -1493,6 +1493,22 @@ do { \
return div64_u64(dividend, divisor);
}

static void perf_event_stop(struct perf_event *event)
{
if (!event->pmu->stop)
return event->pmu->disable(event);

return event->pmu->stop(event);
}

static int perf_event_start(struct perf_event *event)
{
if (!event->pmu->start)
return event->pmu->enable(event);

return event->pmu->start(event);
}

static void perf_adjust_period(struct perf_event *event, u64 nsec, u64 count)
{
struct hw_perf_event *hwc = &event->hw;
Expand All @@ -1513,9 +1529,9 @@ static void perf_adjust_period(struct perf_event *event, u64 nsec, u64 count)

if (atomic64_read(&hwc->period_left) > 8*sample_period) {
perf_disable();
event->pmu->disable(event);
perf_event_stop(event);
atomic64_set(&hwc->period_left, 0);
event->pmu->enable(event);
perf_event_start(event);
perf_enable();
}
}
Expand Down

0 comments on commit d76a081

Please sign in to comment.