bnx2: Fix netpoll crash.
Subsystems (2)
PATCH 1/2 bnx2: Fix netpoll crash.
From: Benjamin Li <[email protected]>
The bnx2 driver calls netif_napi_add() for all the NAPI structs during ->probe() time but not all of them will be used if we're not in MSI-X mode. This creates a problem for netpoll since it will poll all the NAPI structs in the dev_list whether or not they are scheduled, resulting in a crash when we access structure fields not initialized for that vector.
We fix it by moving the netif_napi_add() call to ->open() after the number of IRQ vectors has been determined.
--- drivers/net/bnx2.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/net/bnx2.c +4 -2
@@ -246,6 +246,8 @@ static const struct flash_spec flash_5709 = {MODULE_DEVICE_TABLE (pci, bnx2_pci_tbl); +static void bnx2_init_napi (struct bnx2 *bp); +static inline u32 bnx2_tx_avail (struct bnx2 *bp,struct bnx2_tx_ring_info *txr) {u32 diff;
@@ -6197,6 +6199,7 @@ bnx2_open(struct net_device *dev)bnx2_disable_int (bp);bnx2_setup_int_mode (bp, disable_msi); +bnx2_init_napi (bp);bnx2_napi_enable (bp); rc =bnx2_alloc_mem (bp);if (rc)
@@ -8207,7 +8210,7 @@ bnx2_init_napi(struct bnx2 *bp) {int i; -for (i =0 ; i <BNX2_MAX_MSIX_VEC ; i++) { +for (i =0 ; i < bp->irq_nvecs; i++) {struct bnx2_napi *bnapi = &bp->bnx2_napi[i];int (*poll)(struct napi_struct *,int );
@@ -8276,7 +8279,6 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->ethtool_ops = &bnx2_ethtool_ops; bp =netdev_priv (dev); -bnx2_init_napi (bp);pci_set_drvdata (pdev, dev);
Signature · 1 line
1.6.4.GIT
PATCH 2/2 bnx2: Use proper handler during netpoll.
Netpoll needs to call the proper handler depending on the IRQ mode and the vector.
--- drivers/net/bnx2.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/net/bnx2.c +5 -3
@@ -7646,9 +7646,11 @@ poll_bnx2(struct net_device *dev)int i;for (i =0 ; i < bp->irq_nvecs; i++) { -disable_irq (bp->irq_tbl[i].vector); -bnx2_interrupt (bp->irq_tbl[i].vector, &bp->bnx2_napi[i]); -enable_irq (bp->irq_tbl[i].vector); +struct bnx2_irq *irq = &bp->irq_tbl[i]; + +disable_irq (irq->vector); + irq->handler (irq->vector, &bp->bnx2_napi[i]); +enable_irq (irq->vector); } }#endif
Signature · 1 line
1.6.4.GIT
Re: [PATCH 2/2] bnx2: Use proper handler during netpoll.
From: "Michael Chan" <[email protected]>
Date: Tue, 23 Mar 2010 15:13:12 -0800
Quoted 4 lines
Netpoll needs to call the proper handler depending on the IRQ mode and the vector.
Signed-off-by Michael Chan <[email protected]>
Applied.
From: "Michael Chan" <[email protected]>
Date: Tue, 23 Mar 2010 15:13:11 -0800
Quoted 8 lines
From: Benjamin Li <[email protected]>
The bnx2 driver calls
netif_napi_add()for all the NAPI structs during ->probe() time but not all of them will be used if we're not in MSI-X mode. This creates a problem for netpoll since it will poll all the NAPI structs in thedev_listwhether or not they are scheduled, resulting in a crash when we access structure fields not initialized for that vector.
Quoted 5 lines
We fix it by moving the
netif_napi_add()call to ->open() after the number of IRQ vectors has been determined.Signed-off-by Benjamin Li <[email protected]>Signed-off-by Michael Chan <[email protected]>
Applied.