linux-kernel - Re: [PATCH] ARM: ftrace: Trace function entry before updating index

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1342633133.11900.13.camel@gandalf.stny.rr.com>
Date:	Wed, 18 Jul 2012 13:38:53 -0400
From:	Steven Rostedt <rostedt@...dmis.org>
To:	Colin Cross <ccross@...roid.com>
Cc:	linux-arm-kernel@...ts.infradead.org,
	Frederic Weisbecker <fweisbec@...il.com>,
	Ingo Molnar <mingo@...hat.com>,
	Russell King <linux@....linux.org.uk>,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] ARM: ftrace: Trace function entry before updating index

On Mon, 2012-07-16 at 19:03 -0700, Colin Cross wrote:
> Commit 722b3c74695377d11d18a52f3da08114d37f3f37 modified x86 ftrace to
> avoid tracing all functions called from irqs when function graph was
> used with a filter.  Port the same fix to ARM.
> 
> Cc: Steven Rostedt <rostedt@...dmis.org>

Acked-by: Steven Rostedt <rostedt@...dmis.org>

Someone on the ARM side needs to pull this in.

I'll look into fixing this for PPC.

Thanks!

-- Steve

> Signed-off-by: Colin Cross <ccross@...roid.com>
> ---
> 
> It looks like the same issue affects blackfin, microblaze, mips,
> parisc, powerpc, s390, sh, and sparc, but I don't have patches to
> fix those.
> 
>  arch/arm/kernel/ftrace.c |   17 +++++++++--------
>  1 files changed, 9 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
> index df0bf0c..34e5664 100644
> --- a/arch/arm/kernel/ftrace.c
> +++ b/arch/arm/kernel/ftrace.c
> @@ -179,19 +179,20 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr,
>  	old = *parent;
>  	*parent = return_hooker;
>  
> -	err = ftrace_push_return_trace(old, self_addr, &trace.depth,
> -				       frame_pointer);
> -	if (err == -EBUSY) {
> -		*parent = old;
> -		return;
> -	}
> -
>  	trace.func = self_addr;
> +	trace.depth = current->curr_ret_stack + 1;
>  
>  	/* Only trace if the calling function expects to */
>  	if (!ftrace_graph_entry(&trace)) {
> -		current->curr_ret_stack--;
>  		*parent = old;
> +		return;
> +	}
> +
> +	err = ftrace_push_return_trace(old, self_addr, &trace.depth,
> +				       frame_pointer);
> +	if (err == -EBUSY) {
> +		*parent = old;
> +		return;
>  	}
>  }
>  


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