perf fixes
Subsystems (3)
Linus,
Please pull the latest perf-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf-fixes-for-linus
Thanks,
Ingo
------------------>
Arnaldo Carvalho de Melo (3):
perf diff: Fix usage array, it must end with a NULL entry perf record: We should fork only if a program was specified to run perf tools: Add missing header files to LIB_H Makefile variable
Heiko Carstens (1):
kprobes: Fix distinct type warning
Tim Blechmann (1):
perf: Rename perf_event_hw_event in design document
Wenji Huang (1):
perf kmem: Fix statistics typo
kernel/kprobes.c | 2 +- tools/perf/Makefile | 8 ++++++++ tools/perf/builtin-buildid-list.c | 2 +- tools/perf/builtin-diff.c | 3 ++- tools/perf/builtin-kmem.c | 4 ++-- tools/perf/builtin-record.c | 14 ++++++++------ tools/perf/builtin-report.c | 3 +-- tools/perf/builtin-trace.c | 4 ++-- tools/perf/design.txt | 8 ++++---- 9 files changed, 29 insertions(+), 19 deletions(-)
kernel/kprobes.c +1 -1
@@ -1035,7 +1035,7 @@ int __kprobes register_kretprobe(struct kretprobe *rp)/* Pre-allocate memory for max kretprobe instances */ if (rp->maxactive <=0 ) {#ifdef CONFIG_PREEMPT - rp->maxactive =max (10 ,2 *num_possible_cpus ()); + rp->maxactive = max_t(unsigned int, 10, 2*num_possible_cpus());#else rp->maxactive =num_possible_cpus ();#endif
tools/perf/Makefile +8 -0
@@ -343,13 +343,18 @@ LIB_H += util/include/linux/string.h LIB_H += util/include/linux/types.h LIB_H += util/include/asm/asm-offsets.h LIB_H += util/include/asm/bitops.h +LIB_H += util/include/asm/bug.h LIB_H += util/include/asm/byteorder.h LIB_H += util/include/asm/swab.h LIB_H += util/include/asm/system.h LIB_H += util/include/asm/uaccess.h LIB_H += perf.h +LIB_H += util/cache.h +LIB_H += util/callchain.h +LIB_H += util/debug.h LIB_H += util/debugfs.h LIB_H += util/event.h +LIB_H += util/exec_cmd.h LIB_H += util/types.h LIB_H += util/levenshtein.h LIB_H += util/parse-options.h
@@ -362,6 +367,7 @@ LIB_H += util/session.h LIB_H += util/strbuf.h LIB_H += util/string.h LIB_H += util/strlist.h +LIB_H += util/svghelper.h LIB_H += util/run-command.h LIB_H += util/sigchain.h LIB_H += util/symbol.h
@@ -370,6 +376,8 @@ LIB_H += util/values.h LIB_H += util/sort.h LIB_H += util/hist.h LIB_H += util/thread.h +LIB_H += util/trace-event.h +LIB_H += util/trace-event-perl.h LIB_H += util/probe-finder.h LIB_H += util/probe-event.h
tools/perf/builtin-buildid-list.c +1 -1
@@ -17,7 +17,7 @@static char const *input_name ="perf.data" ;static int force; -static const char *const buildid_list_usage[] = { +static const char *const buildid_list_usage[] = {"perf buildid-list [<options>]" ,NULL };
tools/perf/builtin-diff.c +2 -1
@@ -189,8 +189,9 @@ out_delete:return ret; } -static const char *const diff_usage[] = { +static const char *const diff_usage[] = {"perf diff [<options>] [old_file] [new_file]" , +NULL , };static const struct option options[] = {
tools/perf/builtin-kmem.c +2 -2
@@ -137,7 +137,7 @@ static void insert_alloc_stat(unsigned long call_site, unsigned long ptr,if (data && data->ptr == ptr) { data->hit++; data->bytes_req += bytes_req; - data->bytes_alloc += bytes_req; + data->bytes_alloc += bytes_alloc; }else { data =malloc (sizeof (*data));if (!data)
@@ -177,7 +177,7 @@ static void insert_caller_stat(unsigned long call_site,if (data && data->call_site == call_site) { data->hit++; data->bytes_req += bytes_req; - data->bytes_alloc += bytes_req; + data->bytes_alloc += bytes_alloc; }else { data =malloc (sizeof (*data));if (!data)
tools/perf/builtin-record.c +8 -6
@@ -402,7 +402,7 @@ static void atexit_header(void)perf_header__write (&session->header, output, true); } -static int __cmd_record (int argc__used ,const char **argv) +static int __cmd_record (int argc,const char **argv) {int i, counter;struct stat st;
@@ -411,6 +411,7 @@ static int __cmd_record(int argc __used, const char **argv)int err;unsigned long waking =0 ;int child_ready_pipe[2 ], go_pipe[2 ]; +const bool forks = target_pid ==-1 && argc >0 ;char buf; page_size =sysconf (_SC_PAGE_SIZE);
@@ -422,7 +423,7 @@ static int __cmd_record(int argc __used, const char **argv)signal (SIGCHLD , sig_handler);signal (SIGINT , sig_handler); -if (pipe (child_ready_pipe) <0 ||pipe (go_pipe) <0 ) { +if (forks && (pipe (child_ready_pipe) <0 ||pipe (go_pipe) <0 )) {perror ("failed to create pipes" );exit (-1 ); }
@@ -483,7 +484,7 @@ static int __cmd_record(int argc __used, const char **argv)atexit (atexit_header); -if (target_pid ==-1 ) { +if (forks) { pid =fork ();if (pid <0 ) {perror ("failed to fork" );
@@ -550,7 +551,7 @@ static int __cmd_record(int argc __used, const char **argv)return err; } -if (!system_wide) +if (!system_wide && profile_cpu ==-1 )event__synthesize_thread (pid, process_synthesized_event, session);else
@@ -569,7 +570,8 @@ static int __cmd_record(int argc __used, const char **argv)/* * Let the child rip */ -close (go_pipe[1 ]); +if (forks) +close (go_pipe[1 ]);for (;;) {int hits = samples;
@@ -667,7 +669,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __used) argc =parse_options (argc, argv, options, record_usage,PARSE_OPT_STOP_AT_NON_OPTION ); -if (!argc && target_pid ==-1 && (!system_wide || profile_cpu ==-1 )) +if (!argc && target_pid ==-1 && !system_wide && profile_cpu ==-1 )usage_with_options (record_usage, options);symbol__init ();
tools/perf/builtin-report.c +1 -2
@@ -294,8 +294,7 @@ setup:return 0 ; } -//static const char * const report_usage[] = { -const char *const report_usage[] = { +static const char *const report_usage[] = {"perf report [<options>] <command>" ,NULL };
tools/perf/builtin-trace.c +2 -2
@@ -512,7 +512,7 @@ static char *get_script_path(const char *script_root, const char *suffix)return path; } -static const char *const annotate_usage[] = { +static const char *const trace_usage[] = {"perf trace [<options>] <command>" ,NULL };
@@ -581,7 +581,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)setup_scripting (); - argc =parse_options (argc, argv, options, annotate_usage, + argc =parse_options (argc, argv, options, trace_usage,PARSE_OPT_STOP_AT_NON_OPTION );if (symbol__init () <0 )
tools/perf/design.txt +4 -4
@@ -21,7 +21,7 @@ There's one file descriptor per virtual counter used. The special file descriptor is opened via the perf_event_open() system call: - int sys_perf_event_open(struct perf_event_hw_event *hw_event_uptr, + int sys_perf_event_open(struct perf_event_attr *hw_event_uptr, pid_t pid, int cpu, int group_fd, unsigned long flags);
@@ -32,9 +32,9 @@ can be used to set the blocking mode, etc. Multiple counters can be kept open at a time, and the counters can be poll()ed. -When creating a new counter fd, 'perf_event_hw_event' is: +When creating a new counter fd, 'perf_event_attr' is: -struct perf_event_hw_event { +struct perf_event_attr { /* * The MSB of the config word signifies if the rest contains cpu * specific (raw) counter configuration data, if unset, the next
@@ -399,7 +399,7 @@ Notification of new events is possible through poll()/select()/epoll() and fcntl() managing signals. Normally a notification is generated for every page filled, however one can -additionally set perf_event_hw_event.wakeup_events to generate one every +additionally set perf_event_attr.wakeup_events to generate one every so many counter overflow events. Future work will include a splice() interface to the ring-buffer.
Linus,
Please pull the latest perf-fixes-for-linus-2 git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf-fixes-for-linus-2
I missed two fixes. (v1 and v2 pull request can be pulled separately as together as well.)
Thanks,
Ingo
------------------>
Arnaldo Carvalho de Melo (3):
perf diff: Fix usage array, it must end with a NULL entry perf record: We should fork only if a program was specified to run perf tools: Add missing header files to LIB_H Makefile variable
Frederic Weisbecker (1):
perf: Pass appropriate frame pointer to dump_trace()
Heiko Carstens (1):
kprobes: Fix distinct type warning
Peter Zijlstra (1):
perf: Fix NULL deref in inheritance code
Tim Blechmann (1):
perf: Rename perf_event_hw_event in design document
Wenji Huang (1):
perf kmem: Fix statistics typo
arch/x86/kernel/cpu/perf_event.c | 2 +- kernel/kprobes.c | 2 +- kernel/perf_event.c | 5 ++--- tools/perf/Makefile | 8 ++++++++ tools/perf/builtin-buildid-list.c | 2 +- tools/perf/builtin-diff.c | 3 ++- tools/perf/builtin-kmem.c | 4 ++-- tools/perf/builtin-record.c | 14 ++++++++------ tools/perf/builtin-report.c | 3 +-- tools/perf/builtin-trace.c | 4 ++-- tools/perf/design.txt | 8 ++++---- 11 files changed, 32 insertions(+), 23 deletions(-)
arch/x86/kernel/cpu/perf_event.c +1 -1
@@ -2347,7 +2347,7 @@ perf_callchain_kernel(struct pt_regs *regs, struct perf_callchain_entry *entry)callchain_store (entry,PERF_CONTEXT_KERNEL );callchain_store (entry, regs->ip); -dump_trace (NULL , regs,NULL ,0 , &backtrace_ops, entry); +dump_trace (NULL , regs,NULL , regs->bp, &backtrace_ops, entry); }/*
kernel/kprobes.c +1 -1
@@ -1035,7 +1035,7 @@ int __kprobes register_kretprobe(struct kretprobe *rp)/* Pre-allocate memory for max kretprobe instances */ if (rp->maxactive <=0 ) {#ifdef CONFIG_PREEMPT - rp->maxactive =max (10 ,2 *num_possible_cpus ()); + rp->maxactive = max_t(unsigned int, 10, 2*num_possible_cpus());#else rp->maxactive =num_possible_cpus ();#endif
kernel/perf_event.c +2 -3
@@ -5148,7 +5148,7 @@ int perf_event_init_task(struct task_struct *child) GFP_KERNEL);if (!child_ctx) { ret = -ENOMEM ; - goto exit; +break ; }__perf_event_init_context (child_ctx, child);
@@ -5164,7 +5164,7 @@ int perf_event_init_task(struct task_struct *child) } } -if (inherited_all) { +if (child_ctx && inherited_all) {/* * Mark the child context as a clone of the parent * context, or of whatever the parent is a clone of.
@@ -5184,7 +5184,6 @@ int perf_event_init_task(struct task_struct *child)get_ctx (child_ctx->parent_ctx); } -exit:mutex_unlock (&parent_ctx->mutex);perf_unpin_context (parent_ctx);
tools/perf/Makefile +8 -0
@@ -343,13 +343,18 @@ LIB_H += util/include/linux/string.h LIB_H += util/include/linux/types.h LIB_H += util/include/asm/asm-offsets.h LIB_H += util/include/asm/bitops.h +LIB_H += util/include/asm/bug.h LIB_H += util/include/asm/byteorder.h LIB_H += util/include/asm/swab.h LIB_H += util/include/asm/system.h LIB_H += util/include/asm/uaccess.h LIB_H += perf.h +LIB_H += util/cache.h +LIB_H += util/callchain.h +LIB_H += util/debug.h LIB_H += util/debugfs.h LIB_H += util/event.h +LIB_H += util/exec_cmd.h LIB_H += util/types.h LIB_H += util/levenshtein.h LIB_H += util/parse-options.h
@@ -362,6 +367,7 @@ LIB_H += util/session.h LIB_H += util/strbuf.h LIB_H += util/string.h LIB_H += util/strlist.h +LIB_H += util/svghelper.h LIB_H += util/run-command.h LIB_H += util/sigchain.h LIB_H += util/symbol.h
@@ -370,6 +376,8 @@ LIB_H += util/values.h LIB_H += util/sort.h LIB_H += util/hist.h LIB_H += util/thread.h +LIB_H += util/trace-event.h +LIB_H += util/trace-event-perl.h LIB_H += util/probe-finder.h LIB_H += util/probe-event.h
tools/perf/builtin-buildid-list.c +1 -1
@@ -17,7 +17,7 @@static char const *input_name ="perf.data" ;static int force; -static const char *const buildid_list_usage[] = { +static const char *const buildid_list_usage[] = {"perf buildid-list [<options>]" ,NULL };
tools/perf/builtin-diff.c +2 -1
@@ -189,8 +189,9 @@ out_delete:return ret; } -static const char *const diff_usage[] = { +static const char *const diff_usage[] = {"perf diff [<options>] [old_file] [new_file]" , +NULL , };static const struct option options[] = {
tools/perf/builtin-kmem.c +2 -2
@@ -137,7 +137,7 @@ static void insert_alloc_stat(unsigned long call_site, unsigned long ptr,if (data && data->ptr == ptr) { data->hit++; data->bytes_req += bytes_req; - data->bytes_alloc += bytes_req; + data->bytes_alloc += bytes_alloc; }else { data =malloc (sizeof (*data));if (!data)
@@ -177,7 +177,7 @@ static void insert_caller_stat(unsigned long call_site,if (data && data->call_site == call_site) { data->hit++; data->bytes_req += bytes_req; - data->bytes_alloc += bytes_req; + data->bytes_alloc += bytes_alloc; }else { data =malloc (sizeof (*data));if (!data)
tools/perf/builtin-record.c +8 -6
@@ -402,7 +402,7 @@ static void atexit_header(void)perf_header__write (&session->header, output, true); } -static int __cmd_record (int argc__used ,const char **argv) +static int __cmd_record (int argc,const char **argv) {int i, counter;struct stat st;
@@ -411,6 +411,7 @@ static int __cmd_record(int argc __used, const char **argv)int err;unsigned long waking =0 ;int child_ready_pipe[2 ], go_pipe[2 ]; +const bool forks = target_pid ==-1 && argc >0 ;char buf; page_size =sysconf (_SC_PAGE_SIZE);
@@ -422,7 +423,7 @@ static int __cmd_record(int argc __used, const char **argv)signal (SIGCHLD , sig_handler);signal (SIGINT , sig_handler); -if (pipe (child_ready_pipe) <0 ||pipe (go_pipe) <0 ) { +if (forks && (pipe (child_ready_pipe) <0 ||pipe (go_pipe) <0 )) {perror ("failed to create pipes" );exit (-1 ); }
@@ -483,7 +484,7 @@ static int __cmd_record(int argc __used, const char **argv)atexit (atexit_header); -if (target_pid ==-1 ) { +if (forks) { pid =fork ();if (pid <0 ) {perror ("failed to fork" );
@@ -550,7 +551,7 @@ static int __cmd_record(int argc __used, const char **argv)return err; } -if (!system_wide) +if (!system_wide && profile_cpu ==-1 )event__synthesize_thread (pid, process_synthesized_event, session);else
@@ -569,7 +570,8 @@ static int __cmd_record(int argc __used, const char **argv)/* * Let the child rip */ -close (go_pipe[1 ]); +if (forks) +close (go_pipe[1 ]);for (;;) {int hits = samples;
@@ -667,7 +669,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __used) argc =parse_options (argc, argv, options, record_usage,PARSE_OPT_STOP_AT_NON_OPTION ); -if (!argc && target_pid ==-1 && (!system_wide || profile_cpu ==-1 )) +if (!argc && target_pid ==-1 && !system_wide && profile_cpu ==-1 )usage_with_options (record_usage, options);symbol__init ();
tools/perf/builtin-report.c +1 -2
@@ -294,8 +294,7 @@ setup:return 0 ; } -//static const char * const report_usage[] = { -const char *const report_usage[] = { +static const char *const report_usage[] = {"perf report [<options>] <command>" ,NULL };
tools/perf/builtin-trace.c +2 -2
@@ -512,7 +512,7 @@ static char *get_script_path(const char *script_root, const char *suffix)return path; } -static const char *const annotate_usage[] = { +static const char *const trace_usage[] = {"perf trace [<options>] <command>" ,NULL };
@@ -581,7 +581,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)setup_scripting (); - argc =parse_options (argc, argv, options, annotate_usage, + argc =parse_options (argc, argv, options, trace_usage,PARSE_OPT_STOP_AT_NON_OPTION );if (symbol__init () <0 )
tools/perf/design.txt +4 -4
@@ -21,7 +21,7 @@ There's one file descriptor per virtual counter used. The special file descriptor is opened via the perf_event_open() system call: - int sys_perf_event_open(struct perf_event_hw_event *hw_event_uptr, + int sys_perf_event_open(struct perf_event_attr *hw_event_uptr, pid_t pid, int cpu, int group_fd, unsigned long flags);
@@ -32,9 +32,9 @@ can be used to set the blocking mode, etc. Multiple counters can be kept open at a time, and the counters can be poll()ed. -When creating a new counter fd, 'perf_event_hw_event' is: +When creating a new counter fd, 'perf_event_attr' is: -struct perf_event_hw_event { +struct perf_event_attr { /* * The MSB of the config word signifies if the rest contains cpu * specific (raw) counter configuration data, if unset, the next
@@ -399,7 +399,7 @@ Notification of new events is possible through poll()/select()/epoll() and fcntl() managing signals. Normally a notification is generated for every page filled, however one can -additionally set perf_event_hw_event.wakeup_events to generate one every +additionally set perf_event_attr.wakeup_events to generate one every so many counter overflow events. Future work will include a splice() interface to the ring-buffer.