* [PATCH 1/2] mt76: mt7915: reset token when mac_reset happens
@ 2020-12-09 18:31 Ryder Lee
2020-12-09 18:31 ` [PATCH 2/2] mt76: mt7615: " Ryder Lee
2020-12-09 18:41 ` [PATCH 1/2] mt76: mt7915: " Lorenzo Bianconi
0 siblings, 2 replies; 3+ messages in thread
From: Ryder Lee @ 2020-12-09 18:31 UTC (permalink / raw)
To: Felix Fietkau, Lorenzo Bianconi
Cc: Shayne Chen, linux-wireless, linux-mediatek, Ryder Lee
Reset buffering token in mt7915_mac_reset_work() to avoid possible leakege,
which leads to Tx stop after mac reset.
Tested-by: Bo Jiao <bo.jiao@mediatek.com>
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
---
.../net/wireless/mediatek/mt76/mt7915/init.c | 17 +-------------
.../net/wireless/mediatek/mt76/mt7915/mac.c | 23 +++++++++++++++++++
.../wireless/mediatek/mt76/mt7915/mt7915.h | 1 +
3 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
index ff29a8090739..255ccd7e3d27 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
@@ -672,27 +672,12 @@ int mt7915_register_device(struct mt7915_dev *dev)
void mt7915_unregister_device(struct mt7915_dev *dev)
{
- struct mt76_txwi_cache *txwi;
- int id;
-
mt7915_unregister_ext_phy(dev);
mt76_unregister_device(&dev->mt76);
mt7915_mcu_exit(dev);
mt7915_dma_cleanup(dev);
- spin_lock_bh(&dev->token_lock);
- idr_for_each_entry(&dev->token, txwi, id) {
- mt7915_txp_skb_unmap(&dev->mt76, txwi);
- if (txwi->skb) {
- struct ieee80211_hw *hw;
-
- hw = mt76_tx_status_get_hw(&dev->mt76, txwi->skb);
- ieee80211_free_txskb(hw, txwi->skb);
- }
- mt76_put_txwi(&dev->mt76, txwi);
- }
- spin_unlock_bh(&dev->token_lock);
- idr_destroy(&dev->token);
+ mt7915_tx_token_put(dev);
mt76_free_device(&dev->mt76);
}
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index 7f08c88d3282..25623e450bc5 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -1466,6 +1466,26 @@ mt7915_dma_reset(struct mt7915_phy *phy)
MT_WFDMA1_GLO_CFG_TX_DMA_EN | MT_WFDMA1_GLO_CFG_RX_DMA_EN);
}
+void mt7915_tx_token_put(struct mt7915_dev *dev);
+{
+ struct mt76_txwi_cache *txwi;
+ int id;
+
+ spin_lock_bh(&dev->token_lock);
+ idr_for_each_entry(&dev->token, txwi, id) {
+ mt7915_txp_skb_unmap(&dev->mt76, txwi);
+ if (txwi->skb) {
+ struct ieee80211_hw *hw;
+
+ hw = mt76_tx_status_get_hw(&dev->mt76, txwi->skb);
+ ieee80211_free_txskb(hw, txwi->skb);
+ }
+ mt76_put_txwi(&dev->mt76, txwi);
+ }
+ spin_unlock_bh(&dev->token_lock);
+ idr_destroy(&dev->token);
+}
+
/* system error recovery */
void mt7915_mac_reset_work(struct work_struct *work)
{
@@ -1506,6 +1526,9 @@ void mt7915_mac_reset_work(struct work_struct *work)
mt76_wr(dev, MT_MCU_INT_EVENT, MT_MCU_INT_EVENT_DMA_STOPPED);
+ mt7915_tx_token_put(dev);
+ idr_init(&dev->token);
+
if (mt7915_wait_reset_state(dev, MT_MCU_CMD_RESET_DONE)) {
mt7915_dma_reset(&dev->phy);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index 5bf76c74373f..3cee1cffc95e 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -468,6 +468,7 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
struct ieee80211_sta *sta,
struct mt76_tx_info *tx_info);
void mt7915_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);
+void mt7915_tx_token_put(struct mt7915_dev *dev);
int mt7915_init_tx_queues(struct mt7915_phy *phy, int idx, int n_desc);
void mt7915_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
struct sk_buff *skb);
--
2.18.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] mt76: mt7615: reset token when mac_reset happens
2020-12-09 18:31 [PATCH 1/2] mt76: mt7915: reset token when mac_reset happens Ryder Lee
@ 2020-12-09 18:31 ` Ryder Lee
2020-12-09 18:41 ` [PATCH 1/2] mt76: mt7915: " Lorenzo Bianconi
1 sibling, 0 replies; 3+ messages in thread
From: Ryder Lee @ 2020-12-09 18:31 UTC (permalink / raw)
To: Felix Fietkau, Lorenzo Bianconi
Cc: Shayne Chen, linux-wireless, linux-mediatek, Ryder Lee
Reset token in mt7615_mac_reset_work() to avoid possible leakege.
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
---
.../net/wireless/mediatek/mt76/mt7615/mac.c | 19 +++++++++++++++++++
.../wireless/mediatek/mt76/mt7615/mt7615.h | 2 +-
.../wireless/mediatek/mt76/mt7615/pci_init.c | 12 +-----------
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index 9e0765ddcb5f..ff1a601000d6 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -2067,6 +2067,22 @@ void mt7615_dma_reset(struct mt7615_dev *dev)
}
EXPORT_SYMBOL_GPL(mt7615_dma_reset);
+void mt7615_tx_token_put(struct mt7615_dev *dev);
+{
+ struct mt76_txwi_cache *txwi;
+ int id;
+
+ spin_lock_bh(&dev->token_lock);
+ idr_for_each_entry(&dev->token, txwi, id) {
+ mt7615_txp_skb_unmap(&dev->mt76, txwi);
+ if (txwi->skb)
+ dev_kfree_skb_any(txwi->skb);
+ mt76_put_txwi(&dev->mt76, txwi);
+ }
+ spin_unlock_bh(&dev->token_lock);
+ idr_destroy(&dev->token);
+}
+
void mt7615_mac_reset_work(struct work_struct *work)
{
struct mt7615_phy *phy2;
@@ -2110,6 +2126,9 @@ void mt7615_mac_reset_work(struct work_struct *work)
mt76_wr(dev, MT_MCU_INT_EVENT, MT_MCU_INT_EVENT_PDMA_STOPPED);
+ mt7615_tx_token_put(dev);
+ idr_init(&dev->token);
+
if (mt7615_wait_reset_state(dev, MT_MCU_CMD_RESET_DONE)) {
mt7615_dma_reset(dev);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index 99b8abdbb08f..50e729906fa9 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -583,7 +583,7 @@ int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
struct mt76_tx_info *tx_info);
void mt7615_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);
-
+void mt7615_tx_token_put(struct mt7915_dev *dev);
void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
struct sk_buff *skb);
void mt7615_sta_ps(struct mt76_dev *mdev, struct ieee80211_sta *sta, bool ps);
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c
index 27fcb1374685..58a0ec1bf8d7 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c
@@ -160,9 +160,7 @@ int mt7615_register_device(struct mt7615_dev *dev)
void mt7615_unregister_device(struct mt7615_dev *dev)
{
- struct mt76_txwi_cache *txwi;
bool mcu_running;
- int id;
mcu_running = mt7615_wait_for_mcu_init(dev);
@@ -172,15 +170,7 @@ void mt7615_unregister_device(struct mt7615_dev *dev)
mt7615_mcu_exit(dev);
mt7615_dma_cleanup(dev);
- spin_lock_bh(&dev->token_lock);
- idr_for_each_entry(&dev->token, txwi, id) {
- mt7615_txp_skb_unmap(&dev->mt76, txwi);
- if (txwi->skb)
- dev_kfree_skb_any(txwi->skb);
- mt76_put_txwi(&dev->mt76, txwi);
- }
- spin_unlock_bh(&dev->token_lock);
- idr_destroy(&dev->token);
+ mt7615_tx_token_put(dev);
tasklet_disable(&dev->irq_tasklet);
--
2.18.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] mt76: mt7915: reset token when mac_reset happens
2020-12-09 18:31 [PATCH 1/2] mt76: mt7915: reset token when mac_reset happens Ryder Lee
2020-12-09 18:31 ` [PATCH 2/2] mt76: mt7615: " Ryder Lee
@ 2020-12-09 18:41 ` Lorenzo Bianconi
1 sibling, 0 replies; 3+ messages in thread
From: Lorenzo Bianconi @ 2020-12-09 18:41 UTC (permalink / raw)
To: Ryder Lee; +Cc: Felix Fietkau, Shayne Chen, linux-wireless, linux-mediatek
[-- Attachment #1: Type: text/plain, Size: 4128 bytes --]
> Reset buffering token in mt7915_mac_reset_work() to avoid possible leakege,
> which leads to Tx stop after mac reset.
>
> Tested-by: Bo Jiao <bo.jiao@mediatek.com>
> Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
> ---
> .../net/wireless/mediatek/mt76/mt7915/init.c | 17 +-------------
> .../net/wireless/mediatek/mt76/mt7915/mac.c | 23 +++++++++++++++++++
> .../wireless/mediatek/mt76/mt7915/mt7915.h | 1 +
> 3 files changed, 25 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
> index ff29a8090739..255ccd7e3d27 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c
> @@ -672,27 +672,12 @@ int mt7915_register_device(struct mt7915_dev *dev)
>
> void mt7915_unregister_device(struct mt7915_dev *dev)
> {
> - struct mt76_txwi_cache *txwi;
> - int id;
> -
> mt7915_unregister_ext_phy(dev);
> mt76_unregister_device(&dev->mt76);
> mt7915_mcu_exit(dev);
> mt7915_dma_cleanup(dev);
>
> - spin_lock_bh(&dev->token_lock);
> - idr_for_each_entry(&dev->token, txwi, id) {
> - mt7915_txp_skb_unmap(&dev->mt76, txwi);
> - if (txwi->skb) {
> - struct ieee80211_hw *hw;
> -
> - hw = mt76_tx_status_get_hw(&dev->mt76, txwi->skb);
> - ieee80211_free_txskb(hw, txwi->skb);
> - }
> - mt76_put_txwi(&dev->mt76, txwi);
it seems to me you are not using latest codebase here. I guess you are missing
the commit below:
commit 5342758d5522dbf8081360be9c8545bac84b80f3
Author: Felix Fietkau <nbd@nbd.name>
Date: Sat Nov 21 16:00:14 2020 +0100
mt76: mt7915: stop queues when running out of tx tokens
Avoids packet drops under load with lots of stations
Regards,
Lorenzo
> - }
> - spin_unlock_bh(&dev->token_lock);
> - idr_destroy(&dev->token);
> + mt7915_tx_token_put(dev);
>
> mt76_free_device(&dev->mt76);
> }
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
> index 7f08c88d3282..25623e450bc5 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
> @@ -1466,6 +1466,26 @@ mt7915_dma_reset(struct mt7915_phy *phy)
> MT_WFDMA1_GLO_CFG_TX_DMA_EN | MT_WFDMA1_GLO_CFG_RX_DMA_EN);
> }
>
> +void mt7915_tx_token_put(struct mt7915_dev *dev);
> +{
> + struct mt76_txwi_cache *txwi;
> + int id;
> +
> + spin_lock_bh(&dev->token_lock);
> + idr_for_each_entry(&dev->token, txwi, id) {
> + mt7915_txp_skb_unmap(&dev->mt76, txwi);
> + if (txwi->skb) {
> + struct ieee80211_hw *hw;
> +
> + hw = mt76_tx_status_get_hw(&dev->mt76, txwi->skb);
> + ieee80211_free_txskb(hw, txwi->skb);
> + }
> + mt76_put_txwi(&dev->mt76, txwi);
> + }
> + spin_unlock_bh(&dev->token_lock);
> + idr_destroy(&dev->token);
> +}
> +
> /* system error recovery */
> void mt7915_mac_reset_work(struct work_struct *work)
> {
> @@ -1506,6 +1526,9 @@ void mt7915_mac_reset_work(struct work_struct *work)
>
> mt76_wr(dev, MT_MCU_INT_EVENT, MT_MCU_INT_EVENT_DMA_STOPPED);
>
> + mt7915_tx_token_put(dev);
> + idr_init(&dev->token);
> +
> if (mt7915_wait_reset_state(dev, MT_MCU_CMD_RESET_DONE)) {
> mt7915_dma_reset(&dev->phy);
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> index 5bf76c74373f..3cee1cffc95e 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
> @@ -468,6 +468,7 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
> struct ieee80211_sta *sta,
> struct mt76_tx_info *tx_info);
> void mt7915_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);
> +void mt7915_tx_token_put(struct mt7915_dev *dev);
> int mt7915_init_tx_queues(struct mt7915_phy *phy, int idx, int n_desc);
> void mt7915_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
> struct sk_buff *skb);
> --
> 2.18.0
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-09 18:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-09 18:31 [PATCH 1/2] mt76: mt7915: reset token when mac_reset happens Ryder Lee
2020-12-09 18:31 ` [PATCH 2/2] mt76: mt7615: " Ryder Lee
2020-12-09 18:41 ` [PATCH 1/2] mt76: mt7915: " Lorenzo Bianconi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).