]> xenbits.xensource.com Git - xen.git/commitdiff
x86/MSI: fix locking in pci_restore_msi_state()
authorJan Beulich <jbeulich@suse.com>
Mon, 14 Oct 2013 07:07:02 +0000 (09:07 +0200)
committerJan Beulich <jbeulich@suse.com>
Mon, 14 Oct 2013 07:07:02 +0000 (09:07 +0200)
Right after the loop the lock is being dropped, so all loop exits
should happen with the lock still held.

Reported-by: Kristoffer Egefelt <kristoffer@itoc.dk>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Tested-by: Kristoffer Egefelt <kristoffer@itoc.dk>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
xen/arch/x86/msi.c

index e17e5b2817281248505905c774dec20e8f212985..b43c36a1c6f3eed15ecd7805ea0f23eaca9a0785 100644 (file)
@@ -1158,11 +1158,11 @@ int pci_restore_msi_state(struct pci_dev *pdev)
         for ( i = 0; ; )
         {
             msi_set_mask_bit(desc, entry[i].msi_attrib.masked);
-            spin_unlock_irqrestore(&desc->lock, flags);
 
             if ( !--nr )
                 break;
 
+            spin_unlock_irqrestore(&desc->lock, flags);
             desc = &irq_desc[entry[++i].irq];
             spin_lock_irqsave(&desc->lock, flags);
             if ( desc->msi_desc != entry + i )