d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the leakage of dma tags on if_arge. The leak occur when arge_start()

Browse Source 
add some packet(s) to tx ring and arge_stop() is called before receive the
sent packet interrupt from hardware.  Fix arge_stop() to unload the in use
dma tags and free the associated mbuf.

PR:		178319, 163670
Approved by:	adrian (mentor)
This commit is contained in:
loos 2013-09-06 12:47:14 +00:00
parent 63750491ac
commit 3263427a2e
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/mips/atheros/if_arge.c
View File

@ -142,6 +142,7 @@ static int arge_resume(device_t);
static int arge_rx_ring_init(struct arge_softc *);
static void arge_rx_ring_free(struct arge_softc *sc);
static int arge_tx_ring_init(struct arge_softc *);
static void arge_tx_ring_free(struct arge_softc *);
#ifdef DEVICE_POLLING
static int arge_poll(struct ifnet *, enum poll_cmd, int);
#endif
@ -1278,6 +1279,7 @@ arge_stop(struct arge_softc *sc)
/* Flush FIFO and free any existing mbufs */
arge_flush_ddr(sc);
arge_rx_ring_free(sc);
arge_tx_ring_free(sc);
}
@ -1707,6 +1709,30 @@ arge_tx_ring_init(struct arge_softc *sc)
return (0);
}
/*
* Free the Tx ring, unload any pending dma transaction and free the mbuf.
*/
static void
arge_tx_ring_free(struct arge_softc *sc)
{
struct arge_txdesc *txd;
int i;
/* Free the Tx buffers. */
for (i = 0; i < ARGE_TX_RING_COUNT; i++) {
txd = &sc->arge_cdata.arge_txdesc[i];
if (txd->tx_dmamap) {
bus_dmamap_sync(sc->arge_cdata.arge_tx_tag,
txd->tx_dmamap, BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(sc->arge_cdata.arge_tx_tag,
txd->tx_dmamap);
}
if (txd->tx_m)
m_freem(txd->tx_m);
txd->tx_m = NULL;
}
}
/*
* Initialize the RX descriptors and allocate mbufs for them. Note that
* we arrange the descriptors in a closed ring, so that the last descriptor