diff options
| author |   Ben Hutchings <bhutchings@solarflare.com> | 2010-12-07 19:24:45 +0000 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2010-12-07 19:30:19 +0000 |
| commit | 94dec6a2d20a26a779b63bb584e48db5fb0ddb53 (patch) | |
| tree | 3911c0883429411e27f22db1e34436d75fbb937b /drivers/net/sfc/nic.c | |
| parent | filter: fix sk_filter rcu handling (diff) | |
| download | linux-dev-94dec6a2d20a26a779b63bb584e48db5fb0ddb53.tar.xz linux-dev-94dec6a2d20a26a779b63bb584e48db5fb0ddb53.zip | |
sfc: Fix crash in legacy onterrupt handler during ring reallocation
If we are using a legacy interrupt, our IRQ may be shared and our
interrupt handler may be called even though interrupts are disabled on
the NIC. When we change ring sizes, we reallocate the event queue and
the interrupt handler may use an invalid pointer when called for
another device's interrupt.
Maintain a legacy_irq_enabled flag and test that at the top of the
interrupt handler. Note that this problem results from the need to
work around broken INT_ISR0 reads, and does not affect the legacy
interrupt handler for Falcon A1.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/sfc/nic.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/sfc/nic.c b/drivers/net/sfc/nic.c index 41c36b9a4244..67cb0c96838c 100644 --- a/drivers/net/sfc/nic.c +++ b/drivers/net/sfc/nic.c @@ -1418,6 +1418,12 @@ static irqreturn_t efx_legacy_interrupt(int irq, void *dev_id) u32 queues; int syserr; + /* Could this be ours? If interrupts are disabled then the + * channel state may not be valid. + */ + if (!efx->legacy_irq_enabled) + return result; + /* Read the ISR which also ACKs the interrupts */ efx_readd(efx, ®, FR_BZ_INT_ISR0); queues = EFX_EXTRACT_DWORD(reg, 0, 31); |