diff options
author | Oleg Nesterov <oleg@redhat.com> | 2013-06-17 13:02:11 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2013-07-18 21:31:28 -0400 |
commit | cd92bf61d6d70bd3eb33b46d600e3f3eb9c5778a (patch) | |
tree | 7f02ec47e54b3fa2a139a21bbcfed90318de79d3 /kernel/trace/trace_syscalls.c | |
parent | 421c7860c6e1989da3962fafdd6699316c9f8e20 (diff) |
tracing/perf: Move the PERF_MAX_TRACE_SIZE check into perf_trace_buf_prepare()
Every perf_trace_buf_prepare() caller does
WARN_ONCE(size > PERF_MAX_TRACE_SIZE, message) and "message" is
almost the same.
Shift this WARN_ONCE() into perf_trace_buf_prepare(). This changes
the meaning of _ONCE, but I think this is fine.
- 4947014 2932448 10104832 17984294 1126b26 vmlinux
+ 4948422 2932448 10104832 17985702 11270a6 vmlinux
on my build.
Link: http://lkml.kernel.org/r/20130617170211.GA19813@redhat.com
Acked-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace_syscalls.c')
-rw-r--r-- | kernel/trace/trace_syscalls.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index ac0085777fbd..8fd03657bc7d 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c | |||
@@ -575,10 +575,6 @@ static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id) | |||
575 | size = ALIGN(size + sizeof(u32), sizeof(u64)); | 575 | size = ALIGN(size + sizeof(u32), sizeof(u64)); |
576 | size -= sizeof(u32); | 576 | size -= sizeof(u32); |
577 | 577 | ||
578 | if (WARN_ONCE(size > PERF_MAX_TRACE_SIZE, | ||
579 | "perf buffer not large enough")) | ||
580 | return; | ||
581 | |||
582 | rec = (struct syscall_trace_enter *)perf_trace_buf_prepare(size, | 578 | rec = (struct syscall_trace_enter *)perf_trace_buf_prepare(size, |
583 | sys_data->enter_event->event.type, regs, &rctx); | 579 | sys_data->enter_event->event.type, regs, &rctx); |
584 | if (!rec) | 580 | if (!rec) |
@@ -652,14 +648,6 @@ static void perf_syscall_exit(void *ignore, struct pt_regs *regs, long ret) | |||
652 | size = ALIGN(sizeof(*rec) + sizeof(u32), sizeof(u64)); | 648 | size = ALIGN(sizeof(*rec) + sizeof(u32), sizeof(u64)); |
653 | size -= sizeof(u32); | 649 | size -= sizeof(u32); |
654 | 650 | ||
655 | /* | ||
656 | * Impossible, but be paranoid with the future | ||
657 | * How to put this check outside runtime? | ||
658 | */ | ||
659 | if (WARN_ONCE(size > PERF_MAX_TRACE_SIZE, | ||
660 | "exit event has grown above perf buffer size")) | ||
661 | return; | ||
662 | |||
663 | rec = (struct syscall_trace_exit *)perf_trace_buf_prepare(size, | 651 | rec = (struct syscall_trace_exit *)perf_trace_buf_prepare(size, |
664 | sys_data->exit_event->event.type, regs, &rctx); | 652 | sys_data->exit_event->event.type, regs, &rctx); |
665 | if (!rec) | 653 | if (!rec) |