Commit 658939fc authored by Miri Korenblit's avatar Miri Korenblit Committed by Johannes Berg
Browse files

wifi: iwlwifi: empty overflow queue during flush 



If a TX queue has no space for new TX frames, the driver will keep
these frames in the overflow queue, and during reclaim flow it
will retry to send the frames from that queue.
But if the reclaim flow was invoked from TX queue flush, we will also
TX these frames, which is wrong as we don't want to TX anything
after flush.
This might also cause assert 0x125F when removing the queue,
saying that the driver removes a non-empty queue
Fix this by TXing the overflow queue's frames only if we are
not in flush queue flow.

Fixes: a4450980 ("iwlwifi: move reclaim flows to the queue file")
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20231022173519.caf06c8709d9.Ibf664ccb3f952e836f8fa461ea58fc08e5c46e88@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 4a9bb5b4

drivers/net/wireless/intel/iwlwifi/dvm/tx.c

+3 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright (C) 2019 Intel Corporation

 * Copyright (C) 2023 Intel Corporation

 *****************************************************************************/



#include <linux/kernel.h>
@@ -1169,7 +1170,7 @@ void iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb) 
			iwlagn_check_ratid_empty(priv, sta_id, tid);

		}



		iwl_trans_reclaim(priv->trans, txq_id, ssn, &skbs);

		iwl_trans_reclaim(priv->trans, txq_id, ssn, &skbs, false);



		freed = 0;
@@ -1315,7 +1316,7 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv, 
	 * block-ack window (we assume that they've been successfully

	 * transmitted ... if not, it's too late anyway). */

	iwl_trans_reclaim(priv->trans, scd_flow, ba_resp_scd_ssn,

			  &reclaimed_skbs);

			  &reclaimed_skbs, false);



	IWL_DEBUG_TX_REPLY(priv, "REPLY_COMPRESSED_BA [%d] Received from %pM, "

			   "sta_id = %d\n",

drivers/net/wireless/intel/iwlwifi/iwl-trans.h

+4 −3
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ struct iwl_trans_ops { 
	int (*tx)(struct iwl_trans *trans, struct sk_buff *skb,

		  struct iwl_device_tx_cmd *dev_cmd, int queue);

	void (*reclaim)(struct iwl_trans *trans, int queue, int ssn,

			struct sk_buff_head *skbs);

			struct sk_buff_head *skbs, bool is_flush);



	void (*set_q_ptrs)(struct iwl_trans *trans, int queue, int ptr);
@@ -1274,14 +1274,15 @@ static inline int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb, 
}



static inline void iwl_trans_reclaim(struct iwl_trans *trans, int queue,

				     int ssn, struct sk_buff_head *skbs)

				     int ssn, struct sk_buff_head *skbs,

				     bool is_flush)

{

	if (WARN_ON_ONCE(trans->state != IWL_TRANS_FW_ALIVE)) {

		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans->state);

		return;

	}



	trans->ops->reclaim(trans, queue, ssn, skbs);

	trans->ops->reclaim(trans, queue, ssn, skbs, is_flush);

}



static inline void iwl_trans_set_q_ptrs(struct iwl_trans *trans, int queue,

drivers/net/wireless/intel/iwlwifi/mvm/tx.c

+2 −2
Original line number Diff line number Diff line
@@ -1623,7 +1623,7 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm, 
	seq_ctl = le16_to_cpu(tx_resp->seq_ctl);



	/* we can free until ssn % q.n_bd not inclusive */

	iwl_trans_reclaim(mvm->trans, txq_id, ssn, &skbs);

	iwl_trans_reclaim(mvm->trans, txq_id, ssn, &skbs, false);



	while (!skb_queue_empty(&skbs)) {

		struct sk_buff *skb = __skb_dequeue(&skbs);
@@ -1975,7 +1975,7 @@ static void iwl_mvm_tx_reclaim(struct iwl_mvm *mvm, int sta_id, int tid, 
	 * block-ack window (we assume that they've been successfully

	 * transmitted ... if not, it's too late anyway).

	 */

	iwl_trans_reclaim(mvm->trans, txq, index, &reclaimed_skbs);

	iwl_trans_reclaim(mvm->trans, txq, index, &reclaimed_skbs, is_flush);



	skb_queue_walk(&reclaimed_skbs, skb) {

		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

drivers/net/wireless/intel/iwlwifi/queue/tx.c

+5 −4
Original line number Diff line number Diff line
@@ -1575,7 +1575,7 @@ void iwl_txq_progress(struct iwl_txq *txq) 


/* Frees buffers until index _not_ inclusive */

void iwl_txq_reclaim(struct iwl_trans *trans, int txq_id, int ssn,

		     struct sk_buff_head *skbs)

		     struct sk_buff_head *skbs, bool is_flush)

{

	struct iwl_txq *txq = trans->txqs.txq[txq_id];

	int tfd_num, read_ptr, last_to_free;
@@ -1650,9 +1650,11 @@ void iwl_txq_reclaim(struct iwl_trans *trans, int txq_id, int ssn, 
	if (iwl_txq_space(trans, txq) > txq->low_mark &&

	    test_bit(txq_id, trans->txqs.queue_stopped)) {

		struct sk_buff_head overflow_skbs;

		struct sk_buff *skb;



		__skb_queue_head_init(&overflow_skbs);

		skb_queue_splice_init(&txq->overflow_q, &overflow_skbs);

		skb_queue_splice_init(&txq->overflow_q,

				      is_flush ? skbs : &overflow_skbs);



		/*

		 * We are going to transmit from the overflow queue.
@@ -1672,8 +1674,7 @@ void iwl_txq_reclaim(struct iwl_trans *trans, int txq_id, int ssn, 
		 */

		spin_unlock_bh(&txq->lock);



		while (!skb_queue_empty(&overflow_skbs)) {

			struct sk_buff *skb = __skb_dequeue(&overflow_skbs);

		while ((skb = __skb_dequeue(&overflow_skbs))) {

			struct iwl_device_tx_cmd *dev_cmd_ptr;



			dev_cmd_ptr = *(void **)((u8 *)skb->cb +

drivers/net/wireless/intel/iwlwifi/queue/tx.h

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ void iwl_txq_gen1_update_byte_cnt_tbl(struct iwl_trans *trans, 
				      struct iwl_txq *txq, u16 byte_cnt,

				      int num_tbs);

void iwl_txq_reclaim(struct iwl_trans *trans, int txq_id, int ssn,

		     struct sk_buff_head *skbs);

		     struct sk_buff_head *skbs, bool is_flush);

void iwl_txq_set_q_ptrs(struct iwl_trans *trans, int txq_id, int ptr);

void iwl_trans_txq_freeze_timer(struct iwl_trans *trans, unsigned long txqs,

				bool freeze);