Re: [PATCH] ftrace: fix en(dis)able graph caller when en(dis)abling record via sysctl

[Steven Rostedt]

On Fri,  6 Mar 2015 23:58:06 +0530
Pratyush Anand <panand@xxxxxxxxxx> wrote:
 
>  	/* Force update next time */
>  	saved_ftrace_func = NULL;
>  	/* ftrace_start_up is true if we want ftrace running */
> +	if (ftrace_start_up) {
> +		command = FTRACE_UPDATE_CALLS;
> +		if (ftrace_graph_active)
> +			command |= FTRACE_START_FUNC_RET;
> +		ftrace_run_update_code(command);
> +	}
>  	if (ftrace_start_up)
>  		ftrace_run_update_code(FTRACE_UPDATE_CALLS);

Hmm, I guess you forgot to delete the above if statement (that gets
replaced by the if statement before it).

No need to send another patch, I removed it.

-- Steve

>  }
>  
>  static void ftrace_shutdown_sysctl(void)
>  {
> +	int command;
> +
>  	if (unlikely(ftrace_disabled))
>  		return;
>  
>  	/* ftrace_start_up is true if ftrace is running */
> -	if (ftrace_start_up)
> -		ftrace_run_update_code(FTRACE_DISABLE_CALLS);
> +	if (ftrace_start_up) {
> +		command = FTRACE_DISABLE_CALLS;
> +		if (ftrace_graph_active)
> +			command |= FTRACE_STOP_FUNC_RET;
> +		ftrace_run_update_code(command);
> +	}
>  }
>  
>  static cycle_t		ftrace_update_time;
> @@ -5594,8 +5609,6 @@ static struct ftrace_ops graph_ops = {
>  	ASSIGN_OPS_HASH(graph_ops, &global_ops.local_hash)
>  };
>  
> -static int ftrace_graph_active;
> -
>  int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace)
>  {
>  	return 0;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/