From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753652Ab0ICPuK (ORCPT ); Fri, 3 Sep 2010 11:50:10 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:61630 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753302Ab0ICPuI (ORCPT ); Fri, 3 Sep 2010 11:50:08 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=VF4LOCGYmNybFIaqHSMujKAAU7aRgTejV/yjEcCi/Czj2+R7dkoaA7rfzk/DigpYrM 4joqYny++NSU5wj6CE5qmL/5EoIDMWz8ugpyGjsrvzOes08DUh+6AjfpHXVvR9v0jkEX 28NjJzNP3NSg56f5LwMyOqSzSZUqtQezzlATc= Date: Fri, 3 Sep 2010 17:50:10 +0200 From: Frederic Weisbecker To: Steven Rostedt Cc: Koki Sanagi , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, davem@davemloft.net, kaneshige.kenji@jp.fujitsu.com, izumi.taku@jp.fujitsu.com, kosaki.motohiro@jp.fujitsu.com, nhorman@tuxdriver.com, laijs@cn.fujitsu.com, scott.a.mcmillan@intel.com, eric.dumazet@gmail.com, mathieu.desnoyers@polymtl.ca Subject: Re: [PATCH v4 1/5] irq: add tracepoint to softirq_raise Message-ID: <20100903155008.GC5352@nowhere> References: <4C72422C.5070102@jp.fujitsu.com> <4C724298.4050509@jp.fujitsu.com> <20100903152909.GA5352@nowhere> <1283528592.2356.439.camel@gandalf.stny.rr.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1283528592.2356.439.camel@gandalf.stny.rr.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 On Fri, Sep 03, 2010 at 11:43:12AM -0400, Steven Rostedt wrote: > On Fri, 2010-09-03 at 17:29 +0200, Frederic Weisbecker wrote: > > > > /* > > > * These correspond to the IORESOURCE_IRQ_* defines in > > > @@ -407,7 +408,12 @@ asmlinkage void do_softirq(void); > > > asmlinkage void __do_softirq(void); > > > extern void open_softirq(int nr, void (*action)(struct softirq_action *)); > > > extern void softirq_init(void); > > > -#define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) > > > +static inline void __raise_softirq_irqoff(unsigned int nr) > > > +{ > > > + trace_softirq_raise((struct softirq_action *)&nr, NULL); > > Perhaps doing: > > trace_softirq_raise((struct softirq_action *)((unsigend long)nr), > NULL); > > and ... > > > > + or_softirq_pending(1UL << nr); > > > +} > > > + > > > extern void raise_softirq_irqoff(unsigned int nr); > > > extern void raise_softirq(unsigned int nr); > > > extern void wakeup_softirqd(void); > > > diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h > > > index 0e4cfb6..3ddda02 100644 > > > --- a/include/trace/events/irq.h > > > +++ b/include/trace/events/irq.h > > > @@ -5,7 +5,9 @@ > > > #define _TRACE_IRQ_H > > > > > > #include > > > -#include > > > + > > > +struct irqaction; > > > +struct softirq_action; > > > > > > #define softirq_name(sirq) { sirq##_SOFTIRQ, #sirq } > > > #define show_softirq_name(val) \ > > > @@ -93,7 +95,10 @@ DECLARE_EVENT_CLASS(softirq, > > > ), > > > > > > TP_fast_assign( > > > - __entry->vec = (int)(h - vec); > > > + if (vec) > > > + __entry->vec = (int)(h - vec); > > > + else > > > + __entry->vec = *((int *)h); > > __entry->vec = (int)h; > > would be better. > > > > > ), > > > > > > > > It seems that this will break softirq_entry/exit tracepoints. > > __entry->vec will deref vec->action() for these two, which is not > > what we want. > > > > If you can't have the same tracepoint signature for the three, just > > split the new one in a seperate TRACE_EVENT(). > > Doing the above will at least be a bit safer. Agreed, I'm going to change that in the patch. Thanks.