Skip to content

Commit 1b2d345

Browse files
mrutland-armPeter Zijlstra
authored andcommitted
arm64: Support PREEMPT_DYNAMIC
This patch enables support for PREEMPT_DYNAMIC on arm64, allowing the preemption model to be chosen at boot time. Specifically, this patch selects HAVE_PREEMPT_DYNAMIC_KEY, so that each preemption function is an out-of-line call with an early return depending upon a static key. This leaves almost all the codegen up to the compiler, and side-steps a number of pain points with static calls (e.g. interaction with CFI schemes). This should have no worse overhead than using non-inline static calls, as those use out-of-line trampolines with early returns. For example, the dynamic_cond_resched() wrapper looks as follows when enabled. When disabled, the first `B` is replaced with a `NOP`, resulting in an early return. | <dynamic_cond_resched>: | bti c | b <dynamic_cond_resched+0x10> // or `nop` | mov w0, #0x0 | ret | mrs x0, sp_el0 | ldr x0, [x0, #8] | cbnz x0, <dynamic_cond_resched+0x8> | paciasp | stp x29, x30, [sp, #-16]! | mov x29, sp | bl <preempt_schedule_common> | mov w0, #0x1 | ldp x29, x30, [sp], #16 | autiasp | ret ... compared to the regular form of the function: | <__cond_resched>: | bti c | mrs x0, sp_el0 | ldr x1, [x0, #8] | cbz x1, <__cond_resched+0x18> | mov w0, #0x0 | ret | paciasp | stp x29, x30, [sp, #-16]! | mov x29, sp | bl <preempt_schedule_common> | mov w0, #0x1 | ldp x29, x30, [sp], #16 | autiasp | ret Since arm64 does not yet use the generic entry code, we must define our own `sk_dynamic_irqentry_exit_cond_resched`, which will be enabled/disabled by the common code in kernel/sched/core.c. All other preemption functions and associated static keys are defined there. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Ard Biesheuvel <ardb@kernel.org> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Frederic Weisbecker <frederic@kernel.org> Link: https://lore.kernel.org/r/20220214165216.2231574-8-mark.rutland@arm.com
1 parent 8e12ab7 commit 1b2d345

3 files changed

Lines changed: 27 additions & 3 deletions

File tree

arch/arm64/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ config ARM64
192192
select HAVE_PERF_EVENTS
193193
select HAVE_PERF_REGS
194194
select HAVE_PERF_USER_STACK_DUMP
195+
select HAVE_PREEMPT_DYNAMIC_KEY
195196
select HAVE_REGS_AND_STACK_ACCESS_API
196197
select HAVE_POSIX_CPU_TIMERS_TASK_WORK
197198
select HAVE_FUNCTION_ARG_ACCESS_API

arch/arm64/include/asm/preempt.h

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#ifndef __ASM_PREEMPT_H
33
#define __ASM_PREEMPT_H
44

5+
#include <linux/jump_label.h>
56
#include <linux/thread_info.h>
67

78
#define PREEMPT_NEED_RESCHED BIT(32)
@@ -80,10 +81,24 @@ static inline bool should_resched(int preempt_offset)
8081
}
8182

8283
#ifdef CONFIG_PREEMPTION
84+
8385
void preempt_schedule(void);
84-
#define __preempt_schedule() preempt_schedule()
8586
void preempt_schedule_notrace(void);
86-
#define __preempt_schedule_notrace() preempt_schedule_notrace()
87+
88+
#ifdef CONFIG_PREEMPT_DYNAMIC
89+
90+
DECLARE_STATIC_KEY_TRUE(sk_dynamic_irqentry_exit_cond_resched);
91+
void dynamic_preempt_schedule(void);
92+
#define __preempt_schedule() dynamic_preempt_schedule()
93+
void dynamic_preempt_schedule_notrace(void);
94+
#define __preempt_schedule_notrace() dynamic_preempt_schedule_notrace()
95+
96+
#else /* CONFIG_PREEMPT_DYNAMIC */
97+
98+
#define __preempt_schedule() preempt_schedule()
99+
#define __preempt_schedule_notrace() preempt_schedule_notrace()
100+
101+
#endif /* CONFIG_PREEMPT_DYNAMIC */
87102
#endif /* CONFIG_PREEMPTION */
88103

89104
#endif /* __ASM_PREEMPT_H */

arch/arm64/kernel/entry-common.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,17 @@ static void noinstr arm64_exit_el1_dbg(struct pt_regs *regs)
220220
lockdep_hardirqs_on(CALLER_ADDR0);
221221
}
222222

223+
#ifdef CONFIG_PREEMPT_DYNAMIC
224+
DEFINE_STATIC_KEY_TRUE(sk_dynamic_irqentry_exit_cond_resched);
225+
#define need_irq_preemption() \
226+
(static_branch_unlikely(&sk_dynamic_irqentry_exit_cond_resched))
227+
#else
228+
#define need_irq_preemption() (IS_ENABLED(CONFIG_PREEMPTION))
229+
#endif
230+
223231
static void __sched arm64_preempt_schedule_irq(void)
224232
{
225-
if (!IS_ENABLED(CONFIG_PREEMPTION))
233+
if (!need_irq_preemption())
226234
return;
227235

228236
/*

0 commit comments

Comments
 (0)