Messages in this thread Patch in this message | | | Date | Thu, 21 Jan 2010 13:55:14 GMT | From | tip-bot for Peter Zijlstra <> | Subject | [tip:perf/urgent] perf: Honour event state for aux stream data |
| |
Commit-ID: 22e190851f8709c48baf00ed9ce6144cdc54d025 Gitweb: http://git.kernel.org/tip/22e190851f8709c48baf00ed9ce6144cdc54d025 Author: Peter Zijlstra <a.p.zijlstra@chello.nl> AuthorDate: Mon, 18 Jan 2010 09:12:32 +0100 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Thu, 21 Jan 2010 13:40:40 +0100
perf: Honour event state for aux stream data
Anton reported that perf record kept receiving events even after calling ioctl(PERF_EVENT_IOC_DISABLE). It turns out that FORK,COMM and MMAP events didn't respect the disabled state and kept flowing in.
Reported-by: Anton Blanchard <anton@samba.org> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Tested-by: Anton Blanchard <anton@samba.org> LKML-Reference: <1263459187.4244.265.camel@laptop> CC: stable@kernel.org Signed-off-by: Ingo Molnar <mingo@elte.hu> --- kernel/perf_event.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 603c0d8..d27746b 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -3268,6 +3268,9 @@ static void perf_event_task_output(struct perf_event *event, static int perf_event_task_match(struct perf_event *event) { + if (event->state != PERF_EVENT_STATE_ACTIVE) + return 0; + if (event->cpu != -1 && event->cpu != smp_processor_id()) return 0; @@ -3377,6 +3380,9 @@ static void perf_event_comm_output(struct perf_event *event, static int perf_event_comm_match(struct perf_event *event) { + if (event->state != PERF_EVENT_STATE_ACTIVE) + return 0; + if (event->cpu != -1 && event->cpu != smp_processor_id()) return 0; @@ -3494,6 +3500,9 @@ static void perf_event_mmap_output(struct perf_event *event, static int perf_event_mmap_match(struct perf_event *event, struct perf_mmap_event *mmap_event) { + if (event->state != PERF_EVENT_STATE_ACTIVE) + return 0; + if (event->cpu != -1 && event->cpu != smp_processor_id()) return 0;
| |