From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752389AbdEPRpU (ORCPT ); Tue, 16 May 2017 13:45:20 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:58947 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750930AbdEPRpT (ORCPT ); Tue, 16 May 2017 13:45:19 -0400 Date: Tue, 16 May 2017 23:14:23 +0530 From: "Naveen N. Rao" To: Steven Rostedt Cc: Shuah Khan , Michael Ellerman , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH 2/4] ftrace/instances: Clear function triggers when removing instances References: <437c3409d58c2ab065233df57d82425a90c5e9e1.1494702964.git.naveen.n.rao@linux.vnet.ibm.com> <20170515222000.5ea978e6@grimm.local.home> <20170516140109.GC19390@naverao1-tp.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170516140109.GC19390@naverao1-tp.localdomain> User-Agent: Mutt/1.6.2 (2016-07-01) X-TM-AS-MML: disable x-cbid: 17051617-0016-0000-0000-0000023C697E X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17051617-0017-0000-0000-000006B9B0A8 Message-Id: <20170516174423.GF19390@naverao1-tp.localdomain> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-05-16_05:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705160139 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2017/05/16 07:31PM, Naveen N. Rao wrote: > On 2017/05/15 10:20PM, Steven Rostedt wrote: > > On Sun, 14 May 2017 01:01:02 +0530 > > "Naveen N. Rao" wrote: > > > > [snip] > > > > diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c > > > index c4536c449021..3f2aed4ad1ed 100644 > > > --- a/kernel/trace/trace.c > > > +++ b/kernel/trace/trace.c > > > @@ -7550,6 +7550,7 @@ static int instance_rmdir(const char *name) > > > } > > > > > > tracing_set_nop(tr); > > > + clear_ftrace_function_probes(tr); > > > event_trace_del_tracer(tr); > > > ftrace_clear_pids(tr); > > > ftrace_destroy_function_files(tr); > > > diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h > > > index 291a1bca5748..98e0845f7235 100644 > > > --- a/kernel/trace/trace.h > > > +++ b/kernel/trace/trace.h > > > @@ -980,6 +980,7 @@ register_ftrace_function_probe(char *glob, struct trace_array *tr, > > > extern int > > > unregister_ftrace_function_probe_func(char *glob, struct trace_array *tr, > > > struct ftrace_probe_ops *ops); > > > +extern void clear_ftrace_function_probes(struct trace_array *tr); > > > > This needs to have a stub function when CONFIG_DYNAMIC_FTRACE is not > > defined. Otherwise we have: > > > > kernel/trace/trace.c:7553:2: error: implicit declaration of function 'clear_ftrace_function_probes' [-Werror=implicit-function-declaration] > > clear_ftrace_function_probes(tr); > > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ The prototype in trace.h is actually guarded by: #if defined(CONFIG_FUNCTION_TRACER) && defined(CONFIG_DYNAMIC_FTRACE) So, I will guard the call to clear_ftrace_function_probes() in trace.c with the same. - Naveen