Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-19 09:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

be2net: fix wrong frag_idx reported by RX CQ

Browse Source 
The RX CQ can report completions with invalid frag_idx when the RXQ that
was *previously* using it, was not cleaned up properly. This hits
a BUG_ON() in be2net.

When completion coalescing is enabled on a CQ, an explicit CQ-notify
(with rearm) is needed for each compl, to flush partially coalesced CQ
entries that are pending DMA.

In be_close(), this fix now notifies CQ for each compl, waits explicitly
for the flush compl to arrive and complains if it doesn't arrive.

Also renaming be_crit_error() to be_hw_error() as it's the more
appropriate name and to convey that we don't wait for the flush compl
only when a HW error has occurred.

Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sathya Perla 2012-12-17 19:38:51 +00:00 committed by David S. Miller
parent a323d9bf83
commit d23e946cb6
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/emulex/benet/be.h
View File

@ -616,7 +616,7 @@ static inline bool be_error(struct be_adapter *adapter)
return adapter->eeh_error || adapter->hw_error || adapter->fw_timeout; return adapter->eeh_error || adapter->hw_error || adapter->fw_timeout;
} }
static inline bool be_crit_error(struct be_adapter *adapter) static inline bool be_hw_error(struct be_adapter *adapter)
{ {
return adapter->eeh_error || adapter->hw_error; return adapter->eeh_error || adapter->hw_error;
} }

38
drivers/net/ethernet/emulex/benet/be_main.c
View File

@ -1689,15 +1689,41 @@ static void be_rx_cq_clean(struct be_rx_obj *rxo)
struct be_queue_info *rxq = &rxo->q; struct be_queue_info *rxq = &rxo->q;
struct be_queue_info *rx_cq = &rxo->cq; struct be_queue_info *rx_cq = &rxo->cq;
struct be_rx_compl_info *rxcp; struct be_rx_compl_info *rxcp;
struct be_adapter *adapter = rxo->adapter;
int flush_wait = 0;
u16 tail; u16 tail;
/* First cleanup pending rx completions */ /* Consume pending rx completions.
while ((rxcp = be_rx_compl_get(rxo)) != NULL) { * Wait for the flush completion (identified by zero num_rcvd)
be_rx_compl_discard(rxo, rxcp); * to arrive. Notify CQ even when there are no more CQ entries
be_cq_notify(rxo->adapter, rx_cq->id, false, 1); * for HW to flush partially coalesced CQ entries.
* In Lancer, there is no need to wait for flush compl.
*/
for (;;) {
rxcp = be_rx_compl_get(rxo);
if (rxcp == NULL) {
if (lancer_chip(adapter))
break;
if (flush_wait++ > 10 || be_hw_error(adapter)) {
dev_warn(&adapter->pdev->dev,
"did not receive flush compl\n");
break;
}
be_cq_notify(adapter, rx_cq->id, true, 0);
mdelay(1);
} else {
be_rx_compl_discard(rxo, rxcp);
be_cq_notify(adapter, rx_cq->id, true, 1);
if (rxcp->num_rcvd == 0)
break;
}
} }
/* Then free posted rx buffer that were not used */ /* After cleanup, leave the CQ in unarmed state */
be_cq_notify(adapter, rx_cq->id, false, 0);
/* Then free posted rx buffers that were not used */
tail = (rxq->head + rxq->len - atomic_read(&rxq->used)) % rxq->len; tail = (rxq->head + rxq->len - atomic_read(&rxq->used)) % rxq->len;
for (; atomic_read(&rxq->used) > 0; index_inc(&tail, rxq->len)) { for (; atomic_read(&rxq->used) > 0; index_inc(&tail, rxq->len)) {
page_info = get_rx_page_info(rxo, tail); page_info = get_rx_page_info(rxo, tail);
@ -2157,7 +2183,7 @@ void be_detect_error(struct be_adapter *adapter)
u32 sliport_status = 0, sliport_err1 = 0, sliport_err2 = 0; u32 sliport_status = 0, sliport_err1 = 0, sliport_err2 = 0;
u32 i; u32 i;
if (be_crit_error(adapter)) if (be_hw_error(adapter))
return; return;
if (lancer_chip(adapter)) { if (lancer_chip(adapter)) {