Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

be2net: fix tx completion cleanup

Browse source 
As a part of be_close(), instead of waiting for a max of 200ms for each TXQ,
wait for a total of 200ms for completions from all TXQs to arrive.

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-02-23 18:50:14 +00:00 committed by David S. Miller
parent 191eb75631
commit 0ae57bb3df
1 changed files with 41 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
drivers/net/ethernet/emulex/benet/be_main.c
View file

@ -1563,53 +1563,64 @@ static void be_rx_cq_clean(struct be_rx_obj *rxo)
rxq->tail = rxq->head = 0; rxq->tail = rxq->head = 0;
} }
static void be_tx_compl_clean(struct be_adapter *adapter, static void be_tx_compl_clean(struct be_adapter *adapter)
struct be_tx_obj *txo)
{ {
struct be_queue_info *tx_cq = &txo->cq; struct be_tx_obj *txo;
struct be_queue_info *txq = &txo->q; struct be_queue_info *txq;
struct be_eth_tx_compl *txcp; struct be_eth_tx_compl *txcp;
u16 end_idx, cmpl = 0, timeo = 0, num_wrbs = 0; u16 end_idx, cmpl = 0, timeo = 0, num_wrbs = 0;
struct sk_buff **sent_skbs = txo->sent_skb_list;
struct sk_buff *sent_skb; struct sk_buff *sent_skb;
bool dummy_wrb; bool dummy_wrb;
int i, pending_txqs;
/* Wait for a max of 200ms for all the tx-completions to arrive. */ /* Wait for a max of 200ms for all the tx-completions to arrive. */
do { do {
while ((txcp = be_tx_compl_get(tx_cq))) { pending_txqs = adapter->num_tx_qs;
end_idx = AMAP_GET_BITS(struct amap_eth_tx_compl,
for_all_tx_queues(adapter, txo, i) {
txq = &txo->q;
while ((txcp = be_tx_compl_get(&txo->cq))) {
end_idx =
AMAP_GET_BITS(struct amap_eth_tx_compl,
wrb_index, txcp); wrb_index, txcp);
num_wrbs += be_tx_compl_process(adapter, txo, end_idx); num_wrbs += be_tx_compl_process(adapter, txo,
end_idx);
cmpl++; cmpl++;
} }
if (cmpl) { if (cmpl) {
be_cq_notify(adapter, tx_cq->id, false, cmpl); be_cq_notify(adapter, txo->cq.id, false, cmpl);
atomic_sub(num_wrbs, &txq->used); atomic_sub(num_wrbs, &txq->used);
cmpl = 0; cmpl = 0;
num_wrbs = 0; num_wrbs = 0;
} }
if (atomic_read(&txq->used) == 0)
pending_txqs--;
}
if (atomic_read(&txq->used) == 0 || ++timeo > 200) if (pending_txqs == 0 || ++timeo > 200)
break; break;
mdelay(1); mdelay(1);
} while (true); } while (true);
for_all_tx_queues(adapter, txo, i) {
txq = &txo->q;
if (atomic_read(&txq->used)) if (atomic_read(&txq->used))
dev_err(&adapter->pdev->dev, "%d pending tx-completions\n", dev_err(&adapter->pdev->dev, "%d pending tx-compls\n",
atomic_read(&txq->used)); atomic_read(&txq->used));
/* free posted tx for which compls will never arrive */ /* free posted tx for which compls will never arrive */
while (atomic_read(&txq->used)) { while (atomic_read(&txq->used)) {
sent_skb = sent_skbs[txq->tail]; sent_skb = txo->sent_skb_list[txq->tail];
end_idx = txq->tail; end_idx = txq->tail;
index_adv(&end_idx, num_wrbs = wrb_cnt_for_skb(adapter, sent_skb,
wrb_cnt_for_skb(adapter, sent_skb, &dummy_wrb) - 1, &dummy_wrb);
txq->len); index_adv(&end_idx, num_wrbs - 1, txq->len);
num_wrbs = be_tx_compl_process(adapter, txo, end_idx); num_wrbs = be_tx_compl_process(adapter, txo, end_idx);
atomic_sub(num_wrbs, &txq->used); atomic_sub(num_wrbs, &txq->used);
} }
} }
}
static void be_evt_queues_destroy(struct be_adapter *adapter) static void be_evt_queues_destroy(struct be_adapter *adapter)
{ {
@ -2236,7 +2247,6 @@ static void be_rx_qs_destroy(struct be_adapter *adapter)
static int be_close(struct net_device *netdev) static int be_close(struct net_device *netdev)
{ {
struct be_adapter *adapter = netdev_priv(netdev); struct be_adapter *adapter = netdev_priv(netdev);
struct be_tx_obj *txo;
struct be_eq_obj *eqo; struct be_eq_obj *eqo;
int i; int i;
@ -2259,8 +2269,7 @@ static int be_close(struct net_device *netdev)
/* Wait for all pending tx completions to arrive so that /* Wait for all pending tx completions to arrive so that
* all tx skbs are freed. * all tx skbs are freed.
*/ */
for_all_tx_queues(adapter, txo, i) be_tx_compl_clean(adapter);
be_tx_compl_clean(adapter, txo);
be_rx_qs_destroy(adapter); be_rx_qs_destroy(adapter);
return 0; return 0;