This should ensure we don't ack nested interrupts out of order.
TESTED: On SMP this stops failure in xhci from hanging rumpnet.
When a second usb driver is executed, the second one detects a problem
and disables the uhub0 port, which breaks the first usb driver.
But this does not block rumpnet from serving packets, sharing irq 11.
The usb stack can be recovered by killing both usb drivers and
restarting one. Before this change, the behaviour was that irq 11
became stuck and unusable for any device.
Parallel compiling speed is greatly improved with this commit on SMP.
UP+apic still works as per usual.
---
i386/i386at/interrupt.S | 34 +++++++++++++++++-----------------
x86_64/interrupt.S | 32 ++++++++++++++++----------------
2 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/i386/i386at/interrupt.S b/i386/i386at/interrupt.S
index 77424b43..0775eaf1 100644
--- a/i386/i386at/interrupt.S
+++ b/i386/i386at/interrupt.S
@@ -61,6 +61,23 @@ ENTRY(interrupt)
je _call_local_ast
#endif
+ movl S_IPL,%eax
+ movl %eax,4(%esp) /* previous ipl as 2nd arg */
+
+ movl S_RET,%eax
+ movl %eax,8(%esp) /* return address as 3rd arg */
+
+ movl S_REGS,%eax
+ movl %eax,12(%esp) /* address of interrupted registers as
4th arg */
+
+ movl S_IRQ,%eax /* copy irq number */
+
+ shll $2,%eax /* irq * 4 */
+ movl EXT(iunit)(%eax),%edx /* get device unit number */
+ movl %edx,(%esp) /* unit number as 1st arg */
+
+ call *EXT(ivect)(%eax) /* call interrupt handler */
+
#ifndef APIC
movl $1,%eax
shll %cl,%eax /* get corresponding IRQ mask */
@@ -102,23 +119,6 @@ ENTRY(interrupt)
call EXT(ioapic_irq_eoi) /* ioapic irq specific EOI */
#endif
- movl S_IPL,%eax
- movl %eax,4(%esp) /* previous ipl as 2nd arg */
-
- movl S_RET,%eax
- movl %eax,8(%esp) /* return address as 3rd arg */
-
- movl S_REGS,%eax
- movl %eax,12(%esp) /* address of interrupted registers as
4th arg */
-
- movl S_IRQ,%eax /* copy irq number */
-
- shll $2,%eax /* irq * 4 */
- movl EXT(iunit)(%eax),%edx /* get device unit number */
- movl %edx,(%esp) /* unit number as 1st arg */
-
- call *EXT(ivect)(%eax) /* call interrupt handler */
-
_completed:
movl S_IPL,%eax /* restore previous ipl */
movl %eax,(%esp)
diff --git a/x86_64/interrupt.S b/x86_64/interrupt.S
index 6fb77727..870c7fde 100644
--- a/x86_64/interrupt.S
+++ b/x86_64/interrupt.S
@@ -61,6 +61,22 @@ ENTRY(interrupt)
je _call_local_ast
#endif
+ ;
+ movq S_IPL,S_ARG1 /* previous ipl as 2nd arg */
+
+ ;
+ movq S_RET,S_ARG2 /* return address as 3th arg */
+
+ ;
+ movq S_REGS,S_ARG3 /* address of interrupted registers as
4th arg */
+
+ movl S_IRQ,%eax /* copy irq number */
+ shll $2,%eax /* irq * 4 */
+ movl EXT(iunit)(%rax),%edi /* get device unit number as 1st arg */
+
+ shll $1,%eax /* irq * 8 */
+ call *EXT(ivect)(%rax) /* call interrupt handler */
+
#ifndef APIC
movl $1,%eax
shll %cl,%eax /* get corresponding IRQ mask */
@@ -102,22 +118,6 @@ ENTRY(interrupt)
call EXT(ioapic_irq_eoi) /* ioapic irq specific EOI */
#endif
- ;
- movq S_IPL,S_ARG1 /* previous ipl as 2nd arg */
-
- ;
- movq S_RET,S_ARG2 /* return address as 3th arg */
-
- ;
- movq S_REGS,S_ARG3 /* address of interrupted registers as
4th arg */
-
- movl S_IRQ,%eax /* copy irq number */
- shll $2,%eax /* irq * 4 */
- movl EXT(iunit)(%rax),%edi /* get device unit number as 1st arg */
-
- shll $1,%eax /* irq * 8 */
- call *EXT(ivect)(%rax) /* call interrupt handler */
-
_completed:
movl S_IPL,%edi /* restore previous ipl */
call splx_cli /* restore previous ipl */
--
2.45.2
