Skip to contentSkip to conversation

ipipe_suspend_domain vs. pipeline state of caller

Adeos-main In review Jan Kiszka 2 participants 10 messages Nov 18, 2009 x86

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

Hi Philippe,

on x86, trace_hardirqs_on in safe_halt feels unhappy about the fact that it is called with neither real irqs disable nor the root domain stalled. Call path is cpu_idle -> default_idle -> safe_halt. We loose the stalling of the root domain in cpu_idle via ipipe_suspend_domain.

That raises the question how ipipe_suspend_domain is supposed to deal with the pipeline state of the calling domain. Currently it clears the stall unconditionally, which is obviously not correct for the idle path. My feeling is that it should not alter the state, rather restore it on exit. But this is an exported interface (though a widely unused today, I guess), and I don't claim to oversee all corner cases.

Jan

Signature · 2 lines
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
#1 lore raw
Quoted 7 lines · Jan Kiszka

Hi Philippe,

on x86, trace_hardirqs_on in safe_halt feels unhappy about the fact that it is called with neither real irqs disable nor the root domain stalled. Call path is cpu_idle -> default_idle -> safe_halt. We loose the stalling of the root domain in cpu_idle via ipipe_suspend_domain.

Reinstating the stall bit upon return from suspension is the way to go.

Quoted 7 lines

That raises the question how ipipe_suspend_domain is supposed to deal with the pipeline state of the calling domain. Currently it clears the stall unconditionally, which is obviously not correct for the idle path. My feeling is that it should not alter the state, rather restore it on exit. But this is an exported interface (though a widely unused today, I guess), and I don't claim to oversee all corner cases.

At the core of the pipeline logic, there is the assumption that a domain may never, ever suspend in stalled state, so that no interrupt lingers unexpectedly in the log while it enters sleep, and this is what suspend_domain() enforces before switching to the next domain.

Quoted 2 lines

Jan

Signature · 1 line
Philippe.
author
#2 lore raw

PATCH 1/1 Restore pipeline state on exit from ipipe_suspend_domain

This fixes the valid complaint about safe_halt being called with the root domain unstalled.

---
 kernel/ipipe/core.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

Applies to 2.6.31, but is relevant for older kernels as well.

kernel/ipipe/core.c +4 -1
index ffaceaa..cd946f3 100644
@@ -615,12 +615,13 @@ void ipipe_suspend_domain(void)
 	struct ipipe_domain *this_domain, *next_domain;
 	struct ipipe_percpu_domain_data *p;
 	struct list_head *ln;
-	unsigned long flags;
+	unsigned long flags, saved_status;
 
 	local_irq_save_hw(flags);
 
 	this_domain = next_domain = __ipipe_current_domain;
 	p = ipipe_cpudom_ptr(this_domain);
+	saved_status = p->status & ~IPIPE_SYNC_MASK;
 	p->status &= ~(IPIPE_STALL_MASK|IPIPE_SYNC_MASK);
 
 	if (p->irqpend_himask != 0)
@@ -654,6 +655,8 @@ sync_stage:
 	}
 
 	__ipipe_current_domain = this_domain;
+	p = ipipe_cpudom_ptr(this_domain);
+	p->status = saved_status;
 
 	local_irq_restore_hw(flags);
 }
Signature · 1 line
1.6.0.2
#3 lore raw

Re: [Adeos-main] [PATCH] Restore pipeline state on exit from ipipe_suspend_domain

Quoted 2 lines · Jan Kiszka

This fixes the valid complaint about safe_halt being called with the root domain unstalled.

The fix should go to the caller. ipipe_suspend_domain() acts as a logical barrier: after that point, you may assume that the current domain is unstalled.

Quoted 36 lines
---
 kernel/ipipe/core.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

Applies to 2.6.31, but is relevant for older kernels as well.

kernel/ipipe/core.c +4 -1
index ffaceaa..cd946f3 100644
@@ -615,12 +615,13 @@ void ipipe_suspend_domain(void)
 	struct ipipe_domain *this_domain, *next_domain;
 	struct ipipe_percpu_domain_data *p;
 	struct list_head *ln;
-	unsigned long flags;
+	unsigned long flags, saved_status;
 
 	local_irq_save_hw(flags);
 
 	this_domain = next_domain = __ipipe_current_domain;
 	p = ipipe_cpudom_ptr(this_domain);
+	saved_status = p->status & ~IPIPE_SYNC_MASK;
 	p->status &= ~(IPIPE_STALL_MASK|IPIPE_SYNC_MASK);
 
 	if (p->irqpend_himask != 0)
@@ -654,6 +655,8 @@ sync_stage:
 	}
 
 	__ipipe_current_domain = this_domain;
+	p = ipipe_cpudom_ptr(this_domain);
+	p->status = saved_status;
 
 	local_irq_restore_hw(flags);
 }
Signature · 1 line
Philippe.
author
#4 lore raw

Re: [Adeos-main] [PATCH] Restore pipeline state on exit from ipipe_suspend_domain

Quoted 7 lines · Philippe Gerum
Quoted 2 lines · Jan Kiszka

This fixes the valid complaint about safe_halt being called with the root domain unstalled.

The fix should go to the caller. ipipe_suspend_domain() acts as a logical barrier: after that point, you may assume that the current domain is unstalled.

The caller so far expect to find no interruption window between return from ipipe_suspend_domain and yet another local_irq_disable. It expects to remain stalled all the time until safe_halt.

Jan

Quoted 38 lines
Quoted 36 lines
---
 kernel/ipipe/core.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

Applies to 2.6.31, but is relevant for older kernels as well.

kernel/ipipe/core.c +4 -1
index ffaceaa..cd946f3 100644
@@ -615,12 +615,13 @@ void ipipe_suspend_domain(void)
 	struct ipipe_domain *this_domain, *next_domain;
 	struct ipipe_percpu_domain_data *p;
 	struct list_head *ln;
-	unsigned long flags;
+	unsigned long flags, saved_status;
 
 	local_irq_save_hw(flags);
 
 	this_domain = next_domain = __ipipe_current_domain;
 	p = ipipe_cpudom_ptr(this_domain);
+	saved_status = p->status & ~IPIPE_SYNC_MASK;
 	p->status &= ~(IPIPE_STALL_MASK|IPIPE_SYNC_MASK);
 
 	if (p->irqpend_himask != 0)
@@ -654,6 +655,8 @@ sync_stage:
 	}
 
 	__ipipe_current_domain = this_domain;
+	p = ipipe_cpudom_ptr(this_domain);
+	p->status = saved_status;
 
 	local_irq_restore_hw(flags);
 }
Signature · 2 lines
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
author
#5 lore raw

Re: [Adeos-main] [PATCH] Restore pipeline state on exit from ipipe_suspend_domain

Quoted 11 lines · Jan Kiszka
Quoted 6 lines · Philippe Gerum
Quoted 2 lines · Jan Kiszka

This fixes the valid complaint about safe_halt being called with the root domain unstalled.

The fix should go to the caller. ipipe_suspend_domain() acts as a logical barrier: after that point, you may assume that the current domain is unstalled.

The caller so far expect to find no interruption window between return from ipipe_suspend_domain and yet another local_irq_disable. It expects to remain stalled all the time until safe_halt.

Checked again: Opening the IRQ window here is bogus, may cause rescheduling delays to Linux (if not much worse things).

I suppose it's better to adjust the assumption that ipipe_suspend_domain behaves like "sti; hlt". Are there users that rely on this? __ipipe_walk_pipeline does not look like it would.

Jan

Signature · 2 lines
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
#6 lore raw

Re: [Adeos-main] [PATCH] Restore pipeline state on exit from ipipe_suspend_domain

Quoted 13 lines · Jan Kiszka
Quoted 11 lines · Jan Kiszka
Quoted 6 lines · Philippe Gerum
Quoted 2 lines · Jan Kiszka

This fixes the valid complaint about safe_halt being called with the root domain unstalled.

The fix should go to the caller. ipipe_suspend_domain() acts as a logical barrier: after that point, you may assume that the current domain is unstalled.

The caller so far expect to find no interruption window between return from ipipe_suspend_domain and yet another local_irq_disable. It expects to remain stalled all the time until safe_halt.

Quoted 6 lines

Checked again: Opening the IRQ window here is bogus, may cause rescheduling delays to Linux (if not much worse things).

I suppose it's better to adjust the assumption that ipipe_suspend_domain behaves like "sti; hlt". Are there users that rely on this? __ipipe_walk_pipeline does not look like it would.

I chose to never apply the mantra "never care for out of tree code" for Adeos, granted, at the expense of quite a lot of headaches, but that layer is a standalone building block which exports a stable API since years.

I may revert that decision in a foreseeable future, when X3 starts notably. But I'm still reluctant to break such a significant assumption in the current patch series.

I would rather move ipipe_suspend_domain() out of the atomic section on x86 (granted, this should be done carefully if ever possible).

Quoted 3 lines

Jan

Signature · 1 line
Philippe.
author
#7 lore raw

PATCH 1/1 x86: Move ipipe_suspend_domain out of IRQ-disabled section

Quoted 24 lines · Philippe Gerum
Quoted 11 lines · Jan Kiszka
Quoted 10 lines · Jan Kiszka
Quoted 6 lines · Philippe Gerum
Quoted 2 lines · Jan Kiszka

This fixes the valid complaint about safe_halt being called with the root domain unstalled.

The fix should go to the caller. ipipe_suspend_domain() acts as a logical barrier: after that point, you may assume that the current domain is unstalled.

The caller so far expect to find no interruption window between return from ipipe_suspend_domain and yet another local_irq_disable. It expects to remain stalled all the time until safe_halt.

Quoted 6 lines

Checked again: Opening the IRQ window here is bogus, may cause rescheduling delays to Linux (if not much worse things).

I suppose it's better to adjust the assumption that ipipe_suspend_domain behaves like "sti; hlt". Are there users that rely on this? __ipipe_walk_pipeline does not look like it would.

I chose to never apply the mantra "never care for out of tree code" for Adeos, granted, at the expense of quite a lot of headaches, but that layer is a standalone building block which exports a stable API since years.

Quoted 6 lines

I may revert that decision in a foreseeable future, when X3 starts notably. But I'm still reluctant to break such a significant assumption in the current patch series.

I would rather move ipipe_suspend_domain() out of the atomic section on x86 (granted, this should be done carefully if ever possible).

Likely feasible. The good news is I missed the fact that there is another check for needs_resched later on, right before the actual halt. So the problem should be curable by moving ipipe_suspend_domain, at least on x86.

Jan

-------->

x86: Move ipipe_suspend_domain out of IRQ-disabled section

ipipe_suspend_domain reenables IRQs on return, so we have to move it before the point where the kernel disables it for halt.

This fixes the valid complaint about safe_halt being called with the root domain unstalled.

---
 arch/x86/kernel/process_32.c |    3 ++-
 arch/x86/kernel/process_64.c |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)
arch/x86/kernel/process_32.c +2 -1
index a8a5cd1..e31de9e 100644
@@ -111,10 +111,11 @@ void cpu_idle(void)
 			if (cpu_is_offline(cpu))
 				play_dead();
 
+			ipipe_suspend_domain();
+
 			local_irq_disable();
 			/* Don't trace irqs off for idle */
 			stop_critical_timings();
-  			ipipe_suspend_domain();
 			pm_idle();
 			start_critical_timings();
 		}
arch/x86/kernel/process_64.c +3 -1
index 02efd18..b30dc4d 100644
@@ -136,6 +136,9 @@ void cpu_idle(void)
 
 			if (cpu_is_offline(smp_processor_id()))
 				play_dead();
+
+			ipipe_suspend_domain();
+
 			/*
 			 * Idle routines should keep interrupts disabled
 			 * from here on, until they go to idle.
@@ -145,7 +148,6 @@ void cpu_idle(void)
 			enter_idle();
 			/* Don't trace irqs off for idle */
 			stop_critical_timings();
-  			ipipe_suspend_domain();
 			pm_idle();
 			start_critical_timings();
 			/* In many cases the interrupt that ended idle
author
#8 lore raw

Re: [Adeos-main] [PATCH] x86: Move ipipe_suspend_domain out of IRQ-disabled section

Quoted 87 lines · Jan Kiszka
Quoted 23 lines · Philippe Gerum
Quoted 11 lines · Jan Kiszka
Quoted 10 lines · Jan Kiszka
Quoted 6 lines · Philippe Gerum
Quoted 2 lines · Jan Kiszka

This fixes the valid complaint about safe_halt being called with the root domain unstalled.

The fix should go to the caller. ipipe_suspend_domain() acts as a logical barrier: after that point, you may assume that the current domain is unstalled.

The caller so far expect to find no interruption window between return from ipipe_suspend_domain and yet another local_irq_disable. It expects to remain stalled all the time until safe_halt.

Quoted 6 lines

Checked again: Opening the IRQ window here is bogus, may cause rescheduling delays to Linux (if not much worse things).

I suppose it's better to adjust the assumption that ipipe_suspend_domain behaves like "sti; hlt". Are there users that rely on this? __ipipe_walk_pipeline does not look like it would.

I chose to never apply the mantra "never care for out of tree code" for Adeos, granted, at the expense of quite a lot of headaches, but that layer is a standalone building block which exports a stable API since years.

Quoted 6 lines

I may revert that decision in a foreseeable future, when X3 starts notably. But I'm still reluctant to break such a significant assumption in the current patch series.

I would rather move ipipe_suspend_domain() out of the atomic section on x86 (granted, this should be done carefully if ever possible).

Likely feasible. The good news is I missed the fact that there is another check for needs_resched later on, right before the actual halt. So the problem should be curable by moving ipipe_suspend_domain, at least on x86.

Jan

-------->

x86: Move ipipe_suspend_domain out of IRQ-disabled section

ipipe_suspend_domain reenables IRQs on return, so we have to move it before the point where the kernel disables it for halt.

This fixes the valid complaint about safe_halt being called with the root domain unstalled.

---
 arch/x86/kernel/process_32.c |    3 ++-
 arch/x86/kernel/process_64.c |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)
arch/x86/kernel/process_32.c +2 -1
index a8a5cd1..e31de9e 100644
@@ -111,10 +111,11 @@ void cpu_idle(void)
 			if (cpu_is_offline(cpu))
 				play_dead();
 
+			ipipe_suspend_domain();
+
 			local_irq_disable();
 			/* Don't trace irqs off for idle */
 			stop_critical_timings();
-  			ipipe_suspend_domain();
 			pm_idle();
 			start_critical_timings();
 		}
arch/x86/kernel/process_64.c +3 -0
index 02efd18..b30dc4d 100644
@@ -136,6 +136,9 @@ void cpu_idle(void)
 
 			if (cpu_is_offline(smp_processor_id()))
 				play_dead();
+
+			ipipe_suspend_domain();
+
 			/*
 			 * Idle routines should keep interrupts disabled
 			 * from here on, until they go to idle.

arch/x86/kernel/process_64.c void cpu_idle(void) · line 153

Quoted 7 lines
arch/x86/kernel/process_64.c +0 -1
@@ -145,7 +148,6 @@ void cpu_idle(void)
 			enter_idle();
 			/* Don't trace irqs off for idle */
 			stop_critical_timings();
-  			ipipe_suspend_domain();
 			pm_idle();
 			start_critical_timings();
 			/* In many cases the interrupt that ended idle

Oops, forgot to switch off line wrapping. You can pull from

git://git.kiszka.org/ipipe-2.6.git queues/2.6.31-x86

instead.

Jan

#9 lore raw

Re: [Adeos-main] [PATCH] Restore pipeline state on exit from ipipe_suspend_domain

In reply to Jan Kiszka
Quoted 5 lines · Jan Kiszka
Quoted 4 lines · Philippe Gerum
Quoted 2 lines · Jan Kiszka

This fixes the valid complaint about safe_halt being called with the root domain unstalled.

Quoted 7 lines
Quoted 3 lines

The fix should go to the caller. ipipe_suspend_domain() acts as a logical barrier: after that point, you may assume that the current domain is unstalled.

The caller so far expect to find no interruption window between return from ipipe_suspend_domain and yet another local_irq_disable. It expects to remain stalled all the time until safe_halt.

Then you should fix the caller, to move the call to ipipe_suspend_domain() out of the atomic section.

Quoted 43 lines

Jan

Quoted 38 lines
Quoted 36 lines
---
 kernel/ipipe/core.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

Applies to 2.6.31, but is relevant for older kernels as well.

kernel/ipipe/core.c +4 -1
index ffaceaa..cd946f3 100644
@@ -615,12 +615,13 @@ void ipipe_suspend_domain(void)
 	struct ipipe_domain *this_domain, *next_domain;
 	struct ipipe_percpu_domain_data *p;
 	struct list_head *ln;
-	unsigned long flags;
+	unsigned long flags, saved_status;
 
 	local_irq_save_hw(flags);
 
 	this_domain = next_domain = __ipipe_current_domain;
 	p = ipipe_cpudom_ptr(this_domain);
+	saved_status = p->status & ~IPIPE_SYNC_MASK;
 	p->status &= ~(IPIPE_STALL_MASK|IPIPE_SYNC_MASK);
 
 	if (p->irqpend_himask != 0)
@@ -654,6 +655,8 @@ sync_stage:
 	}
 
 	__ipipe_current_domain = this_domain;
+	p = ipipe_cpudom_ptr(this_domain);
+	p->status = saved_status;
 
 	local_irq_restore_hw(flags);
 }
Signature · 1 line
Philippe.