Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760892AbZCPTCV (ORCPT ); Mon, 16 Mar 2009 15:02:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755811AbZCPTCD (ORCPT ); Mon, 16 Mar 2009 15:02:03 -0400 Received: from mx2.redhat.com ([66.187.237.31]:59496 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753904AbZCPTCB (ORCPT ); Mon, 16 Mar 2009 15:02:01 -0400 Date: Mon, 16 Mar 2009 15:00:47 -0400 From: Jason Baron To: mingo@elte.hu, rostedt@goodmis.org Cc: linux-kernel@vger.kernel.org, acme@ghostprotocols.net, fweisbec@gmail.com, fche@redhat.com, peterz@infradead.org, compudj@krystal.dyndns.org Subject: Re: [Patch 2/2] tracepoints for softirq entry/exit - tracepoints Message-ID: <20090316190047.GB3111@redhat.com> References: <20090312183603.GC3352@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090312183603.GC3352@redhat.com> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2508 Lines: 102 hi, ok, below is a re-spun patch 2/2 which converts to the TRACE_EVENT format. thanks, -Jason Signed-off-by: Jason Baron --- include/trace/irq_event_types.h | 36 ++++++++++++++++++++++++++++++++++++ kernel/softirq.c | 7 ++++++- 2 files changed, 42 insertions(+), 1 deletions(-) diff --git a/include/trace/irq_event_types.h b/include/trace/irq_event_types.h index 214bb92..de1f2a9 100644 --- a/include/trace/irq_event_types.h +++ b/include/trace/irq_event_types.h @@ -40,4 +40,40 @@ TRACE_EVENT(irq_handler_exit, __entry->irq, __entry->ret ? "handled" : "unhandled") ); +TRACE_EVENT(softirq_action_entry, + + TP_PROTO(struct softirq_action *h, struct softirq_action *vec), + + TP_ARGS(h, vec), + + TP_STRUCT__entry( + __array( char, softirq_name, MAX_SOFTIRQ_NAME_LEN ) + ), + + TP_fast_assign( + memcpy(__entry->softirq_name, softirq_to_name[h-vec], + MAX_SOFTIRQ_NAME_LEN); + ), + + TP_printk("softirq entry: %s", __entry->softirq_name) +); + +TRACE_EVENT(softirq_action_exit, + + TP_PROTO(struct softirq_action *h, struct softirq_action *vec), + + TP_ARGS(h, vec), + + TP_STRUCT__entry( + __array( char, softirq_name, MAX_SOFTIRQ_NAME_LEN ) + ), + + TP_fast_assign( + memcpy(__entry->softirq_name, softirq_to_name[h-vec], + MAX_SOFTIRQ_NAME_LEN); + ), + + TP_printk("softirq exit: %s", __entry->softirq_name) +); + #undef TRACE_SYSTEM diff --git a/kernel/softirq.c b/kernel/softirq.c index 8f3ae57..5e96c77 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -24,6 +24,7 @@ #include #include #include +#include #include /* @@ -185,6 +186,9 @@ EXPORT_SYMBOL(local_bh_enable_ip); */ #define MAX_SOFTIRQ_RESTART 10 +DEFINE_TRACE(softirq_action_entry); +DEFINE_TRACE(softirq_action_exit); + asmlinkage void __do_softirq(void) { struct softirq_action *h; @@ -211,8 +215,9 @@ restart: if (pending & 1) { int prev_count = preempt_count(); + trace_softirq_action_entry(h, softirq_vec); h->action(h); - + trace_softirq_action_exit(h, softirq_vec); if (unlikely(prev_count != preempt_count())) { printk(KERN_ERR "huh, entered softirq %td %s %p" "with preempt_count %08x," -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/