| From f18f2950fb451fa6281402bdaccbb4e973930c83 Mon Sep 17 00:00:00 2001 |
| From: Anders Roxell <anders.roxell@linaro.org> |
| Date: Thu, 14 May 2015 17:52:17 +0200 |
| Subject: [PATCH] arch/arm64: Add lazy preempt support |
| |
| arm64 is missing support for PREEMPT_RT. The main feature which is |
| lacking is support for lazy preemption. The arch-specific entry code, |
| thread information structure definitions, and associated data tables |
| have to be extended to provide this support. Then the Kconfig file has |
| to be extended to indicate the support is available, and also to |
| indicate that support for full RT preemption is now available. |
| |
| Signed-off-by: Anders Roxell <anders.roxell@linaro.org> |
| |
| diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig |
| index 715bf7efff2a..aa953408ecf4 100644 |
| --- a/arch/arm64/Kconfig |
| +++ b/arch/arm64/Kconfig |
| @@ -89,6 +89,7 @@ config ARM64 |
| select HAVE_PERF_USER_STACK_DUMP |
| select HAVE_REGS_AND_STACK_ACCESS_API |
| select HAVE_RCU_TABLE_FREE |
| + select HAVE_PREEMPT_LAZY |
| select HAVE_SYSCALL_TRACEPOINTS |
| select HAVE_KPROBES |
| select HAVE_KRETPROBES if HAVE_KPROBES |
| diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h |
| index abd64bd1f6d9..d55e0fa1e361 100644 |
| --- a/arch/arm64/include/asm/thread_info.h |
| +++ b/arch/arm64/include/asm/thread_info.h |
| @@ -49,6 +49,7 @@ struct thread_info { |
| mm_segment_t addr_limit; /* address limit */ |
| struct task_struct *task; /* main task structure */ |
| int preempt_count; /* 0 => preemptable, <0 => bug */ |
| + int preempt_lazy_count; /* 0 => preemptable, <0 => bug */ |
| int cpu; /* cpu */ |
| }; |
| |
| @@ -109,6 +110,7 @@ static inline struct thread_info *current_thread_info(void) |
| #define TIF_NEED_RESCHED 1 |
| #define TIF_NOTIFY_RESUME 2 /* callback before returning to user */ |
| #define TIF_FOREIGN_FPSTATE 3 /* CPU's FP state is not current's */ |
| +#define TIF_NEED_RESCHED_LAZY 4 |
| #define TIF_NOHZ 7 |
| #define TIF_SYSCALL_TRACE 8 |
| #define TIF_SYSCALL_AUDIT 9 |
| @@ -124,6 +126,7 @@ static inline struct thread_info *current_thread_info(void) |
| #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) |
| #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME) |
| #define _TIF_FOREIGN_FPSTATE (1 << TIF_FOREIGN_FPSTATE) |
| +#define _TIF_NEED_RESCHED_LAZY (1 << TIF_NEED_RESCHED_LAZY) |
| #define _TIF_NOHZ (1 << TIF_NOHZ) |
| #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) |
| #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) |
| diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c |
| index 05070b72fc28..acfeddb1283a 100644 |
| --- a/arch/arm64/kernel/asm-offsets.c |
| +++ b/arch/arm64/kernel/asm-offsets.c |
| @@ -37,6 +37,7 @@ int main(void) |
| BLANK(); |
| DEFINE(TI_FLAGS, offsetof(struct thread_info, flags)); |
| DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count)); |
| + DEFINE(TI_PREEMPT_LAZY, offsetof(struct thread_info, preempt_lazy_count)); |
| DEFINE(TI_ADDR_LIMIT, offsetof(struct thread_info, addr_limit)); |
| DEFINE(TI_TASK, offsetof(struct thread_info, task)); |
| DEFINE(TI_CPU, offsetof(struct thread_info, cpu)); |
| diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S |
| index 96e4a2b64cc1..34de5dd74bb2 100644 |
| --- a/arch/arm64/kernel/entry.S |
| +++ b/arch/arm64/kernel/entry.S |
| @@ -427,11 +427,16 @@ el1_irq: |
| |
| #ifdef CONFIG_PREEMPT |
| ldr w24, [tsk, #TI_PREEMPT] // get preempt count |
| - cbnz w24, 1f // preempt count != 0 |
| + cbnz w24, 2f // preempt count != 0 |
| ldr x0, [tsk, #TI_FLAGS] // get flags |
| - tbz x0, #TIF_NEED_RESCHED, 1f // needs rescheduling? |
| - bl el1_preempt |
| + tbnz x0, #TIF_NEED_RESCHED, 1f // needs rescheduling? |
| + |
| + ldr w24, [tsk, #TI_PREEMPT_LAZY] // get preempt lazy count |
| + cbnz w24, 2f // preempt lazy count != 0 |
| + tbz x0, #TIF_NEED_RESCHED_LAZY, 2f // needs rescheduling? |
| 1: |
| + bl el1_preempt |
| +2: |
| #endif |
| #ifdef CONFIG_TRACE_IRQFLAGS |
| bl trace_hardirqs_on |
| @@ -445,6 +450,7 @@ el1_preempt: |
| 1: bl preempt_schedule_irq // irq en/disable is done inside |
| ldr x0, [tsk, #TI_FLAGS] // get new tasks TI_FLAGS |
| tbnz x0, #TIF_NEED_RESCHED, 1b // needs rescheduling? |
| + tbnz x0, #TIF_NEED_RESCHED_LAZY, 1b // needs rescheduling? |
| ret x24 |
| #endif |
| |
| @@ -701,6 +707,7 @@ ret_fast_syscall_trace: |
| */ |
| work_pending: |
| tbnz x1, #TIF_NEED_RESCHED, work_resched |
| + tbnz x1, #TIF_NEED_RESCHED_LAZY, work_resched |
| /* TIF_SIGPENDING, TIF_NOTIFY_RESUME or TIF_FOREIGN_FPSTATE case */ |
| mov x0, sp // 'regs' |
| enable_irq // enable interrupts for do_notify_resume() |
| -- |
| 2.5.0 |
| |