[Xen-changelog] [xen stable-4.4] call vgic_en/disable_irqs holding the rank_lock

[patchbot@xxxxxxx]

commit dcb95321d24d3659d5bfa61fe9b0e0e5a5bfe32c
Author:     Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
AuthorDate: Tue Jun 24 19:30:00 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Dec 10 12:09:23 2014 +0000

    call vgic_en/disable_irqs holding the rank_lock
    
    Modifying ienable and calling vgic_enable_irqs or vgic_disable_irqs need
    to be atomic. Move the calls to vgic_enable_irqs and vgic_disable_irqs
    before releasing the rank lock.
    
    Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    
    [ ijc -- partial backport of just the locking part of 5b3a817ea33b
             "xen/arm: observe itargets setting in vgic_enable_irqs and
             vgic_disable_irqs"
    ]
---
 xen/arch/arm/vgic.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index 86d4575..8d1b79e 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -506,8 +506,8 @@ static int vgic_distr_mmio_write(struct vcpu *v, 
mmio_info_t *info)
         vgic_lock_rank(v, rank);
         tr = rank->ienable;
         rank->ienable |= *r;
-        vgic_unlock_rank(v, rank);
         vgic_enable_irqs(v, (*r) & (~tr), gicd_reg - GICD_ISENABLER);
+        vgic_unlock_rank(v, rank);
         return 1;
 
     case GICD_ICENABLER ... GICD_ICENABLERN:
@@ -517,8 +517,8 @@ static int vgic_distr_mmio_write(struct vcpu *v, 
mmio_info_t *info)
         vgic_lock_rank(v, rank);
         tr = rank->ienable;
         rank->ienable &= ~*r;
-        vgic_unlock_rank(v, rank);
         vgic_disable_irqs(v, (*r) & tr, gicd_reg - GICD_ICENABLER);
+        vgic_unlock_rank(v, rank);
         return 1;
 
     case GICD_ISPENDR ... GICD_ISPENDRN:
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.4

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