Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b3ba66a authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: fix queue depth check for forming new aggregates 



To improve aggregation length, there should not be more than two fully formed
A-MPDU frames in the hardware queue. To ensure this, the code checks the tx
queue length before forming new A-MPDUs. This can reduce the throughput (or
maybe even starve out A-MPDU traffic) when too many non-aggregated frames are
in the queue.
Fix this by keeping track of pending A-MPDU frames (even when they're sent out
as single frames), but exclude rate control probing frames to improve
performance.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5c405b5c

drivers/net/wireless/ath/ath9k/ath9k.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -189,6 +189,7 @@ struct ath_txq { 
	struct list_head axq_q;

	struct list_head axq_q;

	spinlock_t axq_lock;

	spinlock_t axq_lock;

	u32 axq_depth;

	u32 axq_depth;

	u32 axq_ampdu_depth;

	bool stopped;

	bool stopped;

	bool axq_tx_inprogress;

	bool axq_tx_inprogress;

	struct list_head axq_acq;

	struct list_head axq_acq;

drivers/net/wireless/ath/ath9k/xmit.c

+18 −3
Original line number Original line Diff line number Diff line
@@ -838,7 +838,7 @@ static void ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq, 
		ath_tx_txqaddbuf(sc, txq, &bf_q);

		ath_tx_txqaddbuf(sc, txq, &bf_q);

		TX_STAT_INC(txq->axq_qnum, a_aggr);

		TX_STAT_INC(txq->axq_qnum, a_aggr);





	} while (txq->axq_depth < ATH_AGGR_MIN_QDEPTH &&

	} while (txq->axq_ampdu_depth < ATH_AGGR_MIN_QDEPTH &&

		 status != ATH_AGGR_BAW_CLOSED);

		 status != ATH_AGGR_BAW_CLOSED);

}

}
@@ -999,6 +999,7 @@ struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype) 
		INIT_LIST_HEAD(&txq->axq_acq);

		INIT_LIST_HEAD(&txq->axq_acq);

		spin_lock_init(&txq->axq_lock);

		spin_lock_init(&txq->axq_lock);

		txq->axq_depth = 0;

		txq->axq_depth = 0;

		txq->axq_ampdu_depth = 0;

		txq->axq_tx_inprogress = false;

		txq->axq_tx_inprogress = false;

		sc->tx.txqsetup |= 1<<qnum;

		sc->tx.txqsetup |= 1<<qnum;
@@ -1068,6 +1069,12 @@ int ath_cabq_update(struct ath_softc *sc) 
	return 0;

	return 0;

}

}





static bool bf_is_ampdu_not_probing(struct ath_buf *bf)

{

    struct ieee80211_tx_info *info = IEEE80211_SKB_CB(bf->bf_mpdu);

    return bf_isampdu(bf) && !(info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE);

}



/*

/*

 * Drain a given TX queue (could be Beacon or Data)

 * Drain a given TX queue (could be Beacon or Data)

 *

 *
@@ -1126,7 +1133,8 @@ void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq, bool retry_tx) 
		}

		}





		txq->axq_depth--;

		txq->axq_depth--;



		if (bf_is_ampdu_not_probing(bf))

			txq->axq_ampdu_depth--;

		spin_unlock_bh(&txq->axq_lock);

		spin_unlock_bh(&txq->axq_lock);





		if (bf_isampdu(bf))

		if (bf_isampdu(bf))
@@ -1316,6 +1324,8 @@ static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq, 
		ath9k_hw_txstart(ah, txq->axq_qnum);

		ath9k_hw_txstart(ah, txq->axq_qnum);

	}

	}

	txq->axq_depth++;

	txq->axq_depth++;

	if (bf_is_ampdu_not_probing(bf))

		txq->axq_ampdu_depth++;

}

}





static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_atx_tid *tid,

static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_atx_tid *tid,
@@ -1336,7 +1346,7 @@ static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_atx_tid *tid, 
	 */

	 */

	if (!list_empty(&tid->buf_q) || tid->paused ||

	if (!list_empty(&tid->buf_q) || tid->paused ||

	    !BAW_WITHIN(tid->seq_start, tid->baw_size, fi->seqno) ||

	    !BAW_WITHIN(tid->seq_start, tid->baw_size, fi->seqno) ||

	    txctl->txq->axq_depth >= ATH_AGGR_MIN_QDEPTH) {

	    txctl->txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) {

		/*

		/*

		 * Add this frame to software queue for scheduling later

		 * Add this frame to software queue for scheduling later

		 * for aggregation.

		 * for aggregation.
@@ -2040,6 +2050,9 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq) 
		txq->axq_tx_inprogress = false;

		txq->axq_tx_inprogress = false;

		if (bf_held)

		if (bf_held)

			list_del(&bf_held->list);

			list_del(&bf_held->list);



		if (bf_is_ampdu_not_probing(bf))

			txq->axq_ampdu_depth--;

		spin_unlock_bh(&txq->axq_lock);

		spin_unlock_bh(&txq->axq_lock);





		if (bf_held)

		if (bf_held)
@@ -2168,6 +2181,8 @@ void ath_tx_edma_tasklet(struct ath_softc *sc) 
		INCR(txq->txq_tailidx, ATH_TXFIFO_DEPTH);

		INCR(txq->txq_tailidx, ATH_TXFIFO_DEPTH);

		txq->axq_depth--;

		txq->axq_depth--;

		txq->axq_tx_inprogress = false;

		txq->axq_tx_inprogress = false;

		if (bf_is_ampdu_not_probing(bf))

			txq->axq_ampdu_depth--;

		spin_unlock_bh(&txq->axq_lock);

		spin_unlock_bh(&txq->axq_lock);





		txok = !(txs.ts_status & ATH9K_TXERR_MASK);

		txok = !(txs.ts_status & ATH9K_TXERR_MASK);