iwlwifi: pcie: fix TX while flushing

When flushing TX queues no new TX should go into the system.
However, in the following scenario we get TX:
1. Queues are stopped and there are packets in overflow queue
2. Station is removed and flush begins
3. Flush empties space, and reclaim path TXes SKB from overflow
   queue.

Note that the fact the queues are stopped during the process
doesn't matter - the packet will be TXed since the TX path
doesn't care if TX queues are stopped or not, just if there is
space in the queue, which there is, since we just freed a
packet.

A fix here is rather complicated, since the flow is very racy.

Change code not to warn if we are TXing from overflow TX.
In case there is TX from both overflow TX and TX path we will
miss a warning we optimally had, but we can live with that.

Make sure we don't return before overflow queue is empty, otherwise
we will think queues are empty, but they will be refilled, resulting
with assert.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Fixes: 3955525d5d17 ("iwlwifi: pcie: buffer packets to avoid overflowing Tx queues")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
index 9e1bcafad786baee76d5e5bdf9d24684fe21ac1f..0ecd90d050e6fb96d4b2c15ea62b68928ae31539 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
@@ -400,6 +400,8 @@ struct iwl_txq {
        u32 id;
        int low_mark;
        int high_mark;
+
+       bool overflow_tx;
 };
 
 static inline dma_addr_t

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index 6c30c88fc41ef5983b332141bf7fbfddd5c9afc4..4b31b0cdbd094ccee7195fae2c374a91062b618b 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -2240,6 +2240,7 @@ static int iwl_trans_pcie_wait_txq_empty(struct iwl_trans *trans, int txq_idx)
        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
        struct iwl_txq *txq;
        unsigned long now = jiffies;
+       bool overflow_tx;
        u8 wr_ptr;
 
        /* Make sure the NIC is still alive in the bus */
@@ -2251,18 +2252,37 @@ static int iwl_trans_pcie_wait_txq_empty(struct iwl_trans *trans, int txq_idx)
 
        IWL_DEBUG_TX_QUEUES(trans, "Emptying queue %d...\n", txq_idx);
        txq = trans_pcie->txq[txq_idx];
+
+       spin_lock_bh(&txq->lock);
+       overflow_tx = txq->overflow_tx ||
+                     !skb_queue_empty(&txq->overflow_q);
+       spin_unlock_bh(&txq->lock);
+
        wr_ptr = READ_ONCE(txq->write_ptr);
 
-       while (txq->read_ptr != READ_ONCE(txq->write_ptr) &&
+       while ((txq->read_ptr != READ_ONCE(txq->write_ptr) ||
+               overflow_tx) &&
               !time_after(jiffies,
                           now + msecs_to_jiffies(IWL_FLUSH_WAIT_MS))) {
                u8 write_ptr = READ_ONCE(txq->write_ptr);
 
-               if (WARN_ONCE(wr_ptr != write_ptr,
+               /*
+                * If write pointer moved during the wait, warn only
+                * if the TX came from op mode. In case TX came from
+                * trans layer (overflow TX) don't warn.
+                */
+               if (WARN_ONCE(wr_ptr != write_ptr && !overflow_tx,
                              "WR pointer moved while flushing %d -> %d\n",
                              wr_ptr, write_ptr))
                        return -ETIMEDOUT;
+               wr_ptr = write_ptr;
+
                usleep_range(1000, 2000);
+
+               spin_lock_bh(&txq->lock);
+               overflow_tx = txq->overflow_tx ||
+                             !skb_queue_empty(&txq->overflow_q);
+               spin_unlock_bh(&txq->lock);
        }
 
        if (txq->read_ptr != txq->write_ptr) {

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
index d8773e0a6062b79c5da50977068498801c6b78c2..9fbd37d23e851caf0042ef2861263815893969cb 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
@@ -1181,6 +1181,15 @@ void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn,
                __skb_queue_head_init(&overflow_skbs);
                skb_queue_splice_init(&txq->overflow_q, &overflow_skbs);
 
+               /*
+                * We are going to transmit from the overflow queue.
+                * Remember this state so that wait_for_txq_empty will know we
+                * are adding more packets to the TFD queue. It cannot rely on
+                * the state of &txq->overflow_q, as we just emptied it, but
+                * haven't TXed the content yet.
+                */
+               txq->overflow_tx = true;
+
                /*
                 * This is tricky: we are in reclaim path which is non
                 * re-entrant, so noone will try to take the access the
@@ -1209,6 +1218,7 @@ void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn,
                        iwl_wake_queue(trans, txq);
 
                spin_lock_bh(&txq->lock);
+               txq->overflow_tx = false;
        }
 
        if (txq->read_ptr == txq->write_ptr) {