2012-11-15 23:16:48

by Al Cooper

Subject: [PATCH] MIPS: Fix crash that occurs when function tracing is enabled

A recent patch changed some irq routines from inlines to functions.
These routines are called by the tracer code. Now that they're functions,
if they are compiled for function tracing they will call the tracer
and crash the system due to infinite recursion. The fix disables
tracing in these functions by using "notrace" in the function
definition.

Signed-off-by: Al Cooper <[email protected]>
---
arch/mips/lib/mips-atomic.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/mips/lib/mips-atomic.c b/arch/mips/lib/mips-atomic.c
index e091430..cd160be 100644
--- a/arch/mips/lib/mips-atomic.c
+++ b/arch/mips/lib/mips-atomic.c
@@ -56,7 +56,7 @@ __asm__(
" .set pop \n"
" .endm \n");

-void arch_local_irq_disable(void)
+notrace void arch_local_irq_disable(void)
{
preempt_disable();
__asm__ __volatile__(
@@ -93,7 +93,7 @@ __asm__(
" .set pop \n"
" .endm \n");

-unsigned long arch_local_irq_save(void)
+notrace unsigned long arch_local_irq_save(void)
{
unsigned long flags;
preempt_disable();
@@ -135,7 +135,7 @@ __asm__(
" .set pop \n"
" .endm \n");

-void arch_local_irq_restore(unsigned long flags)
+notrace void arch_local_irq_restore(unsigned long flags)
{
unsigned long __tmp1;

@@ -159,7 +159,7 @@ void arch_local_irq_restore(unsigned long flags)
EXPORT_SYMBOL(arch_local_irq_restore);


-void __arch_local_irq_restore(unsigned long flags)
+notrace void __arch_local_irq_restore(unsigned long flags)
{
unsigned long __tmp1;

--
1.7.6

2012-11-15 23:30:57

by David Daney

Subject: Re: [PATCH] MIPS: Fix crash that occurs when function tracing is enabled

On 11/15/2012 03:16 PM, Al Cooper wrote:
> A recent patch changed some irq routines from inlines to functions.
> These routines are called by the tracer code. Now that they're functions,
> if they are compiled for function tracing they will call the tracer
> and crash the system due to infinite recursion. The fix disables
> tracing in these functions by using "notrace" in the function
> definition.
>
> Signed-off-by: Al Cooper <[email protected]>

Makes sense,

Reviewed-by: David Daney <[email protected]>


> ---
> arch/mips/lib/mips-atomic.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/mips/lib/mips-atomic.c b/arch/mips/lib/mips-atomic.c
> index e091430..cd160be 100644
> --- a/arch/mips/lib/mips-atomic.c
> +++ b/arch/mips/lib/mips-atomic.c
> @@ -56,7 +56,7 @@ __asm__(
> " .set pop \n"
> " .endm \n");
>
> -void arch_local_irq_disable(void)
> +notrace void arch_local_irq_disable(void)
> {
.
.
.