From: Ingo Molnar Date: Thu, 26 Jan 2006 00:42:11 +0000 (+0100) Subject: [PATCH] fix deadlock in drivers/pci/msi.c X-Git-Tag: v2.6.16-rc2~247 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6bc2666ed6696c40ef055e88ffef0b7657437a4;p=linux-2.6 [PATCH] fix deadlock in drivers/pci/msi.c The lock validator caught another one: drivers/pci/msi.c is accessing &irq_desc[i].lock with interrupts enabled (!). The fix is to disable interrupts properly. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds --- diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 202b7507a3..8e1ba0b7a8 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -416,7 +416,9 @@ static void attach_msi_entry(struct msi_desc *entry, int vector) static void irq_handler_init(int cap_id, int pos, int mask) { - spin_lock(&irq_desc[pos].lock); + unsigned long flags; + + spin_lock_irqsave(&irq_desc[pos].lock, flags); if (cap_id == PCI_CAP_ID_MSIX) irq_desc[pos].handler = &msix_irq_type; else { @@ -425,7 +427,7 @@ static void irq_handler_init(int cap_id, int pos, int mask) else irq_desc[pos].handler = &msi_irq_w_maskbit_type; } - spin_unlock(&irq_desc[pos].lock); + spin_unlock_irqrestore(&irq_desc[pos].lock, flags); } static void enable_msi_mode(struct pci_dev *dev, int pos, int type)