2022-09-27 10:04:31

by Felix Fietkau

Subject: [PATCH 6.0] wifi: mt76: fix rate reporting / throughput regression on mt7915 and newer

mt7915 and newer need to report the rate_info that's stored in wcid->rate,
since they don't fill info->status.rates.

Cc: Jonas Jelonek <[email protected]>
Reported-by: Mikhail Gavrilov <[email protected]>
Link: https://lore.kernel.org/all/CABXGCsP0znm9pS-MiKtyxTXR7XiyFVqen0qzNpicGHDZKCzbwg@mail.gmail.com/
Fixes: 44fa75f207d8 ("mac80211: extend current rate control tx status API")
Signed-off-by: Felix Fietkau <[email protected]>
---
drivers/net/wireless/mediatek/mt76/tx.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c
index e67cc7909bce..6c054850363f 100644
--- a/drivers/net/wireless/mediatek/mt76/tx.c
+++ b/drivers/net/wireless/mediatek/mt76/tx.c
@@ -60,14 +60,20 @@ mt76_tx_status_unlock(struct mt76_dev *dev, struct sk_buff_head *list)
.skb = skb,
.info = IEEE80211_SKB_CB(skb),
};
+ struct ieee80211_rate_status rs = {};
struct mt76_tx_cb *cb = mt76_tx_skb_cb(skb);
struct mt76_wcid *wcid;

wcid = rcu_dereference(dev->wcid[cb->wcid]);
if (wcid) {
status.sta = wcid_to_sta(wcid);
- status.rates = NULL;
- status.n_rates = 0;
+ if (status.sta && (wcid->rate.flags || wcid->rate.legacy)) {
+ rs.rate_idx = wcid->rate;
+ status.rates = &rs;
+ status.n_rates = 1;
+ } else {
+ status.n_rates = 0;
+ }
}

hw = mt76_tx_status_get_hw(dev, skb);
--
2.36.1

2022-09-27 12:10:11

by Mikhail Gavrilov

Subject: Re: [PATCH 6.0] wifi: mt76: fix rate reporting / throughput regression on mt7915 and newer

On Tue, Sep 27, 2022 at 2:38 PM Felix Fietkau <[email protected]> wrote:
>
> mt7915 and newer need to report the rate_info that's stored in wcid->rate,
> since they don't fill info->status.rates.
>
> Cc: Jonas Jelonek <[email protected]>
> Reported-by: Mikhail Gavrilov <[email protected]>
> Link: https://lore.kernel.org/all/CABXGCsP0znm9pS-MiKtyxTXR7XiyFVqen0qzNpicGHDZKCzbwg@mail.gmail.com/
> Fixes: 44fa75f207d8 ("mac80211: extend current rate control tx status API")
> Signed-off-by: Felix Fietkau <[email protected]>
> ---
> drivers/net/wireless/mediatek/mt76/tx.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c
> index e67cc7909bce..6c054850363f 100644
> --- a/drivers/net/wireless/mediatek/mt76/tx.c
> +++ b/drivers/net/wireless/mediatek/mt76/tx.c
> @@ -60,14 +60,20 @@ mt76_tx_status_unlock(struct mt76_dev *dev, struct sk_buff_head *list)
> .skb = skb,
> .info = IEEE80211_SKB_CB(skb),
> };
> + struct ieee80211_rate_status rs = {};
> struct mt76_tx_cb *cb = mt76_tx_skb_cb(skb);
> struct mt76_wcid *wcid;
>
> wcid = rcu_dereference(dev->wcid[cb->wcid]);
> if (wcid) {
> status.sta = wcid_to_sta(wcid);
> - status.rates = NULL;
> - status.n_rates = 0;
> + if (status.sta && (wcid->rate.flags || wcid->rate.legacy)) {
> + rs.rate_idx = wcid->rate;
> + status.rates = &rs;
> + status.n_rates = 1;
> + } else {
> + status.n_rates = 0;
> + }
> }
>
> hw = mt76_tx_status_get_hw(dev, skb);
> --
> 2.36.1
>


Thanks, the issue is solved.
Tested-by: Mikhail Gavrilov <[email protected]>

--
Best Regards,
Mike Gavrilov.

2022-10-06 05:36:09

by Kalle Valo

Subject: Re: [PATCH 6.0] wifi: mt76: fix rate reporting / throughput regression on mt7915 and newer

Felix Fietkau <[email protected]> wrote:

> mt7915 and newer need to report the rate_info that's stored in wcid->rate,
> since they don't fill info->status.rates.
>
> Cc: Jonas Jelonek <[email protected]>
> Reported-by: Mikhail Gavrilov <[email protected]>
> Link: https://lore.kernel.org/all/CABXGCsP0znm9pS-MiKtyxTXR7XiyFVqen0qzNpicGHDZKCzbwg@mail.gmail.com/
> Fixes: 44fa75f207d8 ("mac80211: extend current rate control tx status API")
> Signed-off-by: Felix Fietkau <[email protected]>
> Tested-by: Mikhail Gavrilov <[email protected]>

Patch applied to wireless.git, thanks.

6b430f72b2bc wifi: mt76: fix rate reporting / throughput regression on mt7915 and newer

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches