Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

authored by

Mark Rutland and committed by
Peter Zijlstra
1b2d3451 8e12ab7c

+27 -3
+1
arch/arm64/Kconfig
··· 192 192 select HAVE_PERF_EVENTS 193 193 select HAVE_PERF_REGS 194 194 select HAVE_PERF_USER_STACK_DUMP 195 + select HAVE_PREEMPT_DYNAMIC_KEY 195 196 select HAVE_REGS_AND_STACK_ACCESS_API 196 197 select HAVE_POSIX_CPU_TIMERS_TASK_WORK 197 198 select HAVE_FUNCTION_ARG_ACCESS_API
+17 -2
arch/arm64/include/asm/preempt.h
··· 2 2 #ifndef __ASM_PREEMPT_H 3 3 #define __ASM_PREEMPT_H 4 4 5 + #include <linux/jump_label.h> 5 6 #include <linux/thread_info.h> 6 7 7 8 #define PREEMPT_NEED_RESCHED BIT(32) ··· 81 80 } 82 81 83 82 #ifdef CONFIG_PREEMPTION 83 + 84 84 void preempt_schedule(void); 85 - #define __preempt_schedule() preempt_schedule() 86 85 void preempt_schedule_notrace(void); 87 - #define __preempt_schedule_notrace() preempt_schedule_notrace() 86 + 87 + #ifdef CONFIG_PREEMPT_DYNAMIC 88 + 89 + DECLARE_STATIC_KEY_TRUE(sk_dynamic_irqentry_exit_cond_resched); 90 + void dynamic_preempt_schedule(void); 91 + #define __preempt_schedule() dynamic_preempt_schedule() 92 + void dynamic_preempt_schedule_notrace(void); 93 + #define __preempt_schedule_notrace() dynamic_preempt_schedule_notrace() 94 + 95 + #else /* CONFIG_PREEMPT_DYNAMIC */ 96 + 97 + #define __preempt_schedule() preempt_schedule() 98 + #define __preempt_schedule_notrace() preempt_schedule_notrace() 99 + 100 + #endif /* CONFIG_PREEMPT_DYNAMIC */ 88 101 #endif /* CONFIG_PREEMPTION */ 89 102 90 103 #endif /* __ASM_PREEMPT_H */
+9 -1
arch/arm64/kernel/entry-common.c
··· 220 220 lockdep_hardirqs_on(CALLER_ADDR0); 221 221 } 222 222 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 + 223 231 static void __sched arm64_preempt_schedule_irq(void) 224 232 { 225 - if (!IS_ENABLED(CONFIG_PREEMPTION)) 233 + if (!need_irq_preemption()) 226 234 return; 227 235 228 236 /*