Re: [PATCH 2/4] ftrace/instances: Clear function triggers when removing instances

From	"Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>
Newsgroups	linux.kernel
Subject	Re: [PATCH 2/4] ftrace/instances: Clear function triggers when removing instances
Date	2017-05-16 19:50 +0200
Message-ID	<tHOLE-9u-17@gated-at.bofh.it> (permalink)
References	<tGL3r-7WF-17@gated-at.bofh.it> <tGL3r-7WF-15@gated-at.bofh.it> <tHApk-842-5@gated-at.bofh.it> <tHLkK-6BF-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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" <naveen.n.rao@linux.vnet.ibm.com> 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

Thread

[PATCH 2/4] ftrace/instances: Clear function triggers when removing instances "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> - 2017-05-13 21:40 +0200
  Re: [PATCH 2/4] ftrace/instances: Clear function triggers when  removing instances Steven Rostedt <rostedt@goodmis.org> - 2017-05-15 17:30 +0200
    Re: [PATCH 2/4] ftrace/instances: Clear function triggers when  removing instances Steven Rostedt <rostedt@goodmis.org> - 2017-05-15 18:20 +0200
      Re: [PATCH 2/4] ftrace/instances: Clear function triggers when  removing instances Masami Hiramatsu <mhiramat@kernel.org> - 2017-05-16 18:20 +0200
  Re: [PATCH 2/4] ftrace/instances: Clear function triggers when  removing instances Steven Rostedt <rostedt@goodmis.org> - 2017-05-16 04:30 +0200
    Re: [PATCH 2/4] ftrace/instances: Clear function triggers when  removing instances "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> - 2017-05-16 16:10 +0200
      Re: [PATCH 2/4] ftrace/instances: Clear function triggers when  removing instances "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> - 2017-05-16 19:50 +0200
        Re: [PATCH 2/4] ftrace/instances: Clear function triggers when  removing instances Steven Rostedt <rostedt@goodmis.org> - 2017-05-16 20:40 +0200

csiph-web