Messages in this thread Patch in this message | | | From | Frederic Weisbecker <> | Subject | [PATCH 1/4] sched/preempt: Prepare for supporting !CONFIG_GENERIC_ENTRY dynamic preemption | Date | Tue, 21 Sep 2021 01:32:34 +0200 |
| |
There is no need to force dynamic preemption to depend on the generic entry code. The latter is convenient but not mandatory. An architecture that doesn't support it just need to provide a static call on its kernel IRQ exit preemption path.
Prepare the preempt dynamic code to handle that.
Signed-off-by: Frederic Weisbecker <frederic@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Quentin Perret <qperret@google.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: James Morse <james.morse@arm.com> Cc: Will Deacon <will@kernel.org> Cc: Ard Biesheuvel <ardb@kernel.org> --- arch/Kconfig | 1 - include/linux/entry-common.h | 3 ++- kernel/sched/core.c | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig index 8df1c7102643..9af493999d43 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -1255,7 +1255,6 @@ config HAVE_STATIC_CALL_INLINE config HAVE_PREEMPT_DYNAMIC bool depends on HAVE_STATIC_CALL - depends on GENERIC_ENTRY help Select this if the architecture support boot time preempt setting on top of static calls. It is strongly advised to support inline diff --git a/include/linux/entry-common.h b/include/linux/entry-common.h index 2e2b8d6140ed..81166bbc0f22 100644 --- a/include/linux/entry-common.h +++ b/include/linux/entry-common.h @@ -456,7 +456,8 @@ irqentry_state_t noinstr irqentry_enter(struct pt_regs *regs); */ void irqentry_exit_cond_resched(void); #ifdef CONFIG_PREEMPT_DYNAMIC -DECLARE_STATIC_CALL(irqentry_exit_cond_resched, irqentry_exit_cond_resched); +#define __irqentry_exit_cond_resched_func irqentry_exit_cond_resched +DECLARE_STATIC_CALL(irqentry_exit_cond_resched, __irqentry_exit_cond_resched_func); #endif /** diff --git a/kernel/sched/core.c b/kernel/sched/core.c index af2ca7ea7dda..51c81da33f23 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6553,7 +6553,9 @@ EXPORT_STATIC_CALL_TRAMP(preempt_schedule_notrace); #ifdef CONFIG_PREEMPT_DYNAMIC +#ifdef CONFIG_GENERIC_ENTRY #include <linux/entry-common.h> +#endif /* * SC:cond_resched @@ -6618,7 +6620,7 @@ void sched_dynamic_update(int mode) static_call_update(might_resched, __cond_resched); static_call_update(preempt_schedule, __preempt_schedule_func); static_call_update(preempt_schedule_notrace, __preempt_schedule_notrace_func); - static_call_update(irqentry_exit_cond_resched, irqentry_exit_cond_resched); + static_call_update(irqentry_exit_cond_resched, __irqentry_exit_cond_resched_func); switch (mode) { case preempt_dynamic_none: @@ -6644,7 +6646,7 @@ void sched_dynamic_update(int mode) static_call_update(might_resched, (void *)&__static_call_return0); static_call_update(preempt_schedule, __preempt_schedule_func); static_call_update(preempt_schedule_notrace, __preempt_schedule_notrace_func); - static_call_update(irqentry_exit_cond_resched, irqentry_exit_cond_resched); + static_call_update(irqentry_exit_cond_resched, __irqentry_exit_cond_resched_func); pr_info("Dynamic Preempt: full\n"); break; } -- 2.25.1
| |