Realtime preempt support for MIPS
Subsystems (2)
PATCH 1/1 Realtime preempt support for MIPS
Hi !
Attached patch incorporates real-time preempt support for MIPS. This patch applies over Ingo's real-time preempt patch:
http://people.redhat.com/mingo/realtime-preempt/realtime-preempt-2.6.11-rc2-V0.7.37-01
This patch has been tested on the Broadcom Sibyte (UP and SMP) and the PMC-Sierra Ocelot3 (UP).
Thanks
Manish Lachwani
Source: MontaVista Software, Inc. | http://source.mvista.com | Manish Lachwani <[email protected]>
Disposition: Submitted to Ingo Molnar (2.6.11-rc2)
Description:
New patch for MIPS (UP and SMP) after incorporating Ingo's changes
Signed-off-by Manish Lachwani <[email protected]>
arch/mips/kernel/time.c +2 -3
@@ -53,8 +53,7 @@*/ extern volatile unsigned long wall_jiffies; -spinlock_t rtc_lock =SPIN_LOCK_UNLOCKED ; - +raw_spinlock_t rtc_lock =RAW_SPIN_LOCK_UNLOCKED ;/* * By default we provide the null RTC ops */
@@ -556,7 +555,7 @@static struct irqaction timer_irqaction = { .handler = timer_interrupt, - .flags =SA_INTERRUPT , + .flags =SA_NODELAY |SA_INTERRUPT , .name ="timer" , };
arch/mips/kernel/signal32.c +4 -0
@@ -765,6 +765,10 @@siginfo_t info;int signr; +#ifdef CONFIG_PREEMPT_RT +local_irq_enable (); +preempt_check_resched (); +#endif /* * We want the common case to go fast, which is why we may in certain * cases get here from kernel mode. Just return without doing anything
arch/mips/kernel/traps.c +1 -1
@@ -244,7 +244,7 @@printk ("\n" ); } -static spinlock_t die_lock =SPIN_LOCK_UNLOCKED ; +static raw_spinlock_t die_lock =RAW_SPIN_LOCK_UNLOCKED ; NORET_TYPE void __die(const char * str, struct pt_regs * regs,const char * file,const char * func,unsigned long line)
arch/mips/kernel/irq.c +4 -1
@@ -125,7 +125,10 @@ irq_desc[i].action =NULL ; irq_desc[i].depth =1 ; irq_desc[i].handler = &no_irq_type; - irq_desc[i].lock =SPIN_LOCK_UNLOCKED ; + irq_desc[i].lock =RAW_SPIN_LOCK_UNLOCKED ; +#ifdef CONFIG_PREEMPT_HARDIRQS + irq_desc[i].thread =NULL ; +#endif }arch_init_irq ();
arch/mips/kernel/process.c +1 -0
@@ -58,6 +58,7 @@while (!need_resched ())if (cpu_wait) (*cpu_wait)(); +local_irq_enable ();schedule (); } }
arch/mips/lib/dec_and_lock.c +4 -4
@@ -28,7 +28,7 @@*/ #ifndef ATOMIC_DEC_AND_LOCK -int _atomic_dec_and_lock (atomic_t *atomic,spinlock_t *lock) +int _atomic_dec_and_raw_spin_lock (atomic_t *atomic,raw_spinlock_t *lock) {int counter;int newcount;
@@ -44,12 +44,12 @@ return 0; } -spin_lock (lock); +_raw_spin_lock (lock);if (atomic_dec_and_test (atomic))return 1 ; -spin_unlock (lock); +_raw_spin_unlock (lock);return 0 ; } -EXPORT_SYMBOL (_atomic_dec_and_lock); +EXPORT_SYMBOL (_atomic_dec_and_raw_spin_lock);#endif /* ATOMIC_DEC_AND_LOCK */
arch/mips/kernel/smp.c +26 -1
@@ -123,7 +123,22 @@cpu_idle (); } -spinlock_t smp_call_lock =SPIN_LOCK_UNLOCKED ; +raw_spinlock_t smp_call_lock =RAW_SPIN_LOCK_UNLOCKED ; + +/* +* this function sends a 'reschedule' IPI to all other CPUs. +* This is used when RT tasks are starving and other CPUs +* might be able to run them. +*/ +void smp_send_reschedule_allbutself (void ) +{ +int cpu =smp_processor_id (); +int i; + +for (i =0 ; i <NR_CPUS ; i++) +if (cpu_online (i) && i != cpu) +core_send_ipi (i,SMP_RESCHEDULE_YOURSELF ); +}struct call_data_struct *call_data;
@@ -302,6 +317,8 @@return 0 ; } +static DEFINE_RAW_SPINLOCK (tlbstate_lock); +static void flush_tlb_all_ipi (void *info) {local_flush_tlb_all ();
@@ -333,6 +350,7 @@void flush_tlb_mm (struct mm_struct *mm) {preempt_disable (); +spin_lock (&tlbstate_lock);if ((atomic_read (&mm->mm_users) !=1 ) || (current->mm != mm)) {smp_call_function (flush_tlb_mm_ipi, (void *)mm,1 ,1 );
@@ -342,6 +360,7 @@if (smp_processor_id () != i)cpu_context (i, mm) =0 ; } +spin_unlock (&tlbstate_lock);local_flush_tlb_mm (mm);preempt_enable ();
@@ -365,6 +384,8 @@struct mm_struct *mm = vma->vm_mm;preempt_disable (); +spin_lock (&tlbstate_lock); +if ((atomic_read (&mm->mm_users) !=1 ) || (current->mm != mm)) {struct flush_tlb_data fd;
@@ -378,6 +399,7 @@if (smp_processor_id () != i)cpu_context (i, mm) =0 ; } +spin_unlock (&tlbstate_lock);local_flush_tlb_range (vma, start, end);preempt_enable (); }
@@ -408,6 +430,8 @@void flush_tlb_page (struct vm_area_struct *vma,unsigned long page) {preempt_disable (); +spin_lock (&tlbstate_lock); +if ((atomic_read (&vma->vm_mm->mm_users) !=1 ) || (current->mm != vma->vm_mm)) {struct flush_tlb_data fd;
@@ -420,6 +444,7 @@if (smp_processor_id () != i)cpu_context (i, vma->vm_mm) =0 ; } +spin_unlock (&tlbstate_lock);local_flush_tlb_page (vma, page);preempt_enable (); }
arch/mips/kernel/Makefile +3 -1
@@ -5,7 +5,7 @@ extra-y := head.o init_task.o vmlinux.lds obj-y += cpu-probe.o branch.o entry.o genex.o irq.o process.o \ - ptrace.o reset.o semaphore.o setup.o signal.o syscall.o \ + ptrace.o reset.o setup.o signal.o syscall.o \ time.o traps.o unaligned.o ifdef CONFIG_MODULES
@@ -14,6 +14,8 @@ obj-$(CONFIG_MIPS64) += module-elf64.o endif +obj-$(CONFIG_ASM_SEMAPHORES) += semaphore.o + obj-$(CONFIG_CPU_R3000) += r2300_fpu.o r2300_switch.o obj-$(CONFIG_CPU_TX39XX) += r2300_fpu.o r2300_switch.o obj-$(CONFIG_CPU_TX49XX) += r4k_fpu.o r4k_switch.o
arch/mips/kernel/signal.c +4 -0
@@ -568,6 +568,10 @@ }#endif +#ifdef CONFIG_PREEMPT_RT +local_irq_enable (); +preempt_check_resched (); +#endif /* * We want the common case to go fast, which is why we may in certain * cases get here from kernel mode. Just return without doing anything
arch/mips/kernel/entry.S +5 -5
@@ -48,6 +48,8 @@ #ifdef CONFIG_PREEMPT ENTRY(resume_kernel) + lw t0, kernel_preemption + beqz t0, restore_all lw t0, TI_PRE_COUNT($28) bnez t0, restore_all need_resched:
@@ -57,12 +59,9 @@ LONG_L t0, PT_STATUS(sp) # Interrupts off? andi t0, 1 beqz t0, restore_all - li t0, PREEMPT_ACTIVE - sw t0, TI_PRE_COUNT($28) - local_irq_enable t0 - jal schedule - sw zero, TI_PRE_COUNT($28) local_irq_disable t0 + jal preempt_schedule_irq + sw zero, TI_PRE_COUNT($28) b need_resched #endif
@@ -92,6 +91,7 @@ andi t0, a2, _TIF_NEED_RESCHED beqz t0, work_notifysig work_resched: + local_irq_enable t0 jal schedule local_irq_disable t0 # make sure need_resched and
arch/mips/kernel/module.c +1 -1
@@ -2,7 +2,7 @@#include <linux/spinlock.h> static LIST_HEAD (dbe_list); -static spinlock_t dbe_lock =SPIN_LOCK_UNLOCKED ; +static raw_spinlock_t dbe_lock =RAW_SPIN_LOCK_UNLOCKED ;/* Given an address, look for it in the module exception tables. */ const struct exception_table_entry *search_module_dbetables (unsigned long addr)
arch/mips/sibyte/sb1250/irq.c +2 -2
@@ -88,7 +88,7 @@/* Store the CPU id (not the logical number) */ int sb1250_irq_owner[SB1250_NR_IRQS ]; -spinlock_t sb1250_imr_lock =SPIN_LOCK_UNLOCKED ; +raw_spinlock_t sb1250_imr_lock =RAW_SPIN_LOCK_UNLOCKED ;void sb1250_mask_irq (int cpu,int irq) {
@@ -267,7 +267,7 @@static struct irqaction sb1250_dummy_action = { .handler = sb1250_dummy_handler, - .flags =0 , + .flags =SA_NODELAY , .mask =CPU_MASK_NONE , .name ="sb1250-private" , .next =NULL ,
arch/mips/kernel/semaphore.c +1 -1
@@ -64,7 +64,7 @@ : "=&r" (old_count), "=&r" (tmp), "=m" (sem->count) : "r" (incr), "m" (sem->count)); }else { -static spinlock_t semaphore_lock =SPIN_LOCK_UNLOCKED ; +static raw_spinlock_t semaphore_lock =RAW_SPIN_LOCK_UNLOCKED ;unsigned long flags;spin_lock_irqsave (&semaphore_lock, flags);
include/asm-mips/spinlock.h +27 -42
131 lines not on this page · raw message
include/asm-mips/system.h +3 -1
@@ -421,6 +421,7 @@extern int stop_a_enabled; +#ifndef CONFIG_PREEMPT_RT /* * Taken from include/asm-ia64/system.h; prevents deadlock on SMP * systems.
@@ -430,7 +431,8 @@spin_lock (&(next)->switch_lock); \spin_unlock (&(rq)->lock); \ } while (0) -#define finish_arch_switch (rq, prev) spin_unlock_irq(&(prev)->switch_lock) +#define _finish_arch_switch (rq, prev) spin_unlock(&(prev)->switch_lock)#define task_running (rq, p) ((rq)->curr == (p) || spin_is_locked(&(p)->switch_lock)) +#endif #endif /* _ASM_SYSTEM_H */
include/asm-mips/semaphore.h +11 -2
@@ -24,11 +24,18 @@#ifdef __KERNEL__ -#include <asm/atomic.h> -#include <asm/system.h> #include <linux/wait.h> #include <linux/rwsem.h> +#ifdef CONFIG_PREEMPT_RT + +#include <linux/rt_lock.h> + +#else + +#include <asm/atomic.h> +#include <asm/system.h> + struct semaphore {/* * Note that any negative value of count is equivalent to 0,
@@ -107,6 +114,8 @@__up (sem); } +#endif /* CONFIG_PREEMPT_RT */ +#endif /* __KERNEL__ */ #endif /* __ASM_SEMAPHORE_H */
include/asm-mips/atomic.h +47 -12
192 lines not on this page · raw message
arch/mips/Kconfig +15 -13
@@ -317,6 +317,7 @@ config MOMENCO_OCELOT_3 bool "Support for Momentum Ocelot-3 board" select DMA_NONCOHERENT + select NO_SPINLOCK select HW_HAS_PCI select IRQ_CPU select IRQ_CPU_RM7K
@@ -612,6 +613,7 @@ bool "Support for Broadcom BCM1xxx SOCs (EXPERIMENTAL)" depends on EXPERIMENTAL select DMA_COHERENT + select NO_SPINLOCK select SWAP_IO_SPACE choice
@@ -845,12 +847,22 @@ bool "FPCIB0 Backplane Support" depends on TOSHIBA_RBTX4927 +source "lib/Kconfig.RT" + config RWSEM_GENERIC_SPINLOCK bool + depends on !PREEMPT_RT default y config RWSEM_XCHGADD_ALGORITHM bool + depends on !PREEMPT_RT + default y + +config ASM_SEMAPHORES + bool + depends on !PREEMPT_RT + default y config GENERIC_CALIBRATE_DELAY bool
@@ -871,6 +883,9 @@ config DMA_COHERENT bool +config NO_SPINLOCK + bool + config DMA_IP27 bool
@@ -1398,15 +1413,6 @@ This is purely to save memory - each supported CPU adds approximately eight kilobytes to the kernel image. -config PREEMPT - bool "Preemptible Kernel" - help - This option reduces the latency of the kernel when reacting to - real-time or interactive events by allowing a low priority process to - be preempted even if it is in kernel mode executing a system call. - This allows applications to run more reliably even when the system is - under load. - config RTC_DS1742 bool "DS1742 BRAM/RTC support" depends on TOSHIBA_JMR3927 || TOSHIBA_RBTX4927
@@ -1421,10 +1427,6 @@ This will result in additional memory usage, so it is not recommended for normal users. -config RWSEM_GENERIC_SPINLOCK - bool - default y - endmenu menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
include/asm-mips/linkage.h +3 -1
@@ -1,6 +1,8 @@#ifndef __ASM_LINKAGE_H#define __ASM_LINKAGE_H -/* Nothing to see here... */ +/* FASTCALL stuff */ +#define FASTCALL (x) x +#define fastcall#endif
arch/mips/kernel/i8259.c +1 -1
@@ -31,7 +31,7 @@* moves to arch independent land */ -spinlock_t i8259A_lock =SPIN_LOCK_UNLOCKED ; +raw_spinlock_t i8259A_lock =RAW_SPIN_LOCK_UNLOCKED ;static void end_8259A_irq (unsigned int irq) {
include/asm-mips/m48t35.h +1 -1
@@ -6,7 +6,7 @@#include <linux/spinlock.h> -extern spinlock_t rtc_lock; +extern raw_spinlock_t rtc_lock;struct m48t35_rtc {volatile u8 pad[0x7ff8 ];/* starts at 0x7ff8 */
arch/mips/math-emu/cp1emu.c +2 -0
@@ -1310,7 +1310,9 @@if (sig)break ; +preempt_enable ();cond_resched (); +preempt_disable (); }while (xcp->cp0_epc > prevepc);/* SIGILL indicates a non-fpu instruction */
arch/mips/sibyte/sb1250/time.c +6 -4
@@ -112,10 +112,12 @@ll_timer_interrupt (irq, regs); } -/* -* every CPU should do profiling and process accouting -*/ -ll_local_timer_interrupt (irq, regs); +if (cpu !=0 ) { +/* +* every CPU should do profiling and process accouting +*/ +ll_local_timer_interrupt (irq, regs); + } }/*
include/asm-mips/tlb.h +10 -1
@@ -5,19 +5,28 @@* MIPS doesn't need any special per-pte or per-vma handling, except * we need to flush cache for area to be unmapped. */ +#ifdef CONFIG_PREEMPT_RT +#define tlb_start_vma (tlb, vma) do { } while (0) +#else #define tlb_start_vma (tlb, vma) \ do { \ if (!tlb->fullmm) \ flush_cache_range(vma, vma->vm_start, vma->vm_end); \ } while (0) +#endif +#define tlb_end_vma (tlb, vma) do { } while (0)#define __tlb_remove_tlb_entry (tlb, ptep, address) do { } while (0)/* * .. because we flush the whole mm when it fills up. */ -#define tlb_flush (tlb) flush_tlb_mm((tlb)->mm) +#define tlb_flush (tlb) flush_tlb_mm(tlb_mm(tlb)) +#ifdef CONFIG_PREEMPT_RT +#include <asm-generic/tlb-simple.h> +#else #include <asm-generic/tlb.h> +#endif #endif /* __ASM_TLB_H */
include/asm-mips/dma.h +1 -1
@@ -150,7 +150,7 @@#define DMA_AUTOINIT 0x10 -extern spinlock_t dma_spin_lock; +extern raw_spinlock_t dma_spin_lock;static __inline__unsigned long claim_dma_lock (void ) {
include/asm-mips/i8259.h +1 -1
@@ -19,7 +19,7 @@#include <asm/io.h> -extern spinlock_t i8259A_lock; +extern raw_spinlock_t raw_i8259A_lock;extern void init_i8259_irqs (void );