Skip to content

Commit

Permalink
PCI: Flush MSI-X table writes
Browse files Browse the repository at this point in the history
This patch fixes a kernel bug which is triggered when using the
irqbalance daemon with MSI-X hardware.

Because both MSI-X interrupt messages and MSI-X table writes are posted,
it's possible for them to cross while in-flight.  This results in
interrupts being received long after the kernel thinks they're disabled,
and in interrupts being sent to stale vectors after rebalancing.

This patch performs a read flush after writes to the MSI-X table for
mask and unmask operations.  Since the SMP affinity is set while
the interrupt is masked, and since it's unmasked immediately after,
no additional flushes are required in the various affinity setting
routines.

This patch has been validated with (unreleased) network hardware which
uses MSI-X.

Revised with input from Eric Biederman.

Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Mitch Williams authored and Greg Kroah-Hartman committed May 3, 2007
1 parent dc87c39 commit 988cbb1
Showing 1 changed file with 25 additions and 0 deletions.
25 changes: 25 additions & 0 deletions drivers/pci/msi.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,29 @@ static void msix_set_enable(struct pci_dev *dev, int enable)
}
}

static void msix_flush_writes(unsigned int irq)
{
struct msi_desc *entry;

entry = get_irq_msi(irq);
BUG_ON(!entry || !entry->dev);
switch (entry->msi_attrib.type) {
case PCI_CAP_ID_MSI:
/* nothing to do */
break;
case PCI_CAP_ID_MSIX:
{
int offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET;
readl(entry->mask_base + offset);
break;
}
default:
BUG();
break;
}
}

static void msi_set_mask_bit(unsigned int irq, int flag)
{
struct msi_desc *entry;
Expand Down Expand Up @@ -187,11 +210,13 @@ void write_msi_msg(unsigned int irq, struct msi_msg *msg)
void mask_msi_irq(unsigned int irq)
{
msi_set_mask_bit(irq, 1);
msix_flush_writes(irq);
}

void unmask_msi_irq(unsigned int irq)
{
msi_set_mask_bit(irq, 0);
msix_flush_writes(irq);
}

static int msi_free_irq(struct pci_dev* dev, int irq);
Expand Down

0 comments on commit 988cbb1

Please sign in to comment.