perf fixes for 3.1
Subsystems (2)
Linus,
Please pull the latest perf-fixes-for-linus git tree from:
git://tesla.tglx.de/git/linux-2.6-tip.git perf-fixes-for-linus
top commit sha1 on my devel machine is: 20afc60f892d285f
Thanks,
tglx
------------------>
Andrey Vagin (1):
x86, perf: Check that current->mm is alive before getting user callchain
Eric B Munson (1):
perf_event: Fix broken calc_timer_values()
Stephane Eranian (1):
perf events: Fix slow and broken cgroup context switch code
arch/x86/kernel/cpu/perf_event.c | 3 ++ include/linux/perf_event.h | 24 ++++++++----- kernel/events/core.c | 67 +++++++++++++++++++++++++++++++------- kernel/sched.c | 2 +- 4 files changed, 74 insertions(+), 22 deletions(-)
arch/x86/kernel/cpu/perf_event.c +3 -0
@@ -1900,6 +1900,9 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)perf_callchain_store (entry, regs->ip); +if (!current->mm) +return ; +if (perf_callchain_user32 (regs, entry))return ;
include/linux/perf_event.h +15 -9
@@ -944,8 +944,10 @@ extern void perf_pmu_unregister(struct pmu *pmu);extern int perf_num_counters (void );extern const char *perf_pmu_name (void ); -extern void __perf_event_task_sched_in (struct task_struct *task); -extern void __perf_event_task_sched_out (struct task_struct *task,struct task_struct *next); +extern void __perf_event_task_sched_in (struct task_struct *prev, +struct task_struct *task); +extern void __perf_event_task_sched_out (struct task_struct *prev, +struct task_struct *next);extern int perf_event_init_task (struct task_struct *child);extern void perf_event_exit_task (struct task_struct *child);extern void perf_event_free_task (struct task_struct *task);
@@ -1059,17 +1061,20 @@ perf_sw_event(u32 event_id, u64 nr, struct pt_regs *regs, u64 addr)extern struct jump_label_key perf_sched_events; -static inline void perf_event_task_sched_in (struct task_struct *task) +static inline void perf_event_task_sched_in (struct task_struct *prev, +struct task_struct *task) {if (static_branch (&perf_sched_events)) -__perf_event_task_sched_in (task); +__perf_event_task_sched_in (prev, task); } -static inline void perf_event_task_sched_out (struct task_struct *task,struct task_struct *next) +static inline void perf_event_task_sched_out (struct task_struct *prev, +struct task_struct *next) {perf_sw_event (PERF_COUNT_SW_CONTEXT_SWITCHES ,1 ,NULL ,0 ); -__perf_event_task_sched_out (task, next); +if (static_branch (&perf_sched_events)) +__perf_event_task_sched_out (prev, next); }extern void perf_event_mmap (struct vm_area_struct *vma);
@@ -1139,10 +1144,11 @@ extern void perf_event_disable(struct perf_event *event);extern void perf_event_task_tick (void );#else static inline void -perf_event_task_sched_in (struct task_struct *task) { } +perf_event_task_sched_in (struct task_struct *prev, +struct task_struct *task) { }static inline void -perf_event_task_sched_out (struct task_struct *task, -struct task_struct *next) { } +perf_event_task_sched_out (struct task_struct *prev, +struct task_struct *next) { }static inline int perf_event_init_task (struct task_struct *child) {return 0 ; }static inline void perf_event_exit_task (struct task_struct *child) { }static inline void perf_event_free_task (struct task_struct *task) { }
kernel/events/core.c +55 -12
116 lines not on this page · raw message
kernel/sched.c +1 -1
@@ -3065,7 +3065,7 @@ static void finish_task_switch(struct rq *rq, struct task_struct *prev)#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSWlocal_irq_disable ();#endif /* __ARCH_WANT_INTERRUPTS_ON_CTXSW */ -perf_event_task_sched_in (current); +perf_event_task_sched_in (prev, current);#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSWlocal_irq_enable ();#endif /* __ARCH_WANT_INTERRUPTS_ON_CTXSW */