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
------------------>
Ari Kauppi (2):
oprofile: Fix usage of CONFIG_HW_PERF_EVENTS for oprofile_perf_init and friends
ARM: oprofile: Fix backtraces in timer mode
Arnaldo Carvalho de Melo (1):
perf tools: Fix thread_map event synthesizing in top and record
Don Zickus (1):
watchdog, nmi: Lower the severity of error messages
Peter Zijlstra (1):
x86: Fix text_poke_smp_batch() deadlock
arch/arm/oprofile/common.c | 12 ++---------- arch/x86/kernel/alternative.c | 2 +- include/linux/oprofile.h | 13 +++++++++++-- kernel/watchdog.c | 10 ++++++++-- tools/perf/builtin-record.c | 4 ++-- tools/perf/builtin-top.c | 2 +- tools/perf/util/event.c | 18 +++++++++++++----- tools/perf/util/event.h | 6 ++++-- 8 files changed, 42 insertions(+), 25 deletions(-)
arch/arm/oprofile/common.c +2 -10
@@ -10,8 +10,6 @@*/ #include <linux/cpumask.h> -#include <linux/err.h> -#include <linux/errno.h> #include <linux/init.h> #include <linux/mutex.h> #include <linux/oprofile.h>
@@ -46,6 +44,7 @@ char *op_name_from_perf_id(void) return NULL; } } +#endif static int report_trace (struct stackframe *frame,void *d) {
@@ -111,6 +110,7 @@ static void arm_backtrace(struct pt_regs * const regs, unsigned int depth)int __init oprofile_arch_init (struct oprofile_operations *ops) { +/* provide backtrace support also in timer mode: */ ops->backtrace = arm_backtrace;return oprofile_perf_init (ops);
@@ -120,11 +120,3 @@ void __exit oprofile_arch_exit(void) {oprofile_perf_exit (); } -#else -int __init oprofile_arch_init (struct oprofile_operations *ops) -{ -pr_info ("oprofile: hardware counters not available\n" ); -return -ENODEV ; -} -void __exit oprofile_arch_exit(void) {} -#endif /* CONFIG_HW_PERF_EVENTS */
arch/x86/kernel/alternative.c +1 -1
@@ -671,7 +671,7 @@ void __kprobes text_poke_smp_batch(struct text_poke_param *params, int n)atomic_set (&stop_machine_first,1 ); wrote_text =0 ; -stop_machine (stop_machine_text_poke, (void *)&tpp,NULL ); +__stop_machine (stop_machine_text_poke, (void *)&tpp,NULL ); }#if defined(CONFIG_DYNAMIC_FTRACE ) || defined(HAVE_JUMP_LABEL )
include/linux/oprofile.h +11 -2
@@ -16,6 +16,8 @@#include <linux/types.h> #include <linux/spinlock.h> #include <linux/init.h> +#include <linux/errno.h> +#include <linux/printk.h> #include <asm/atomic.h> /* Each escaped entry is prefixed by ESCAPE_CODE
@@ -186,10 +188,17 @@ int oprofile_add_data(struct op_entry *entry, unsigned long val);int oprofile_add_data64 (struct op_entry *entry,u64 val);int oprofile_write_commit (struct op_entry *entry); -#ifdef CONFIG_PERF_EVENTS +#ifdef CONFIG_HW_PERF_EVENTS int __init oprofile_perf_init (struct oprofile_operations *ops);void oprofile_perf_exit (void );char *op_name_from_perf_id (void ); -#endif /* CONFIG_PERF_EVENTS */ +#else +static inline int __init oprofile_perf_init (struct oprofile_operations *ops) +{ +pr_info ("oprofile: hardware counters not available\n" ); +return -ENODEV ; +} +static inline void oprofile_perf_exit (void ) { } +#endif /* CONFIG_HW_PERF_EVENTS */ #endif /* OPROFILE_H */
kernel/watchdog.c +8 -2
@@ -363,8 +363,14 @@ static int watchdog_nmi_enable(int cpu) goto out_save; } -printk (KERN_ERR "NMI watchdog disabled for cpu%i: unable to create perf event: %ld\n" , - cpu,PTR_ERR (event)); + +/* vary the KERN level based on the returned errno */ +if (PTR_ERR (event) == -EOPNOTSUPP ) +printk (KERN_INFO "NMI watchdog disabled (cpu%i): not supported (no LAPIC?)\n" , cpu); +else if (PTR_ERR (event) == -ENOENT ) +printk (KERN_WARNING "NMI watchdog disabled (cpu%i): hardware events not enabled\n" , cpu); +else +printk (KERN_ERR "NMI watchdog disabled (cpu%i): unable to create perf event: %ld\n" , cpu,PTR_ERR (event));return PTR_ERR (event);/* success path */
tools/perf/builtin-record.c +2 -2
@@ -759,8 +759,8 @@ static int __cmd_record(int argc, const char **argv)perf_session__process_machines (session, event__synthesize_guest_os);if (!system_wide) -event__synthesize_thread (target_tid, process_synthesized_event, - session); +event__synthesize_thread_map (threads, process_synthesized_event, + session);else event__synthesize_threads (process_synthesized_event, session);
tools/perf/builtin-top.c +1 -1
@@ -1306,7 +1306,7 @@ static int __cmd_top(void)return -ENOMEM ;if (target_tid !=-1 ) -event__synthesize_thread (target_tid, event__process, session); +event__synthesize_thread_map (threads, event__process, session);else event__synthesize_threads (event__process, session);
tools/perf/util/event.c +13 -5
@@ -263,11 +263,12 @@ static int __event__synthesize_thread(event_t *comm_event, event_t *mmap_event, process, session); } -int event__synthesize_thread (pid_t pid,event__handler_t process, -struct perf_session *session) +int event__synthesize_thread_map (struct thread_map *threads, +event__handler_t process, +struct perf_session *session) {event_t *comm_event, *mmap_event; -int err =-1 ; +int err =-1 , thread; comm_event =malloc (sizeof (comm_event->comm) + session->id_hdr_size);if (comm_event ==NULL )
@@ -277,8 +278,15 @@ int event__synthesize_thread(pid_t pid, event__handler_t process,if (mmap_event ==NULL ) goto out_free_comm; - err =__event__synthesize_thread (comm_event, mmap_event, pid, - process, session); + err =0 ; +for (thread =0 ; thread < threads->nr; ++thread) { +if (__event__synthesize_thread (comm_event, mmap_event, + threads->map[thread], + process, session)) { + err =-1 ; +break ; + } + }free (mmap_event); out_free_comm:free (comm_event);
tools/perf/util/event.h +4 -2
@@ -135,14 +135,16 @@ typedef union event_union {void event__print_totals (void );struct perf_session ; +struct thread_map ;typedef int (*event__handler_synth_t )(event_t *event,struct perf_session *session);typedef int (*event__handler_t )(event_t *event,struct sample_data *sample,struct perf_session *session); -int event__synthesize_thread (pid_t pid,event__handler_t process, -struct perf_session *session); +int event__synthesize_thread_map (struct thread_map *threads, +event__handler_t process, +struct perf_session *session);int event__synthesize_threads (event__handler_t process,struct perf_session *session); int event__synthesize_kernel_mmap(event__handler_t process,