perf fixes
Subsystems (2)
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
------------------>
Arjan van de Ven (1):
tracing: Fix timer tracing
Peter Zijlstra (1):
watchdog: Don't throttle the watchdog
include/trace/events/timer.h | 8 ++++++-- kernel/watchdog.c | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-)
include/trace/events/timer.h +6 -2
@@ -81,14 +81,16 @@ TRACE_EVENT(timer_expire_entry,TP_STRUCT__entry (__field (void *,timer ) __field( unsigned long, now ) + __field( void *, function) ),TP_fast_assign ( __entry->timer = timer; __entry->now = jiffies; + __entry->function = timer->function; ), -TP_printk ("timer=%p now=%lu" , __entry->timer, __entry->now) +TP_printk ("timer=%p function=%pf now=%lu" , __entry->timer, __entry->function,__entry->now) );/**
@@ -200,14 +202,16 @@ TRACE_EVENT(hrtimer_expire_entry,TP_STRUCT__entry (__field (void *,hrtimer )__field ( s64, now ) + __field( void *, function) ),TP_fast_assign ( __entry->hrtimer = hrtimer; __entry->now = now->tv64; + __entry->function = hrtimer->function; ), -TP_printk ("hrtimer=%p now=%llu" , __entry->hrtimer, +TP_printk ("hrtimer=%p function=%pf now=%llu" , __entry->hrtimer, __entry->function, (unsigned long long )ktime_to_ns ((ktime_t ) { .tv64 = __entry->now })) );
kernel/watchdog.c +3 -0
@@ -206,6 +206,9 @@ void watchdog_overflow_callback(struct perf_event *event, int nmi,struct perf_sample_data *data, struct pt_regs *regs) { +/* Ensure the watchdog never gets throttled */ + event->hw.interrupts = 0; +if (__get_cpu_var (watchdog_nmi_touch) == true) {__get_cpu_var (watchdog_nmi_touch) = false;return ;