From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 651 invoked by alias); 25 Sep 2009 18:20:03 -0000 Received: (qmail 595 invoked by uid 22791); 25 Sep 2009 18:20:02 -0000 X-SWARE-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 25 Sep 2009 18:19:57 +0000 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8PIJAF8002743 for ; Fri, 25 Sep 2009 14:19:10 -0400 Received: from [127.0.0.1] (vpn-8-193.rdu.redhat.com [10.11.8.193]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8PIIq3w016480; Fri, 25 Sep 2009 14:18:54 -0400 From: Masami Hiramatsu Subject: [PATCH tracing/kprobes 3/3] tracing/ftrace: Fix to check create_event_dir() when adding new events To: Frederic Weisbecker , Steven Rostedt , Ingo Molnar , lkml Cc: systemtap, DLE, Masami Hiramatsu , Steven Rostedt , Jim Keniston , Ananth N Mavinakayanahalli , Andi Kleen , Christoph Hellwig , "Frank Ch. Eigler" , Frederic Weisbecker , "H. Peter Anvin" , Ingo Molnar , Jason Baron , "K.Prasad" , Lai Jiangshan , Li Zefan , Peter Zijlstra , Srikar Dronamraju , Tom Zanussi Date: Fri, 25 Sep 2009 18:20:00 -0000 Message-ID: <20090925182054.10157.55219.stgit@omoto> In-Reply-To: <20090925181952.10157.9975.stgit@omoto> References: <20090925181952.10157.9975.stgit@omoto> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-IsSubscribed: yes Mailing-List: contact systemtap-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: systemtap-owner@sourceware.org X-SW-Source: 2009-q3/txt/msg00843.txt.bz2 Check result of create_event_dir() and add ftrace_event_call to ftrace_events list only if it is succeeded. Thanks Li for pointing it out. Signed-off-by: Masami Hiramatsu Cc: Steven Rostedt Cc: Jim Keniston Cc: Ananth N Mavinakayanahalli Cc: Andi Kleen Cc: Christoph Hellwig Cc: Frank Ch. Eigler Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Ingo Molnar Cc: Jason Baron Cc: K.Prasad Cc: Lai Jiangshan Cc: Li Zefan Cc: Peter Zijlstra Cc: Srikar Dronamraju Cc: Tom Zanussi --- kernel/trace/trace_events.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index a4b7c9a..f03cda3 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -957,12 +957,14 @@ static int __trace_add_event_call(struct ftrace_event_call *call) if (!d_events) return -ENOENT; - list_add(&call->list, &ftrace_events); ret = event_create_dir(call, d_events, &ftrace_event_id_fops, &ftrace_enable_fops, &ftrace_event_filter_fops, &ftrace_event_format_fops); if (ret < 0) - list_del(&call->list); + pr_warning("Could not create directory of trace events/%s\n", + call->name); + else + list_add(&call->list, &ftrace_events); return ret; } @@ -1124,10 +1126,15 @@ static void trace_module_add_events(struct module *mod) return; } call->mod = mod; + ret = event_create_dir(call, d_events, + &file_ops->id, &file_ops->enable, + &file_ops->filter, &file_ops->format); + if (ret < 0) { + pr_warning("Could not create directory of trace " + "point events/%s\n", call->name); + continue; + } list_add(&call->list, &ftrace_events); - event_create_dir(call, d_events, - &file_ops->id, &file_ops->enable, - &file_ops->filter, &file_ops->format); } } @@ -1267,10 +1274,16 @@ static __init int event_trace_init(void) continue; } } + ret = event_create_dir(call, d_events, &ftrace_event_id_fops, + &ftrace_enable_fops, + &ftrace_event_filter_fops, + &ftrace_event_format_fops); + if (ret < 0) { + pr_warning("Could not create directory of trace " + "point events/%s\n", call->name); + continue; + } list_add(&call->list, &ftrace_events); - event_create_dir(call, d_events, &ftrace_event_id_fops, - &ftrace_enable_fops, &ftrace_event_filter_fops, - &ftrace_event_format_fops); } while (true) { -- Masami Hiramatsu Software Engineer Hitachi Computer Products (America), Inc. Software Solutions Division e-mail: mhiramat@redhat.com