Remaining arch problems in cpu_idle
Subsystems (12)
I have incorporated all feedback I have had since this was last put to the list, including some documentation.
h8300, ia64, and sh64 still have possible outstanding issues, which I've put at the end of the Documentation/ file. It would be nice to get these looked at.
arm26 and ppc64 could really do with a review of the changes I have made. parisc to a lesser extent (ie. small change looks pretty safe).
So again, if you own one of these architectures, please have a quick look.
Andrew is planning to put the patch in the next -mm (it is diffed against -mm2).
Thanks,
Nick
Signature · 1 line
SUSE Labs, Novell Inc.
Make some changes to the NEED_RESCHED and POLLING_NRFLAG to reduce confusion, and make their semantics rigid. Also have preempt explicitly disabled in idle routines. Improves efficiency of resched_task and some cpu_idle routines.
* In resched_task:
- TIF_NEED_RESCHED is only cleared with the task's runqueue lock held, and as we hold it during resched_task, then there is no need for an atomic test and set there. The only other time this should be set is when the task's quantum expires, in the timer interrupt - this is protected against because the rq lock is irq-safe.
- If TIF_NEED_RESCHED is set, then we don't need to do anything. It won't get unset until the task get's schedule()d off.
- If we are running on the same CPU as the task we resched, then set TIF_NEED_RESCHED and no further action is required.
- If we are running on another CPU, and TIF_POLLING_NRFLAG is *not* set after TIF_NEED_RESCHED has been set, then we need to send an IPI.
Using these rules, we are able to remove the test and set operation in resched_task, and make clear the previously vague semantics of POLLING_NRFLAG.
* In idle routines:
- Enter cpu_idle with preempt disabled. When the need_resched() condition becomes true, explicitly call schedule(). This makes things a bit clearer (IMO), but haven't updated all architectures yet.
- Many do a test and clear of TIF_NEED_RESCHED for some reason. According to the resched_task rules, this isn't needed (and actually breaks the assumption that TIF_NEED_RESCHED is only cleared with the runqueue lock held). So remove that. Generally one less locked memory op when switching to the idle thread.
- Many idle routines clear TIF_POLLING_NRFLAG, and only set it in the inner most polling idle loops. The above resched_task semantics allow it to be set until before the last time need_resched() is checked before going into a halt requiring interrupt wakeup.
Many idle routines simply never enter such a halt, and so POLLING_NRFLAG can be always left set, completely eliminating resched IPIs when rescheduling the idle task.
POLLING_NRFLAG width can be increased, to reduce the chance of resched IPIs.
kernel/sched.c +14 -7
@@ -846,21 +846,28 @@ static void deactivate_task(struct task_#ifdef CONFIG_SMP static void resched_task (task_t *p) { -int need_resched, nrpolling; +int cpu;assert_spin_locked (&task_rq (p)->lock); -/* minimise the chance of sending an interrupt to poll_idle() */ - nrpolling =test_tsk_thread_flag (p,TIF_POLLING_NRFLAG ); - need_resched =test_and_set_tsk_thread_flag (p,TIF_NEED_RESCHED ); - nrpolling |=test_tsk_thread_flag (p,TIF_POLLING_NRFLAG ); +if (unlikely (test_tsk_thread_flag (p,TIF_NEED_RESCHED ))) +return ; + +set_tsk_thread_flag (p,TIF_NEED_RESCHED ); -if (!need_resched && !nrpolling && (task_cpu (p) !=smp_processor_id ())) -smp_send_reschedule (task_cpu (p)); + cpu =task_cpu (p); +if (cpu ==smp_processor_id ()) +return ; + +/* NEED_RESCHED must be visible before we test POLLING_NRFLAG */ +smp_mb (); +if (!test_tsk_thread_flag (p,TIF_POLLING_NRFLAG )) +smp_send_reschedule (cpu); }#else static inline void resched_task (task_t *p) { +assert_spin_locked (&task_rq (p)->lock);set_tsk_need_resched (p); }#endif
arch/i386/kernel/process.c +31 -37
103 lines not on this page · raw message
init/main.c +3 -1
@@ -382,14 +382,16 @@ static void noinline rest_init(void)kernel_thread (init,NULL ,CLONE_FS |CLONE_SIGHAND );numa_default_policy ();unlock_kernel (); -preempt_enable_no_resched ();/* * The boot idle thread must execute schedule() * at least one to get things moving: */ +preempt_enable_no_resched ();schedule (); +preempt_disable (); +/* Call into cpu_idle with preempt disabled */ cpu_idle (); }
arch/i386/kernel/apm.c +19 -1
@@ -767,8 +767,26 @@ static int set_system_power_state(u_shorstatic int apm_do_idle (void ) {u32 eax; +u8 ret; +int idled =0 ; +int polling; + + polling =test_thread_flag (TIF_POLLING_NRFLAG ); +if (polling) { +clear_thread_flag (TIF_POLLING_NRFLAG ); +smp_mb__after_clear_bit (); + } +if (!need_resched ()) { + idled =1 ; + ret =apm_bios_call_simple (APM_FUNC_IDLE ,0 ,0 , &eax); + } +if (polling) +set_thread_flag (TIF_POLLING_NRFLAG ); + +if (!idled) +return 0 ; -if (apm_bios_call_simple (APM_FUNC_IDLE ,0 ,0 , &eax)) { +if (ret) {static unsigned long t;/* This always fails on some SMP boards running UP kernels.
drivers/acpi/processor_idle.c +22 -14
@@ -162,6 +162,18 @@ acpi_processor_power_activate (return ; } +static void acpi_safe_halt (void ) +{ +int polling =test_thread_flag (TIF_POLLING_NRFLAG ); +if (polling) { +clear_thread_flag (TIF_POLLING_NRFLAG ); +smp_mb__after_clear_bit (); + } +if (!need_resched ()) +safe_halt (); +if (polling) +set_thread_flag (TIF_POLLING_NRFLAG ); +}static void acpi_processor_idle (void ) {
@@ -171,7 +183,7 @@ static void acpi_processor_idle (void)int sleep_ticks =0 ;u32 t1, t2 =0 ; - pr = processors[raw_smp_processor_id ()]; + pr = processors[smp_processor_id ()];if (!pr)return ;
@@ -191,8 +203,13 @@ static void acpi_processor_idle (void) } cx = pr->power.state; -if (!cx) - goto easy_out; +if (!cx) { +if (pm_idle_save) +pm_idle_save (); +else +acpi_safe_halt (); +return ; + }/* * Check BM Activity
@@ -272,7 +289,8 @@ static void acpi_processor_idle (void)if (pm_idle_save)pm_idle_save ();else -safe_halt (); +acpi_safe_halt (); +/* * TBD: Can't get time duration while in C1, as resumes * go to an ISR rather than here. Need to instrument
@@ -384,16 +402,6 @@ end:*/ if (next_state != pr->power.state)acpi_processor_power_activate (pr, next_state); - -return ; - - easy_out: -/* do C1 instead of busy loop */ -if (pm_idle_save) -pm_idle_save (); -else -safe_halt (); -return ; }
arch/i386/kernel/smpboot.c +2 -0
@@ -476,6 +476,8 @@ set_cpu_sibling_map(int cpu)*/ static void __devinit start_secondary (void *unused) { +preempt_disable (); +/* * Dont put anything before smp_callin(), SMP * booting is too fragile that we want to limit the
arch/x86_64/kernel/process.c +33 -35
102 lines not on this page · raw message
arch/ppc64/kernel/idle.c +89 -96
272 lines not on this page · raw message
arch/ia64/kernel/process.c +19 -14
@@ -196,11 +196,16 @@ update_pal_halt_status(int status)void default_idle (void ) { -while (!need_resched ()) -if (can_do_pal_halt) +if (can_do_pal_halt) { +clear_thread_flag (TIF_POLLING_NRFLAG ); +smp_mb__after_clear_bit (); +while (!need_resched ())safe_halt (); -else +set_thread_flag (TIF_POLLING_NRFLAG ); + }else { +while (!need_resched ())cpu_relax (); + } }#ifdef CONFIG_HOTPLUG_CPU
@@ -262,16 +267,16 @@ void __attribute__((noreturn))cpu_idle (void) {void (*mark_idle)(int ) = ia64_mark_idle; +int cpu =smp_processor_id (); +set_thread_flag (TIF_POLLING_NRFLAG );/* endless idle loop with no priority at all */ while (1 ) { +if (!need_resched ()) { +void (*idle)(void );#ifdef CONFIG_SMP -if (!need_resched ())min_xtp ();#endif -while (!need_resched ()) { -void (*idle)(void ); -if (__get_cpu_var (cpu_idle_state))__get_cpu_var (cpu_idle_state) =0 ;
@@ -283,17 +288,17 @@ cpu_idle (void)if (!idle) idle = default_idle; (*idle)(); - } - -if (mark_idle) - (*mark_idle)(0 ); - +if (mark_idle) + (*mark_idle)(0 );#ifdef CONFIG_SMP -normal_xtp (); +normal_xtp ();#endif + } +preempt_enable_no_resched ();schedule (); +preempt_disable ();check_pgt_cache (); -if (cpu_is_offline (smp_processor_id ())) +if (cpu_is_offline (cpu))play_dead (); } }
arch/ia64/kernel/smpboot.c +2 -0
@@ -394,6 +394,8 @@ smp_callin (void)int __devinit start_secondary (void *unused) { +preempt_disable (); +/* Early console may use I/O ports */ ia64_set_kr (IA64_KR_IO_BASE ,__pa (ia64_iobase));Dprintk ("start_secondary: starting CPU 0x%x\n" ,hard_smp_processor_id ());
arch/ppc64/kernel/smp.c +4 -1
@@ -560,7 +560,10 @@ int __devinit __cpu_up(unsigned int cpu)/* Activate a secondary processor. */ int __devinit start_secondary (void *unused) { -unsigned int cpu =smp_processor_id (); +unsigned int cpu; + +preempt_disable (); + cpu =smp_processor_id ();atomic_inc (&init_mm.mm_count); current->active_mm = &init_mm;
arch/sparc64/kernel/smp.c +4 -12
@@ -147,6 +147,9 @@ void __init smp_callin(void)membar ("#LoadLoad" );cpu_set (cpuid, cpu_online_map); + +/* idle thread is expected to have preempt disabled */ +preempt_disable (); }void cpu_panic (void )
@@ -1170,20 +1173,9 @@ void __init smp_cpus_done(unsigned int m (bogosum/(5000/HZ))%100); } -/* This needn't do anything as we do not sleep the cpu -* inside of the idler task, so an interrupt is not needed -* to get a clean fast response. -* -* XXX Reverify this assumption... -DaveM -* -* Addendum: We do want it to do something for the signal -* delivery case, we detect that by just seeing -* if we are trying to send this to an idler or not. -*/ void smp_send_reschedule (int cpu) { -if (cpu_data (cpu).idle_volume ==0 ) -smp_receive_signal (cpu); +smp_receive_signal (cpu); }/* This is a nop because we capture all other cpus
arch/sparc64/kernel/process.c +18 -6
@@ -74,7 +74,9 @@ void cpu_idle(void)while (!need_resched ())barrier (); +preempt_enable_no_resched ();schedule (); +preempt_disable ();check_pgt_cache (); } }
@@ -83,21 +85,31 @@ void cpu_idle(void)/* * the idle loop on a UltraMultiPenguin... +* +* TIF_POLLING_NRFLAG is set because we do not sleep the cpu +* inside of the idler task, so an interrupt is not needed +* to get a clean fast response. +* +* XXX Reverify this assumption... -DaveM +* +* Addendum: We do want it to do something for the signal +* delivery case, we detect that by just seeing +* if we are trying to send this to an idler or not. */ -#define idle_me_harder () (cpu_data(smp_processor_id()).idle_volume += 1) -#define unidle_me () (cpu_data(smp_processor_id()).idle_volume = 0)void cpu_idle (void ) { +cpuinfo_sparc *cpuinfo = &local_cpu_data ();set_thread_flag (TIF_POLLING_NRFLAG ); +while (1 ) {if (need_resched ()) { -unidle_me (); -clear_thread_flag (TIF_POLLING_NRFLAG ); + cpuinfo->idle_volume =0 ; +preempt_enable_no_resched ();schedule (); -set_thread_flag (TIF_POLLING_NRFLAG ); +preempt_disable ();check_pgt_cache (); } -idle_me_harder (); + cpuinfo->idle_volume++;/* The store ordering is so that IRQ handlers on * other cpus see our increasing idleness for the buddy
arch/alpha/kernel/process.c +3 -7
@@ -43,21 +43,17 @@#include "proto.h" #include "pci_impl.h" -void default_idle (void ) -{ -barrier (); -} -void cpu_idle (void ) { +set_thread_flag (TIF_POLLING_NRFLAG ); +while (1 ) { -void (*idle)(void ) = default_idle;/* FIXME -- EV6 and LCA45 know how to power down the CPU. */ while (!need_resched ()) -idle (); +cpu_relax ();schedule (); } }
arch/alpha/kernel/smp.c +3 -1
@@ -128,7 +128,9 @@ wait_boot_cpu_to_stop(int cpuid)void __init smp_callin (void ) { -int cpuid =hard_smp_processor_id (); +int cpuid; + + cpuid =hard_smp_processor_id ();if (cpu_test_and_set (cpuid, cpu_online_map)) {printk ("??, cpu 0x%x already present??\n" , cpuid);
arch/s390/kernel/smp.c +2 -0
@@ -528,6 +528,8 @@ extern void pfault_fini(void);int __devinit start_secondary (void *cpuvoid) { +preempt_disable (); +/* Setup the cpu */ cpu_init ();/* init per CPU timer */
arch/sparc/kernel/process.c +17 -18
@@ -67,13 +67,6 @@ extern void fpsave(unsigned long *, unsistruct task_struct *last_task_used_math =NULL ;struct thread_info *current_set[NR_CPUS ]; -/* -* default_idle is new in 2.5. XXX Review, currently stolen from sparc64. -*/ -void default_idle (void ) -{ -} -#ifndef CONFIG_SMP #define SUN4C_FAULT_HIGH 100
@@ -92,12 +85,11 @@ void cpu_idle(void)static unsigned long fps;unsigned long now;unsigned long faults; -unsigned long flags;extern unsigned long sun4c_kernel_faults;extern void sun4c_grow_kernel_ring (void ); -local_irq_save (flags); +local_irq_disable (); now = jiffies; count -= (now - last_jiffies); last_jiffies = now;
@@ -113,14 +105,19 @@ void cpu_idle(void)sun4c_grow_kernel_ring (); } } -local_irq_restore (flags); +local_irq_enable (); } -while ((!need_resched ()) && pm_idle) { - (*pm_idle)(); +if (pm_idle) { +while (!need_resched ()) + (*pm_idle)(); + }else { +while (!need_resched ()) +cpu_relax (); } - +preempt_enable_no_resched ();schedule (); +preempt_disable ();check_pgt_cache (); } }
@@ -130,13 +127,15 @@ void cpu_idle(void)/* This is being executed in task 0 'user space'. */ void cpu_idle (void ) { +set_thread_flag (TIF_POLLING_NRFLAG );/* endless idle loop with no priority at all */ while (1 ) { -if (need_resched ()) { -schedule (); -check_pgt_cache (); - } -barrier ();/* or else gcc optimizes... */ +while (!need_resched ()) +cpu_relax (); +preempt_enable_no_resched (); +schedule (); +preempt_disable (); +check_pgt_cache (); } }
arch/ppc/kernel/idle.c +12 -7
@@ -50,8 +50,6 @@ void default_idle(void) }#endif } -if (need_resched ()) -schedule (); }/*
@@ -59,11 +57,18 @@ void default_idle(void)*/ void cpu_idle (void ) { -for (;;) -if (ppc_md.idle !=NULL ) - ppc_md.idle (); -else -default_idle (); +for (;;) { +while (need_resched ()) { +if (ppc_md.idle !=NULL ) + ppc_md.idle (); +else +default_idle (); + } + +preempt_enable_no_resched (); +schedule (); +preempt_disable (); + } }#if defined(CONFIG_SYSCTL ) && defined(CONFIG_6xx)
arch/m32r/kernel/process.c +2 -0
@@ -104,7 +104,9 @@ void cpu_idle (void)idle (); } +preempt_enable_no_resched ();schedule (); +preempt_disable (); } }
arch/frv/kernel/process.c +6 -2
@@ -77,16 +77,20 @@ void (*idle)(void) = core_sleep_idle;*/ void cpu_idle (void ) { +int cpu =smp_processor_id (); +/* endless idle loop with no priority at all */ while (1 ) {while (!need_resched ()) { - irq_stat[smp_processor_id ()].idle_timestamp = jiffies; + irq_stat[cpu].idle_timestamp = jiffies;if (!frv_dma_inprogress && idle)idle (); } - + +preempt_enable_no_resched ();schedule (); +preempt_disable (); } }
arch/cris/kernel/process.c +2 -0
@@ -217,7 +217,9 @@ void cpu_idle (void) idle = default_idle;idle (); } +preempt_enable_no_resched ();schedule (); +preempt_disable (); } }
arch/mips/kernel/smp.c +5 -1
@@ -83,7 +83,11 @@ extern ATTRIB_NORET void cpu_idle(void);*/ asmlinkage void start_secondary(void) { -unsigned int cpu =smp_processor_id (); +unsigned int cpu; + +preempt_disable (); + + cpu =smp_processor_id ();cpu_probe ();cpu_report ();
arch/parisc/kernel/process.c +4 -0
@@ -88,11 +88,15 @@ void default_idle(void)*/ void cpu_idle (void ) { +set_thread_flag (TIF_POLLING_NRFLAG ); +/* endless idle loop with no priority at all */ while (1 ) {while (!need_resched ())barrier (); +preempt_enable_no_resched ();schedule (); +preempt_disable ();check_pgt_cache (); } }
arch/ppc/kernel/smp.c +2 -0
@@ -326,6 +326,8 @@ int __devinit start_secondary(void *unus {int cpu; +preempt_disable (); +atomic_inc (&init_mm.mm_count); current->active_mm = &init_mm;
arch/sh/kernel/process.c +5 -9
@@ -51,28 +51,24 @@ void enable_hlt(void)EXPORT_SYMBOL (enable_hlt); -void default_idle (void ) +void cpu_idle (void ) {/* endless idle loop with no priority at all */ while (1 ) {if (hlt_counter) { -while (1 ) -if (need_resched ()) -break ; +while (!need_resched ()) +cpu_relax (); }else {while (!need_resched ())cpu_sleep (); } +preempt_disable_no_resched ();schedule (); +preempt_enable (); } } -void cpu_idle (void ) -{ -default_idle (); -} -void machine_restart (char * __unused) {/* SR.BL=1 and invoke address error to let CPU reset (manual reset) */
arch/m68k/kernel/process.c +2 -0
@@ -102,7 +102,9 @@ void cpu_idle(void)while (1 ) {while (!need_resched ())idle (); +preempt_enable_no_resched ();schedule (); +preempt_disable (); } }
arch/mips/kernel/process.c +2 -0
@@ -58,7 +58,9 @@ ATTRIB_NORET void cpu_idle(void)while (!need_resched ())if (cpu_wait) (*cpu_wait)(); +preempt_enable_no_resched ();schedule (); + preempt_disable() } }
arch/sh/kernel/smp.c +5 -1
@@ -109,7 +109,11 @@ int __cpu_up(unsigned int cpu)int start_secondary (void *unused) { -unsigned int cpu =smp_processor_id (); +unsigned int cpu; + +preempt_disable (); + + cpu =smp_processor_id ();atomic_inc (&init_mm.mm_count); current->active_mm = &init_mm;
arch/parisc/kernel/smp.c +2 -0
@@ -462,6 +462,8 @@ void __init smp_callin(void)void *istack;#endif +preempt_disable (); +smp_cpu_init (slave_id);#if 0 /* NOT WORKING YET - see entry.S */
arch/m32r/kernel/smpboot.c +1 -0
@@ -424,6 +424,7 @@ void __init smp_cpus_done(unsigned int m*==========================================================================*/ int __init start_secondary (void *unused) { +preempt_disable ();cpu_init ();smp_callin ();while (!cpu_isset (smp_processor_id (), smp_commenced_mask))
arch/s390/kernel/process.c +14 -9
@@ -99,15 +99,15 @@ void default_idle(void) {int cpu, rc; +/* CPU is going idle. */ + cpu =smp_processor_id (); +local_irq_disable (); -if (need_resched ()) { +if (need_resched ()) {local_irq_enable (); -schedule (); -return ; - } +return ; + } -/* CPU is going idle. */ - cpu =smp_processor_id (); rc =notifier_call_chain (&idle_chain,CPU_IDLE , (void *)(long ) cpu);if (rc !=NOTIFY_OK && rc !=NOTIFY_DONE )BUG ();
@@ -120,7 +120,7 @@ void default_idle(void)__ctl_set_bit (8 ,15 );#ifdef CONFIG_HOTPLUG_CPU -if (cpu_is_offline (smp_processor_id ())) +if (cpu_is_offline (cpu))cpu_die ();#endif
@@ -139,8 +139,13 @@ void default_idle(void)void cpu_idle (void ) { -for (;;) -default_idle (); +for (;;) { +while (!need_resched ()) +default_idle (); +preempt_enable_no_resched (); +schedule (); +preempt_disable (); + } }void show_regs (struct pt_regs *regs)
arch/sh64/kernel/process.c +5 -11
@@ -307,23 +307,19 @@ __setup("hlt", hlt_setup);static inline void hlt (void ) { -if (hlt_counter) -return ; - __asm__ __volatile__ ("sleep" : : :"memory" ); }/* * The idle loop on a uniprocessor SH.. */ -void default_idle (void ) +void cpu_idle (void ) {/* endless idle loop with no priority at all */ while (1 ) {if (hlt_counter) { -while (1 ) -if (need_resched ()) -break ; +while (!need_resched ()) +cpu_relax (); }else {local_irq_disable ();while (!need_resched ()) {
@@ -334,13 +330,11 @@ void default_idle(void) }local_irq_enable (); } +preempt_enable_no_resched ();schedule (); +preempt_disable (); } -} -void cpu_idle (void ) -{ -default_idle (); }void machine_restart (char * __unused)
arch/arm26/kernel/process.c +5 -7
@@ -74,15 +74,13 @@ __setup("hlt", hlt_setup);void cpu_idle (void ) {/* endless idle loop with no priority at all */ -preempt_disable ();while (1 ) { -while (!need_resched ()) { -local_irq_disable (); -if (!need_resched () && !hlt_counter) -local_irq_enable (); - } +while (!need_resched ()) +cpu_relax (); +preempt_enable_no_resched (); +schedule (); +preempt_disable (); } -schedule (); }static char reboot_mode ='h' ;
arch/arm/kernel/process.c +10 -6
@@ -84,10 +84,14 @@ EXPORT_SYMBOL(pm_power_off);*/ void default_idle (void ) { -local_irq_disable (); -if (!need_resched () && !hlt_counter) -arch_idle (); -local_irq_enable (); +if (hlt_counter) +cpu_relax (); +else { +local_irq_disable (); +if (!need_resched ()) +arch_idle (); +local_irq_enable (); + } }/*
@@ -104,13 +108,13 @@ void cpu_idle(void)void (*idle)(void ) = pm_idle;if (!idle) idle = default_idle; -preempt_disable ();leds_event (led_idle_start);while (!need_resched ())idle ();leds_event (led_idle_end); -preempt_enable (); +preempt_enable_no_resched ();schedule (); +preempt_disable (); } }
arch/h8300/kernel/process.c +15 -13
@@ -53,22 +53,18 @@ asmlinkage void ret_from_fork(void);#if !defined(CONFIG_H8300H_SIM ) && !defined(CONFIG_H8S_SIM )void default_idle (void ) { -while (1 ) { -if (!need_resched ()) { -local_irq_enable (); - __asm__("sleep" ); -local_irq_disable (); - } -schedule (); - } +local_irq_disable (); +if (!need_resched ()) { +local_irq_enable (); +/* XXX: race here! What if need_resched() gets set now? */ + __asm__("sleep" ); + }else +local_irq_enable (); }#else void default_idle (void ) { -while (1 ) { -if (need_resched ()) -schedule (); - } +cpu_relax (); }#endif void (*idle)(void ) = default_idle;
@@ -81,7 +77,13 @@ void (*idle)(void) = default_idle;*/ void cpu_idle (void ) { -idle (); +while (1 ) { +while (!need_resched ()) +idle (); +preempt_enable_no_resched (); +schedule (); +preempt_disable (); + } }void machine_restart (char * __unused)
arch/xtensa/kernel/process.c +2 -1
@@ -96,8 +96,9 @@ void cpu_idle(void)while (1 ) {while (!need_resched ())platform_idle (); -preempt_enable (); +preempt_enable_no_resched ();schedule (); +preempt_disable (); } }
arch/v850/kernel/process.c +10 -6
@@ -36,11 +36,8 @@ extern void ret_from_fork (void);/* The idle loop. */ void default_idle (void ) { -while (1 ) { -while (!need_resched ()) - asm ("halt; nop; nop; nop; nop; nop" :::"cc" ); -schedule (); - } +while (!need_resched ()) + asm ("halt; nop; nop; nop; nop; nop" :::"cc" ); }void (*idle)(void ) = default_idle;
@@ -54,7 +51,14 @@ void (*idle)(void) = default_idle;void cpu_idle (void ) {/* endless idle loop with no priority at all */ - (*idle) (); +while (1 ) { +while (!need_resched ()) + (*idle) (); + +preempt_enable_no_resched (); +schedule (); +preempt_disable (); + } }/*
Documentation/sched-arch.txt new file +89 -0
89 lines not on this page · raw message
Quoted 4 lines · Nick Piggin
h8300, ia64, and sh64 still have possible outstanding issues, which I've put at the end of the
Documentation/file. It would be nice to get these looked at.
Looking at this, sh64 is pretty much in the same category as h8300. sh is as well, but we seem to be missing the local_irq_disable/enable around the need_resched check there completely, which is even more bogus.
Quoted 13 lines
+4. The only time interrupts need to be disabled when checking
Documentation/sched-arch.txt new file +12
-0+ need_resched is if we are about to sleep the processor until + the next interrupt (this doesn't provide any protection of + need_resched, it prevents losing an interrupt). + + 4a. Common problem with this type of sleep appears to be: + local_irq_disable(); + if (!need_resched()) { + local_irq_enable(); + *** resched interrupt arrives here *** + __asm__("sleep until next interrupt"); + } +
Documentation/sched-arch.txt line 82
Quoted 10 lines
Documentation/sched-arch.txt new file +10
-0+Possible arch/ problems +======================= + +Possible arch problems I found (and either tried to fix or didn't): + +h8300 - Is such sleeping racy vs interrupts? (See #4a). + The H8/300 manual I found indicates yes, however disabling IRQs + over the sleep mean only NMIs can wake it up, so can't fix easily + without doing spin waiting. +
We have the same problem for sh/sh64 (which isn't surprising, considering they all share ancestry).
There are several different states that can be entered, with different method for exiting, although at least the sleep and deep sleep states both require an interrupt, NMI, or a reset request.
I can update sh and sh64 to follow the h8300 change, but that still doesn't address the race. What sort of spin waiting do you have in mind?
Quoted 11 lines · Paul Mundt
Quoted 4 lines · Nick Piggin
h8300, ia64, and sh64 still have possible outstanding issues, which I've put at the end of the
Documentation/file. It would be nice to get these looked at.Looking at this, sh64 is pretty much in the same category as h8300. sh is as well, but we seem to be missing the local_irq_disable/enable around the
need_reschedcheck there completely, which is even more bogus.
Well you only need to disable IRQs if you are about to go to sleep waiting for the next pending IRQ. So your hlt_counter case looks OK.
In the case that you do sleep until the next IRQ, sh64 does indeed disable irqs over the need_resched check, however it re-enables them before sleeping. So disabling at all is basically useless because any pending IRQs will probably all get serviced right as soon as IRQs are re-eanbled.
Quoted 10 lines
Documentation/sched-arch.txt line 82
Quoted 6 lines
Documentation/sched-arch.txt new file +6
-0+ +h8300 - Is such sleeping racy vs interrupts? (See #4a). + The H8/300 manual I found indicates yes, however disabling IRQs + over the sleep mean only NMIs can wake it up, so can't fix easily + without doing spin waiting. +We have the same problem for sh/sh64 (which isn't surprising, considering they all share ancestry).
Quoted 6 lines
There are several different states that can be entered, with different method for exiting, although at least the sleep and deep sleep states both require an interrupt, NMI, or a reset request.
I can update sh and sh64 to follow the h8300 change, but that still doesn't address the race. What sort of spin waiting do you have in mind?
Well as you probably know, but just to be clear: architectures that handle this without a race have an instruction that basically turns on interrupts and go to sleep at the same time. I'm not aware of a simple way to do it without that facility.
Unless you can easily raise an NMI from another processor as an IPI.
As far as spin waiting goes, something like:
while (!need_resched()) cpu_relax();
Is generally used.
Now this might introduce some power and heat penalty. What's more, your race isn't a fatal one: in the worst case, it should just stall until the next timer interrupt (aside, that might be fatal with a tickless kernel).
So you may want a bootup or runtime switchable parameter there to choose between good power saving and optimal performance & scheduling latency.
Signature · 3 lines
SUSE Labs, Novell Inc. Send instant messages to your online friends http://au.messenger.yahoo.com
Quoted 10 lines · Nick Piggin
Well you only need to disable IRQs if you are about to go to sleep waiting for the next pending IRQ. So your
hlt_countercase looks OK.In the case that you do sleep until the next IRQ, sh64 does indeed disable irqs over the
need_reschedcheck, however it re-enables them before sleeping. So disabling at all is basically useless because any pending IRQs will probably all get serviced right as soon as IRQs are re-eanbled.
Ok, I've switched sh64 to use a similar model as sh.
Quoted 7 lines
Well as you probably know, but just to be clear: architectures that handle this without a race have an instruction that basically turns on interrupts and go to sleep at the same time. I'm not aware of a simple way to do it without that facility.
Unless you can easily raise an NMI from another processor as an IPI.
Unfortunately we don't have any such easy facility. The closest I suppose would to have the watchdog generate an NMI, but that severely limits the kind of sleep state that we are able to enter.
Quoted 5 lines
As far as spin waiting goes, something like:
while (!need_resched()) cpu_relax();
Quoted 7 lines
Is generally used.
Now this might introduce some power and heat penalty. What's more, your race isn't a fatal one: in the worst case, it should just stall until the next timer interrupt (aside, that might be fatal with a tickless kernel).
After incorporating your changes, how about this?
--
arch/sh64/kernel/process.c +7 -22
@@ -305,44 +305,29 @@ static int __init hlt_setup(char *__unus__setup ("nohlt" , nohlt_setup);__setup ("hlt" , hlt_setup); -static inline void hlt (void ) -{ -if (hlt_counter) -return ; - - __asm__ __volatile__ ("sleep" : : :"memory" ); -} -/* * The idle loop on a uniprocessor SH.. */ -void default_idle (void ) +void cpu_idle (void ) {/* endless idle loop with no priority at all */ while (1 ) {if (hlt_counter) { -while (1 ) -if (need_resched ()) -break ; +while (!need_resched ()) +cpu_relax (); }else { -local_irq_disable ();while (!need_resched ()) { -local_irq_enable ();idle_trace (); -hlt (); -local_irq_disable (); +cpu_sleep (); } -local_irq_enable (); } + +preempt_enable_no_resched ();schedule (); +preempt_disable (); } } -void cpu_idle (void ) -{ -default_idle (); -} -void machine_restart (char * __unused) {extern void phys_stext (void );
Quoted 10 lines · Paul Mundt
Quoted 5 lines · Nick Piggin
Now this might introduce some power and heat penalty. What's more, your race isn't a fatal one: in the worst case, it should just stall until the next timer interrupt (aside, that might be fatal with a tickless kernel).
After incorporating your changes, how about this?
So, just ignore the race, remove the irq disabling completely? (with the hlt_counter fallback for busy waiting). If you're happy with that then I think it looks good. Thanks Paul.
I'll also update the Documentation/ file to point out that such a race isn't fatal.
Signature · 3 lines
SUSE Labs, Novell Inc. Send instant messages to your online friends http://au.messenger.yahoo.com