Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756747Ab3G3BgY (ORCPT ); Mon, 29 Jul 2013 21:36:24 -0400 Received: from mail4.hitachi.co.jp ([133.145.228.5]:55179 "EHLO mail4.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753773Ab3G3BgV (ORCPT ); Mon, 29 Jul 2013 21:36:21 -0400 Message-ID: <51F71891.3030508@hitachi.com> Date: Tue, 30 Jul 2013 10:36:17 +0900 From: Masami Hiramatsu Organization: Hitachi, Ltd., Japan User-Agent: Mozilla/5.0 (Windows NT 5.2; rv:13.0) Gecko/20120614 Thunderbird/13.0.1 MIME-Version: 1.0 To: Oleg Nesterov Cc: Steven Rostedt , Alexander Z Lam , Arnaldo Carvalho de Melo , David Sharp , Frederic Weisbecker , Greg Kroah-Hartman , Ingo Molnar , Peter Zijlstra , Srikar Dronamraju , Vaibhav Nagarnaik , "zhangwei(Jovi)" , linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 6/6] tracing: Change remove_event_file_dir() to clear "d_subdirs"->i_private References: <20130726172513.GA3586@redhat.com> <20130726172551.GA3632@redhat.com> <20130728183527.GB16723@redhat.com> In-Reply-To: <20130728183527.GB16723@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3792 Lines: 124 (2013/07/29 3:35), Oleg Nesterov wrote: > Change remove_event_file_dir() to clear ->i_private for every > file we are going to remove. > > We need to check file->dir != NULL because event_create_dir() > can fail. debugfs_remove_recursive(NULL) is fine but the patch > moves it under the same check anyway for readability. > > spin_lock(d_lock) and "d_inode != NULL" check are not needed > afaics, but I do not understand this code enough. > > tracing_open_generic_file() and tracing_release_generic_file() > can go away, ftrace_enable_fops and ftrace_event_filter_fops() > use tracing_open_generic() but only to check tracing_disabled. > > This fixes all races with event_remove() or instance_delete(). > f_op->read/write/whatever can never use the freed file/call, > all event/* files were changed to check and use ->i_private > under event_mutex. > > Note: this doesn't not fix other problems, event_remove() can > destroy the active ftrace_event_call, we need more changes but > those changes are completely orthogonal. Looks good for me. Reviewed-by: Masami Hiramatsu Thanks! > > Signed-off-by: Oleg Nesterov > --- > kernel/trace/trace_events.c | 47 +++++++++++++----------------------------- > 1 files changed, 15 insertions(+), 32 deletions(-) > > diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c > index 2a4f68a..79a2743 100644 > --- a/kernel/trace/trace_events.c > +++ b/kernel/trace/trace_events.c > @@ -428,42 +428,26 @@ static void *event_file_data(struct file *filp) > > static void remove_event_file_dir(struct ftrace_event_file *file) > { > + struct dentry *dir = file->dir; > + struct dentry *child; > + > + if (dir) { > + spin_lock(&dir->d_lock); /* probably unneeded */ > + list_for_each_entry(child, &dir->d_subdirs, d_u.d_child) { > + if (child->d_inode) /* probably unneeded */ > + child->d_inode->i_private = NULL; > + } > + spin_unlock(&dir->d_lock); > + > + debugfs_remove_recursive(dir); > + } > + > list_del(&file->list); > - debugfs_remove_recursive(file->dir); > remove_subsystem(file->system); > kmem_cache_free(file_cachep, file); > } > > /* > - * Open and update trace_array ref count. > - * Must have the current trace_array passed to it. > - */ > -static int tracing_open_generic_file(struct inode *inode, struct file *filp) > -{ > - struct ftrace_event_file *file = inode->i_private; > - struct trace_array *tr = file->tr; > - int ret; > - > - if (trace_array_get(tr) < 0) > - return -ENODEV; > - > - ret = tracing_open_generic(inode, filp); > - if (ret < 0) > - trace_array_put(tr); > - return ret; > -} > - > -static int tracing_release_generic_file(struct inode *inode, struct file *filp) > -{ > - struct ftrace_event_file *file = inode->i_private; > - struct trace_array *tr = file->tr; > - > - trace_array_put(tr); > - > - return 0; > -} > - > -/* > * __ftrace_set_clr_event(NULL, NULL, NULL, set) will set/unset all events. > */ > static int > @@ -1277,10 +1261,9 @@ static const struct file_operations ftrace_set_event_fops = { > }; > > static const struct file_operations ftrace_enable_fops = { > - .open = tracing_open_generic_file, > + .open = tracing_open_generic, > .read = event_enable_read, > .write = event_enable_write, > - .release = tracing_release_generic_file, > .llseek = default_llseek, > }; > > -- Masami HIRAMATSU IT Management Research Dept. Linux Technology Center Hitachi, Ltd., Yokohama Research Laboratory E-mail: masami.hiramatsu.pt@hitachi.com -- 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/