ath9k: another fix for the A-MPDU buffer leak
PATCH 1/1 ath9k: another fix for the A-MPDU buffer leak
The patch 'ath9k: fix a buffer leak in A-MPDU completion' addressed the issue of running out of buffers/descriptors in the tx path if a STA is deleted while tx status feedback is still pending.
The remaining issue is that the skbs of the buffers are not reclaimed, leaving a memory leak.
This patch fixes this issue by running the buffers through ath_tx_complete_buf(), ensuring that the pending frames counter is also updated.
Signed-off-by Felix Fietkau <[email protected]>
---
drivers/net/wireless/ath/ath9k/xmit.c +15 -4
@@ -329,7 +329,6 @@ static void ath_tx_complete_aggr(structint isaggr, txfail, txpending, sendbar =0 , needreset =0 , nbad =0 ;bool rc_update = true;struct ieee80211_tx_rate rates[4 ]; -unsigned long flags; skb = bf->bf_mpdu; hdr = (struct ieee80211_hdr *)skb->data;
@@ -346,9 +345,21 @@ static void ath_tx_complete_aggr(structif (!sta) {rcu_read_unlock (); -spin_lock_irqsave (&sc->tx.txbuflock, flags); -list_splice_tail_init (bf_q, &sc->tx.txbuf); -spin_unlock_irqrestore (&sc->tx.txbuflock, flags); +INIT_LIST_HEAD (&bf_head); +while (bf) { + bf_next = bf->bf_next; + + bf->bf_state.bf_type |=BUF_XRETRY ; +if ((sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_EDMA ) || + !bf->bf_stale || bf_next !=NULL ) +list_move_tail (&bf->list, &bf_head); + +ath_tx_rc_status (bf, ts,0 ,0 , false); +ath_tx_complete_buf (sc, bf, txq, &bf_head, ts, +0 ,0 ); + + bf = bf_next; + }return ; }