[Xen-changelog] [xen master] xen/arm: Call context_saved() with interrupts enabled during context switch

[patchbot@xxxxxxx]

commit e8bb583bec290a4f903cf065814af33ce49d4d0b
Author:     denys drozdov <denys.drozdov@xxxxxxxxxxxxxxx>
AuthorDate: Wed Feb 4 19:13:05 2015 +0200
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Feb 5 12:22:33 2015 +0000

    xen/arm: Call context_saved() with interrupts enabled during context switch
    
    This is a requirement of the scheduler interface, violating this
    causes for example with the RT scheduler:
    
    (XEN) Assertion 'local_irq_is_enabled()' failed at spinlock.c:137
    (XEN) ----[ Xen-4.5.0  arm32  debug=y  Not tainted ]----
    (XEN) CPU:    0
    (XEN) PC:     0022a074 _spin_lock_irq+0x18/0x94
    
    (XEN) Xen call trace:
    (XEN)    [<0022a074>] _spin_lock_irq+0x18/0x94 (PC)
    (XEN)    [<002256b8>] rt_context_saved+0x3c/0x144 (LR)
    (XEN)    [<002256b8>] rt_context_saved+0x3c/0x144
    (XEN)    [<00228ed8>] context_saved+0x4c/0x80
    (XEN)    [<002524b4>] schedule_tail+0x148/0x2f0
    (XEN)    [<00252668>] continue_new_vcpu+0xc/0x70
    (XEN)    [<00252a18>] context_switch+0x74/0x7c
    
    Signed-off-by: denys drozdov <denys.drozdov@xxxxxxxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Reviewed-by: Dario Faggioli <dario.faggioli@xxxxxxxxxx>
    Reviewed-by: Julien Grall <julien.grall@xxxxxxxxxx>
---
 xen/arch/arm/domain.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index cfc7ab4..3e3fe92 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -64,7 +64,7 @@ static void ctxt_switch_from(struct vcpu *p)
      * mode. Therefore we don't need to save the context of an idle VCPU.
      */
     if ( is_idle_vcpu(p) )
-        goto end_context;
+        return;
 
     p2m_save_state(p);
 
@@ -138,9 +138,6 @@ static void ctxt_switch_from(struct vcpu *p)
     gic_save_state(p);
 
     isb();
-
-end_context:
-    context_saved(p);
 }
 
 static void ctxt_switch_to(struct vcpu *n)
@@ -246,6 +243,8 @@ static void schedule_tail(struct vcpu *prev)
 
     local_irq_enable();
 
+    context_saved(prev);
+
     if ( prev != current )
         update_runstate_area(current);
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog