Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751205AbZIPEFS (ORCPT ); Wed, 16 Sep 2009 00:05:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750788AbZIPEFP (ORCPT ); Wed, 16 Sep 2009 00:05:15 -0400 Received: from mail-ew0-f206.google.com ([209.85.219.206]:56538 "EHLO mail-ew0-f206.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750727AbZIPEFN (ORCPT ); Wed, 16 Sep 2009 00:05:13 -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=CNKa87zYKSJPBsLy4NOOUWjvadvlkrtw7Uj+e4GiexADB6lNAN9kslLCoDzR7jUnKY IPLRtRU0JSFs09zUcOgAIUmYnIS9jewueuYJzwym9cv8neXZlMLr6MA/cdIuP+evaa3Y 1iYW1AE6199+pXl9E7OI7e2yxNKwLuoU1X/EY= Date: Wed, 16 Sep 2009 06:05:12 +0200 From: Frederic Weisbecker To: Steven Rostedt , Ingo Molnar Cc: Masami Hiramatsu , lkml , systemtap , DLE , Jim Keniston , Ananth N Mavinakayanahalli , Andi Kleen , Christoph Hellwig , "Frank Ch. Eigler" , "H. Peter Anvin" , Jason Baron , "K.Prasad" , Lai Jiangshan , Li Zefan , Peter Zijlstra , Srikar Dronamraju , Tom Zanussi Subject: Re: [PATCH tracing/kprobes 3/6] ftrace: Fix trace_remove_event_call() to lock trace_event_mutex Message-ID: <20090916040511.GB5121@nowhere> References: <20090914204847.18779.69409.stgit@dhcp-100-2-132.bos.redhat.com> <20090914204912.18779.68734.stgit@dhcp-100-2-132.bos.redhat.com> <1253071051.20020.177.camel@gandalf.stny.rr.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1253071051.20020.177.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 Content-Length: 2634 Lines: 66 On Tue, Sep 15, 2009 at 11:17:30PM -0400, Steven Rostedt wrote: > On Mon, 2009-09-14 at 16:49 -0400, Masami Hiramatsu wrote: > > > > > diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c > > index 38e82a5..a3d6bad 100644 > > --- a/kernel/trace/trace_events.c > > +++ b/kernel/trace/trace_events.c > > @@ -1055,6 +1055,9 @@ static void remove_subsystem_dir(const char *name) > > } > > } > > > > +/* > > + * Must be called under locking both of event_mutex and trace_event_mutex. > > + */ > > static void __trace_remove_event_call(struct ftrace_event_call *call) > > { > > ftrace_event_enable_disable(call, 0); > > @@ -1071,7 +1074,9 @@ static void __trace_remove_event_call(struct ftrace_event_call *call) > > void trace_remove_event_call(struct ftrace_event_call *call) > > Is this from a previous patch set, because I can't find this in either > my tree or tip/master. > > -- Steve It's in tip:/tracing/kprobes, which is not merged into tip/master. I have some pending updates in my tracing/kprobes tree: Frederic Weisbecker (1): Merge commit 'tracing/core' into tracing/kprobes Masami Hiramatsu (16): kprobes/x86: Call BUG() when reentering probe into KPROBES_HIT_SS kprobes/x86-64: Allow to reenter probe on post_handler kprobes/x86: Fix to add __kprobes to in-kernel fault handing functions kprobes: Fix to add __kprobes to notify_die kprobes/x86-64: Fix to move common_interrupt to .kprobes.text kprobes: Prohibit to probe native_get_debugreg x86: Allow x86-32 instruction decoder selftest on x86-64 x86: Remove unused config macros from instruction decoder selftest x86: Add MMX support for instruction decoder kprobes/x86-32: Move irq-exit functions to kprobes section x86/ptrace: Fix regs_get_argument_nth() to add correct offset tracing/kprobes: Fix probe offset to be unsigned tracing/kprobes: Cleanup kprobe tracer code. tracing/kprobes: Add event profiling support tracing/kprobes: Add argument name support tracing/kprobes: Show event name in trace output Plus the current set that I'm about to apply, if no problem arises. I should also merge one more time tip:tracing/core into it because it has developed another conflicts against it since then. Ingo, if you are fine with it, I'll send you a pull request soon. Thanks, Frederic. -- 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/