UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

tg3: Avoid panic from reserved statblk field access 

When RSS is enabled, interrupt vector 0 does not receive any rx traffic.
The rx producer index fields for vector 0's status block should be
considered reserved in this case.  This patch changes the code to
respect these reserved fields, which avoids a kernel panic when these
fields take on non-zero values.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Matt Carlson 2012-04-24 13:37:01 +00:00 committed by David S. Miller
parent da3a9e9e7b
commit f891ea1634
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/ethernet/broadcom/tg3.c
View File

@ -879,8 +879,13 @@ static inline unsigned int tg3_has_work(struct tg3_napi *tnapi)
if (sblk->status & SD_STATUS_LINK_CHG) if (sblk->status & SD_STATUS_LINK_CHG)
work_exists = 1; work_exists = 1;
} }
/* check for RX/TX work to do */
if (sblk->idx[0].tx_consumer != tnapi->tx_cons || /* check for TX work to do */
if (sblk->idx[0].tx_consumer != tnapi->tx_cons)
work_exists = 1;
/* check for RX work to do */
if (tnapi->rx_rcb_prod_idx &&
*(tnapi->rx_rcb_prod_idx) != tnapi->rx_rcb_ptr) *(tnapi->rx_rcb_prod_idx) != tnapi->rx_rcb_ptr)
work_exists = 1; work_exists = 1;
@ -6124,6 +6129,9 @@ static int tg3_poll_work(struct tg3_napi *tnapi, int work_done, int budget)
return work_done; return work_done;
} }
if (!tnapi->rx_rcb_prod_idx)
return work_done;
/* run RX thread, within the bounds set by NAPI. /* run RX thread, within the bounds set by NAPI.
* All RX "locking" is done by ensuring outside * All RX "locking" is done by ensuring outside
* code synchronizes with tg3->napi.poll() * code synchronizes with tg3->napi.poll()
@ -7567,6 +7575,12 @@ static int tg3_alloc_consistent(struct tg3 *tp)
*/ */
switch (i) { switch (i) {
default: default:
if (tg3_flag(tp, ENABLE_RSS)) {
tnapi->rx_rcb_prod_idx = NULL;
break;
}
/* Fall through */
case 1:
tnapi->rx_rcb_prod_idx = &sblk->idx[0].rx_producer; tnapi->rx_rcb_prod_idx = &sblk->idx[0].rx_producer;
break; break;
case 2: case 2: