diff options
| author | Hariprasad Shenai <hariprasad@chelsio.com> | 2016-04-26 20:10:24 +0530 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-26 13:23:57 -0400 |
| commit | fbe8077687330a55e87bc26745d4992991c101ec (patch) | |
| tree | c01c9b317a8c060e5bde68e0f66c399a2b922af5 /drivers/net/ethernet/chelsio | |
| parent | ed98c85ee9a16373f73afeb5bcd7b37b65c2a62f (diff) | |
| download | op-kernel-dev-fbe8077687330a55e87bc26745d4992991c101ec.zip op-kernel-dev-fbe8077687330a55e87bc26745d4992991c101ec.tar.gz | |
cxgb4: Avoids race and deadlock while freeing tx descriptor
There could be race between t4_eth_xmit() and t4_free_sge_resources() while
freeing tx descriptors, take txq lock in t4_free_sge_resources(). We need
to stop the xmit frame path which runs in bottom half context while
unloading the driver using _bh variant of the lock. This is to prevent
the deadlock between xmit and driver unload.
Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/chelsio')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c index 6278e5a..bad253b 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c @@ -3006,7 +3006,9 @@ void t4_free_sge_resources(struct adapter *adap) if (etq->q.desc) { t4_eth_eq_free(adap, adap->mbox, adap->pf, 0, etq->q.cntxt_id); + __netif_tx_lock_bh(etq->txq); free_tx_desc(adap, &etq->q, etq->q.in_use, true); + __netif_tx_unlock_bh(etq->txq); kfree(etq->q.sdesc); free_txq(adap, &etq->q); } |
