Commit 9e58143d authored by Michal Simek's avatar Michal Simek Committed by Linus Torvalds

asm-generic: use raw_local_irq_save/restore instead local_irq_save/restore

The start/stop_critical_timing functions for preemptirqsoff, preemptoff
and irqsoff tracers contain atomic_inc() and atomic_dec() operations.

Atomic operations use local_irq_save/restore macros to ensure atomic
access but they are traced by the same function which is causing recursion
problem.

The reason is when these tracers are turn ON then the
local_irq_save/restore macros are changed in include/linux/irqflags.h to
call trace_hardirqs_on/off which call start/stop_critical_timing.

Microblaze was affected because it uses generic atomic implementation.
Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fa260c00
...@@ -57,11 +57,11 @@ static inline int atomic_add_return(int i, atomic_t *v) ...@@ -57,11 +57,11 @@ static inline int atomic_add_return(int i, atomic_t *v)
unsigned long flags; unsigned long flags;
int temp; int temp;
local_irq_save(flags); raw_local_irq_save(flags); /* Don't trace it in a irqsoff handler */
temp = v->counter; temp = v->counter;
temp += i; temp += i;
v->counter = temp; v->counter = temp;
local_irq_restore(flags); raw_local_irq_restore(flags);
return temp; return temp;
} }
...@@ -78,11 +78,11 @@ static inline int atomic_sub_return(int i, atomic_t *v) ...@@ -78,11 +78,11 @@ static inline int atomic_sub_return(int i, atomic_t *v)
unsigned long flags; unsigned long flags;
int temp; int temp;
local_irq_save(flags); raw_local_irq_save(flags); /* Don't trace it in a irqsoff handler */
temp = v->counter; temp = v->counter;
temp -= i; temp -= i;
v->counter = temp; v->counter = temp;
local_irq_restore(flags); raw_local_irq_restore(flags);
return temp; return temp;
} }
...@@ -135,9 +135,9 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) ...@@ -135,9 +135,9 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
unsigned long flags; unsigned long flags;
mask = ~mask; mask = ~mask;
local_irq_save(flags); raw_local_irq_save(flags); /* Don't trace it in a irqsoff handler */
*addr &= mask; *addr &= mask;
local_irq_restore(flags); raw_local_irq_restore(flags);
} }
#define atomic_xchg(ptr, v) (xchg(&(ptr)->counter, (v))) #define atomic_xchg(ptr, v) (xchg(&(ptr)->counter, (v)))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment