Skip to contentSkip to conversation

x86-64 linux: call evtchn_do_upcall on irq stack and adjust irqcount

PATCH New Jan Beulich 1 participant 1 message Feb 8, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86-64 linux: call evtchn_do_upcall on irq stack and adjust irqcount

Especially in the light of the recent no-idle-tick preparations in native x86-64 it is important that exit_idle() has proper state available. For this reason, the processor's irqcount must be adjusted within upcalls, and for consistency and similarity with native code this call should also execute on the processor's irq stack.
At once the patch slightly simplifies the pre-existing code by copying %rdi into %rsp instead of adding 8 to %rsp, and by using %rdi instead of %rsp (avoiding a needless resource dependency) for storing the event mask.

Jan

arch/x86_64/kernel/entry-xen.S +8 -2
@@ -826,9 +826,15 @@ ENTRY(hypervisor_callback)
 ENTRY(do_hypervisor_callback)   # do_hyperviosr_callback(struct *pt_regs)
 # Since we don't modify %rdi, evtchn_do_upall(struct *pt_regs) will
 # see the correct pointer to the pt_regs
-        addq $8, %rsp            # we don't return, adjust the stack frame
-11:	movb $0, EVENT_MASK(%rsp)         
+	movq %rdi, %rsp            # we don't return, adjust the stack frame
+11:	movb $0, EVENT_MASK(%rdi)
+	movq %gs:pda_irqstackptr,%rax
+	incl %gs:pda_irqcount
+	cmovzq %rax,%rsp
+	pushq %rdi
 	call evtchn_do_upcall
+	popq %rsp
+	decl %gs:pda_irqcount
         jmp  error_exit
 
 #ifdef CONFIG_X86_LOCAL_APIC

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel