v6.18-rc4-rt3
Subsystems (2)
Sebastian Andrzej Siewior
maintainerDear RT folks!
I'm pleased to announce the v6.18-rc4-rt3 patch set.
Changes since v6.18-rc4-rt2:
- Replace the ARM patches based on latest version posted to upstream:
- HIGHPTE is now disabled instead of HAVE_GUP_FAST.
- HAVE_ARCH_JUMP_LABEL is now allowed on UP and only disabled on SMP builds.
- Redid the page fault to avoid a warning and harden the branch predictor on the correct CPU if needed.
- Removed the KVM dependency as there is no more KVM.
Known issues
- Yoann Congal reported a bit spinlock in dm_exception_table_lock().
https://lore.kernel.org/all/[email protected]
The delta patch against v6.18-rc4-rt2 is appended below and can be found here:
https://cdn.kernel.org/pub/linux/kernel/projects/rt/6.18/incr/patch-6.18-rc4-rt2-rt3.patch.xz
You can get this release via the git tree at:
https://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git v6.18-rc4-rt3
The RT patch against v6.18-rc4 can be found here:
https://cdn.kernel.org/pub/linux/kernel/projects/rt/6.18/older/patch-6.18-rc4-rt3.patch.xz
The split quilt queue is available at:
https://cdn.kernel.org/pub/linux/kernel/projects/rt/6.18/older/patches-6.18-rc4-rt3.tar.xz
Sebastian
arch/arm/Kconfig +4 -5
@@ -41,7 +41,7 @@ config ARM select ARCH_SUPPORTS_CFI select ARCH_SUPPORTS_HUGETLBFS if ARM_LPAE select ARCH_SUPPORTS_PER_VMA_LOCK - select ARCH_SUPPORTS_RT if HAVE_POSIX_CPU_TIMERS_TASK_WORK + select ARCH_SUPPORTS_RT select ARCH_USE_BUILTIN_BSWAP select ARCH_USE_CMPXCHG_LOCKREF select ARCH_USE_MEMTEST
@@ -81,7 +81,7 @@ config ARM select HAS_IOPORT select HAVE_ARCH_AUDITSYSCALL if AEABI && !OABI_COMPAT select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6 - select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU && !PREEMPT_RT + select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU && (!PREEMPT_RT || !SMP) select HAVE_ARCH_KFENCE if MMU && !XIP_KERNEL select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU select HAVE_ARCH_KASAN if MMU && !XIP_KERNEL
@@ -106,7 +106,7 @@ config ARM select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE select HAVE_EFFICIENT_UNALIGNED_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && MMU select HAVE_EXIT_THREAD - select HAVE_GUP_FAST if ARM_LPAE && !(PREEMPT_RT && HIGHPTE) + select HAVE_GUP_FAST if ARM_LPAE select HAVE_FUNCTION_ERROR_INJECTION select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_GRAPH_FREGS
@@ -130,7 +130,6 @@ config ARM select HAVE_PERF_EVENTS select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP - select HAVE_POSIX_CPU_TIMERS_TASK_WORK if !KVM select MMU_GATHER_RCU_TABLE_FREE if SMP && ARM_LPAE select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_RSEQ
@@ -1215,7 +1214,7 @@ config HIGHMEM config HIGHPTE bool "Allocate 2nd-level pagetables from highmem" if EXPERT - depends on HIGHMEM + depends on HIGHMEM && !PREEMPT_RT default y help The VM uses one page of physical memory for each page table.
arch/arm/mm/fault.c +10 -12
@@ -183,9 +183,6 @@ __do_user_fault(unsigned long addr, unsigned int fsr, unsigned int sig, {struct task_struct *tsk = current; -if (addr >TASK_SIZE ) -harden_branch_predictor (); -#ifdef CONFIG_DEBUG_USER if (((user_debug &UDBG_SEGV ) && (sig ==SIGSEGV )) || ((user_debug &UDBG_BUS ) && (sig ==SIGBUS ))) {
@@ -218,10 +215,14 @@ void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs)* If we are in kernel mode at this point, we * have no context to handle this fault with. */ -if (user_mode (regs)) +if (user_mode (regs)) { +if (addr >=TASK_SIZE ) +harden_branch_predictor (); +local_irq_enable ();__do_user_fault (addr, fsr,SIGSEGV ,SEGV_MAPERR , regs); -else + }else {__do_kernel_fault (mm, addr, fsr, regs); + } }#ifdef CONFIG_MMU
@@ -274,8 +275,11 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)/* Enable interrupts if they were enabled in the parent context. */ -if (interrupts_enabled (regs)) +if (interrupts_enabled (regs)) { +if (user_mode (regs) && addr >=TASK_SIZE ) +harden_branch_predictor ();local_irq_enable (); + }/* * If we're in an interrupt or have no user
@@ -473,9 +477,6 @@ do_translation_fault(unsigned long addr, unsigned int fsr,if (addr <TASK_SIZE )return do_page_fault (addr, fsr, regs); -if (interrupts_enabled (regs)) -local_irq_enable (); -if (user_mode (regs)) goto bad_area;
@@ -546,9 +547,6 @@ do_translation_fault(unsigned long addr, unsigned int fsr,static int do_sect_fault (unsigned long addr,unsigned int fsr,struct pt_regs *regs) { -if (interrupts_enabled (regs)) -local_irq_enable (); -do_bad_area (addr, fsr, regs);return 0 ; }
localversion-rt +1 -1
@@ -1 +1 @@ --rt2 +-rt3