| developer | f32dabf | 2022-06-01 10:59:24 +0800 | [diff] [blame^] | 1 | From c83d3e3692a758084e4d78fad127043d8789d263 Mon Sep 17 00:00:00 2001 |
| 2 | From: Peter Chiu <chui-hao.chiu@mediatek.com> |
| 3 | Date: Mon, 9 May 2022 16:36:38 +0800 |
| 4 | Subject: [PATCH] mt76: mt7915: drop packets when TWT stations use more tokens |
| 5 | than 128 |
| 6 | |
| 7 | --- |
| 8 | mt7915/mac.c | 21 ++++++++++++++++++--- |
| 9 | mt7915/mt7915.h | 2 ++ |
| 10 | 2 files changed, 20 insertions(+), 3 deletions(-) |
| 11 | |
| 12 | diff --git a/mt7915/mac.c b/mt7915/mac.c |
| 13 | index c73e767b..588c0d58 100644 |
| 14 | --- a/mt7915/mac.c |
| 15 | +++ b/mt7915/mac.c |
| 16 | @@ -1292,6 +1292,7 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, |
| 17 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info->skb); |
| 18 | struct ieee80211_key_conf *key = info->control.hw_key; |
| 19 | struct ieee80211_vif *vif = info->control.vif; |
| 20 | + struct mt7915_sta *msta = NULL; |
| 21 | struct mt76_txwi_cache *t; |
| 22 | struct mt7915_txp *txp; |
| 23 | int id, i, nbuf = tx_info->nbuf - 1; |
| 24 | @@ -1305,8 +1306,6 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, |
| 25 | wcid = &dev->mt76.global_wcid; |
| 26 | |
| 27 | if (sta) { |
| 28 | - struct mt7915_sta *msta; |
| 29 | - |
| 30 | msta = (struct mt7915_sta *)sta->drv_priv; |
| 31 | |
| 32 | if (time_after(jiffies, msta->jiffies + HZ / 4)) { |
| 33 | @@ -1318,10 +1317,22 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, |
| 34 | t = (struct mt76_txwi_cache *)(txwi + mdev->drv->txwi_size); |
| 35 | t->skb = tx_info->skb; |
| 36 | |
| 37 | + spin_lock_bh(&mdev->token_lock); |
| 38 | + if (msta && msta->twt.flowid_mask && msta->token_count > 128) { |
| 39 | + spin_unlock_bh(&mdev->token_lock); |
| 40 | + return -1; |
| 41 | + } |
| 42 | + spin_unlock_bh(&mdev->token_lock); |
| 43 | + |
| 44 | id = mt76_token_consume(mdev, &t); |
| 45 | if (id < 0) |
| 46 | return id; |
| 47 | |
| 48 | + spin_lock_bh(&mdev->token_lock); |
| 49 | + if (msta) |
| 50 | + msta->token_count++; |
| 51 | + spin_unlock_bh(&mdev->token_lock); |
| 52 | + |
| 53 | pid = mt76_tx_status_skb_add(mdev, wcid, tx_info->skb); |
| 54 | mt7915_mac_write_txwi(dev, txwi_ptr, tx_info->skb, wcid, pid, key, |
| 55 | false); |
| 56 | @@ -1513,6 +1524,7 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len) |
| 57 | struct mt76_dev *mdev = &dev->mt76; |
| 58 | struct mt76_txwi_cache *txwi; |
| 59 | struct ieee80211_sta *sta = NULL; |
| 60 | + struct mt7915_sta *msta = NULL; |
| 61 | LIST_HEAD(free_list); |
| 62 | void *end = data + len; |
| 63 | bool v3, wake = false; |
| 64 | @@ -1536,7 +1548,6 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len) |
| 65 | * 1'b0: msdu_id with the same 'wcid pair' as above. |
| 66 | */ |
| 67 | if (info & MT_TX_FREE_PAIR) { |
| 68 | - struct mt7915_sta *msta; |
| 69 | struct mt76_wcid *wcid; |
| 70 | u16 idx; |
| 71 | |
| 72 | @@ -1569,6 +1580,10 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len) |
| 73 | txwi = mt76_token_release(mdev, msdu, &wake); |
| 74 | if (!txwi) |
| 75 | continue; |
| 76 | + spin_lock(&mdev->token_lock); |
| 77 | + if (msta) |
| 78 | + msta->token_count--; |
| 79 | + spin_unlock(&mdev->token_lock); |
| 80 | |
| 81 | mt7915_txwi_free(dev, txwi, sta, &free_list); |
| 82 | } |
| 83 | diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h |
| 84 | index cd54f087..b78b1a9a 100644 |
| 85 | --- a/mt7915/mt7915.h |
| 86 | +++ b/mt7915/mt7915.h |
| 87 | @@ -136,6 +136,8 @@ struct mt7915_sta { |
| 88 | u8 flowid_mask; |
| 89 | struct mt7915_twt_flow flow[MT7915_MAX_STA_TWT_AGRT]; |
| 90 | } twt; |
| 91 | + |
| 92 | + int token_count; |
| 93 | }; |
| 94 | |
| 95 | struct mt7915_vif_cap { |
| 96 | -- |
| 97 | 2.18.0 |
| 98 | |