diff mbox series

[v2,v5.7,1/6] iwlwifi: pcie: actually release queue memory in TVQM

Message ID iwlwifi.20200417100405.f5f4c4193ec1.Id5feebc9b4318041913a9c89fc1378bb5454292c@changeid (mailing list archive)
State Accepted
Commit b98b33d5560a2d940f3b80f6768a6177bf3dfbc0
Delegated to: Kalle Valo
Headers show
Series iwlwifi: fixes intended for v5.7 2020-04-03-2 | expand

Commit Message

Luca Coelho April 17, 2020, 7:08 a.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

The iwl_trans_pcie_dyn_txq_free() function only releases the frames
that may be left on the queue by calling iwl_pcie_gen2_txq_unmap(),
but doesn't actually free the DMA ring or byte-count tables for the
queue. This leads to pretty large memory leaks (at least before my
queue size improvements), in particular in monitor/sniffer mode on
channel hopping since this happens on every channel change.

This was also now more evident after the move to a DMA pool for the
byte count tables, showing messages such as

  BUG iwlwifi:bc (...): Objects remaining in iwlwifi:bc on __kmem_cache_shutdown()

This fixes https://bugzilla.kernel.org/show_bug.cgi?id=206811.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Fixes: 6b35ff91572f ("iwlwifi: pcie: introduce a000 TX queues management")
Cc: stable@vger.kernel.org # v4.14+
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Kalle Valo April 21, 2020, 12:40 p.m. UTC | #1 
Luca Coelho <luca@coelho.fi> wrote:

> From: Johannes Berg <johannes.berg@intel.com>
> 
> The iwl_trans_pcie_dyn_txq_free() function only releases the frames
> that may be left on the queue by calling iwl_pcie_gen2_txq_unmap(),
> but doesn't actually free the DMA ring or byte-count tables for the
> queue. This leads to pretty large memory leaks (at least before my
> queue size improvements), in particular in monitor/sniffer mode on
> channel hopping since this happens on every channel change.
> 
> This was also now more evident after the move to a DMA pool for the
> byte count tables, showing messages such as
> 
>   BUG iwlwifi:bc (...): Objects remaining in iwlwifi:bc on __kmem_cache_shutdown()
> 
> This fixes https://bugzilla.kernel.org/show_bug.cgi?id=206811.
> 
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> Fixes: 6b35ff91572f ("iwlwifi: pcie: introduce a000 TX queues management")
> Cc: stable@vger.kernel.org # v4.14+
> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

6 patches applied to wireless-drivers.git, thanks.

b98b33d5560a iwlwifi: pcie: actually release queue memory in TVQM
290d5e495183 iwlwifi: mvm: beacon statistics shouldn't go backwards
d8d663970234 iwlwifi: pcie: indicate correct RB size to device
e5b72e3bc476 iwlwifi: mvm: limit maximum queue appropriately
38af8d5a90a8 iwlwifi: mvm: Do not declare support for ACK Enabled Aggregation
e6d419f94331 iwlwifi: mvm: fix inactive TID removal return value usage
diff mbox series

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
index 86fc00167817..9664dbc70ef1 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
@@ -1418,6 +1418,9 @@  void iwl_trans_pcie_dyn_txq_free(struct iwl_trans *trans, int queue)
 
 	iwl_pcie_gen2_txq_unmap(trans, queue);
 
+	iwl_pcie_gen2_txq_free_memory(trans, trans_pcie->txq[queue]);
+	trans_pcie->txq[queue] = NULL;
+
 	IWL_DEBUG_TX_QUEUES(trans, "Deactivate queue %d\n", queue);
 }