lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

be2net: Clear pending tx completions before destroying tx queue

Browse Source 
Clear pending tx completions in be_close() (ndo.stop method) so that after
unregister_netdev() calls be_close(), all tx skbs are freed and there are
no more tx completions when txq is destroyed.

Signed-off-by: Sathya Perla <sathyap@serverengines.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sathya Perla
2009-08-10 03:42:43 +00:00
committed by David S. Miller
parent f234164176
commit a8e9179a7d
1 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/net/benet/be_main.c
View File

@@ -1018,21 +1018,35 @@ static void be_rx_q_clean(struct be_adapter *adapter)
BUG_ON(atomic_read(&rxq->used)); BUG_ON(atomic_read(&rxq->used));
} }
static void be_tx_q_clean(struct be_adapter *adapter) static void be_tx_compl_clean(struct be_adapter *adapter)
{ {
struct sk_buff **sent_skbs = adapter->tx_obj.sent_skb_list; struct be_queue_info *tx_cq = &adapter->tx_obj.cq;
struct sk_buff *sent_skb;
struct be_queue_info *txq = &adapter->tx_obj.q; struct be_queue_info *txq = &adapter->tx_obj.q;
u16 last_index; struct be_eth_tx_compl *txcp;
bool dummy_wrb; u16 end_idx, cmpl = 0, timeo = 0;
while (atomic_read(&txq->used)) { /* Wait for a max of 200ms for all the tx-completions to arrive. */
sent_skb = sent_skbs[txq->tail]; do {
last_index = txq->tail; while ((txcp = be_tx_compl_get(tx_cq))) {
index_adv(&last_index, end_idx = AMAP_GET_BITS(struct amap_eth_tx_compl,
wrb_cnt_for_skb(sent_skb, &dummy_wrb) - 1, txq->len); wrb_index, txcp);
be_tx_compl_process(adapter, last_index); be_tx_compl_process(adapter, end_idx);
} cmpl++;
}
if (cmpl) {
be_cq_notify(adapter, tx_cq->id, false, cmpl);
cmpl = 0;
}
if (atomic_read(&txq->used) == 0 || ++timeo > 200)
break;
mdelay(1);
} while (true);
if (atomic_read(&txq->used))
dev_err(&adapter->pdev->dev, "%d pending tx-completions\n",
atomic_read(&txq->used));
} }
static void be_mcc_queues_destroy(struct be_adapter *adapter) static void be_mcc_queues_destroy(struct be_adapter *adapter)
@@ -1091,13 +1105,8 @@ static void be_tx_queues_destroy(struct be_adapter *adapter)
struct be_queue_info *q; struct be_queue_info *q;
q = &adapter->tx_obj.q; q = &adapter->tx_obj.q;
if (q->created) { if (q->created)
be_cmd_q_destroy(adapter, q, QTYPE_TXQ); be_cmd_q_destroy(adapter, q, QTYPE_TXQ);
/* No more tx completions can be rcvd now; clean up if there
* are any pending completions or pending tx requests */
be_tx_q_clean(adapter);
}
be_queue_free(adapter, q); be_queue_free(adapter, q);
q = &adapter->tx_obj.cq; q = &adapter->tx_obj.cq;
@@ -1645,6 +1654,11 @@ static int be_close(struct net_device *netdev)
napi_disable(&rx_eq->napi); napi_disable(&rx_eq->napi);
napi_disable(&tx_eq->napi); napi_disable(&tx_eq->napi);
/* Wait for all pending tx completions to arrive so that
* all tx skbs are freed.
*/
be_tx_compl_clean(adapter);
return 0; return 0;
} }