Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4eaca0a8 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

preempt: Use preempt_schedule_context() as the official tracing preemption point 



preempt_schedule_context() is a tracing safe preemption point but it's
only used when CONFIG_CONTEXT_TRACKING=y. Other configs have tracing
recursion issues since commit:

  b30f0e3f ("sched/preempt: Optimize preemption operations on __schedule() callers")

introduced function based preemp_count_*() ops.

Lets make it available on all configs and give it a more appropriate
name for its new position.

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1433432349-1021-3-git-send-email-fweisbec@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent be690035

arch/x86/include/asm/preempt.h

+3 −5
Original line number Diff line number Diff line
@@ -99,11 +99,9 @@ static __always_inline bool should_resched(void) 
  extern asmlinkage void ___preempt_schedule(void);

# define __preempt_schedule() asm ("call ___preempt_schedule")

  extern asmlinkage void preempt_schedule(void);

# ifdef CONFIG_CONTEXT_TRACKING

    extern asmlinkage void ___preempt_schedule_context(void);

#   define __preempt_schedule_context() asm ("call ___preempt_schedule_context")

    extern asmlinkage void preempt_schedule_context(void);

# endif

  extern asmlinkage void ___preempt_schedule_notrace(void);

# define __preempt_schedule_notrace() asm ("call ___preempt_schedule_notrace")

  extern asmlinkage void preempt_schedule_notrace(void);

#endif



#endif /* __ASM_PREEMPT_H */

arch/x86/kernel/i386_ksyms_32.c

+1 −3
Original line number Diff line number Diff line
@@ -40,7 +40,5 @@ EXPORT_SYMBOL(empty_zero_page); 


#ifdef CONFIG_PREEMPT

EXPORT_SYMBOL(___preempt_schedule);

#ifdef CONFIG_CONTEXT_TRACKING

EXPORT_SYMBOL(___preempt_schedule_context);

#endif

EXPORT_SYMBOL(___preempt_schedule_notrace);

#endif

arch/x86/kernel/x8664_ksyms_64.c

+1 −3
Original line number Diff line number Diff line
@@ -75,7 +75,5 @@ EXPORT_SYMBOL(native_load_gs_index); 


#ifdef CONFIG_PREEMPT

EXPORT_SYMBOL(___preempt_schedule);

#ifdef CONFIG_CONTEXT_TRACKING

EXPORT_SYMBOL(___preempt_schedule_context);

#endif

EXPORT_SYMBOL(___preempt_schedule_notrace);

#endif

arch/x86/lib/thunk_32.S

+1 −3
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ 


#ifdef CONFIG_PREEMPT

	THUNK ___preempt_schedule, preempt_schedule

#ifdef CONFIG_CONTEXT_TRACKING

	THUNK ___preempt_schedule_context, preempt_schedule_context

#endif

	THUNK ___preempt_schedule_notrace, preempt_schedule_notrace

#endif

arch/x86/lib/thunk_64.S

+1 −3
Original line number Diff line number Diff line
@@ -49,9 +49,7 @@ 


#ifdef CONFIG_PREEMPT

	THUNK ___preempt_schedule, preempt_schedule

#ifdef CONFIG_CONTEXT_TRACKING

	THUNK ___preempt_schedule_context, preempt_schedule_context

#endif

	THUNK ___preempt_schedule_notrace, preempt_schedule_notrace

#endif



#if defined(CONFIG_TRACE_IRQFLAGS) \