Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753787AbZIPDRg (ORCPT ); Tue, 15 Sep 2009 23:17:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751487AbZIPDRb (ORCPT ); Tue, 15 Sep 2009 23:17:31 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.123]:36805 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751050AbZIPDRa (ORCPT ); Tue, 15 Sep 2009 23:17:30 -0400 Subject: Re: [PATCH tracing/kprobes 3/6] ftrace: Fix trace_remove_event_call() to lock trace_event_mutex From: Steven Rostedt Reply-To: rostedt@goodmis.org To: Masami Hiramatsu Cc: Frederic Weisbecker , Ingo Molnar , 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 In-Reply-To: <20090914204912.18779.68734.stgit@dhcp-100-2-132.bos.redhat.com> References: <20090914204847.18779.69409.stgit@dhcp-100-2-132.bos.redhat.com> <20090914204912.18779.68734.stgit@dhcp-100-2-132.bos.redhat.com> Content-Type: text/plain Organization: Kihon Technologies Inc. Date: Tue, 15 Sep 2009 23:17:30 -0400 Message-Id: <1253071051.20020.177.camel@gandalf.stny.rr.com> Mime-Version: 1.0 X-Mailer: Evolution 2.26.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1240 Lines: 41 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 > { > mutex_lock(&event_mutex); > + down_write(&trace_event_mutex); > __trace_remove_event_call(call); > + up_write(&trace_event_mutex); > mutex_unlock(&event_mutex); > } > > > -- 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/