> From: Ben Greear <greearb@xxxxxxxxxxxxxxx>
>
> The tx status callback is not called for every frame, so
> those specific counters under-count, but at least they give
> some idea of what is going on.
>
> Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
> ---
> .../net/wireless/mediatek/mt76/mt7915/main.c | 116 +++++++++++++++++-
> 1 file changed, 110 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
> index d0288fe2abdf..de083008663e 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
> @@ -1068,6 +1068,35 @@ static const char mt7915_gstrings_stats[][ETH_GSTRING_LEN] = {
> "tx_msdu_pack_6",
> "tx_msdu_pack_7",
> "tx_msdu_pack_8",
> + /* per vif counters */
> + "v_tx_mpdu_attempts",
> + "v_tx_mpdu_fail",
> + "v_tx_mpdu_retry",
> + "v_tx_mode_cck",
> + "v_tx_mode_ofdm",
> + "v_tx_mode_ht",
> + "v_tx_mode_ht_gf",
> + "v_tx_mode_vht",
> + "v_tx_mode_he_su",
> + "v_tx_mode_he_ext_su",
> + "v_tx_mode_he_tb",
> + "v_tx_mode_he_mu",
> + "v_tx_bw_20",
> + "v_tx_bw_40",
> + "v_tx_bw_80",
> + "v_tx_bw_160",
> + "v_tx_mcs_0",
> + "v_tx_mcs_1",
> + "v_tx_mcs_2",
> + "v_tx_mcs_3",
> + "v_tx_mcs_4",
> + "v_tx_mcs_5",
> + "v_tx_mcs_6",
> + "v_tx_mcs_7",
> + "v_tx_mcs_8",
> + "v_tx_mcs_9",
> + "v_tx_mcs_10",
> + "v_tx_mcs_11",
> };
>
> #define MT7915_SSTATS_LEN ARRAY_SIZE(mt7915_gstrings_stats)
> @@ -1097,14 +1126,15 @@ void mt7915_get_et_stats(struct ieee80211_hw *hw,
> {
> struct mt7915_dev *dev = mt7915_hw_dev(hw);
> struct mt7915_phy *phy = mt7915_hw_phy(hw);
> -
> - /* TODO: These are mostly dev-wide stats at this point.
> - * Get some per-vif stats?
> - */
> + struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
> + struct mt76_wcid *wcid;
> + struct mt7915_sta *msta;
> + struct mt7915_sta_stats *mstats;
> + bool found_sta = false;
>
> /* See mt7915_ampdu_stat_read_phy, etc */
> bool ext_phy = phy != &dev->phy;
> - int i, n, cnt;
> + int i, j, n, cnt, next_ei;
> int ei = 0;
>
> if (!phy)
> @@ -1158,7 +1188,81 @@ void mt7915_get_et_stats(struct ieee80211_hw *hw,
> for (i = 0; i < 8; i++)
> data[ei++] = mt76_rr(dev, MT_PLE_AMSDU_PACK_MSDU_CNT(i));
>
> - WARN_ON(ei != MT7915_SSTATS_LEN);
> + /* Add values for all stations owned by this vif */
> +
> + /* See mt76_get_min_avr_rssi for example of how to find all sta
> + * for a vif
> + */
> + local_bh_disable();
> + rcu_read_lock();
> +
> + next_ei = ei;
> +
> + for (i = 0; i < ARRAY_SIZE(dev->mt76.wcid_mask); i++) {
> + u32 mask = dev->mt76.wcid_mask[i];
> + u32 phy_mask = dev->mt76.wcid_phy_mask[i];
> + int q;
> +
> + if (!mask)
> + continue;
> +
> + for (j = i * 32; mask; j++, mask >>= 1, phy_mask >>= 1) {
> + if (!(mask & 1))
> + continue;
> +
> + if (!!(phy_mask & 1) != ext_phy)
> + continue;
> +
> + wcid = rcu_dereference(dev->mt76.wcid[j]);
> + if (!wcid)
> + continue;
I think you can use ieee80211_iterate_stations_atomic() here
Regards,
Lorenzo
> +
> + msta = container_of(wcid, struct mt7915_sta, wcid);
> +
> + if (msta->vif != mvif)
> + continue;
> +
> + ei = next_ei;
> + mstats = &msta->stats;
> + data[ei++] += mstats->tx_mpdu_attempts;
> + data[ei++] += mstats->tx_mpdu_fail;
> + data[ei++] += mstats->tx_mpdu_retry;
> + data[ei++] += mstats->tx_mode[MT_PHY_TYPE_CCK];
> + data[ei++] += mstats->tx_mode[MT_PHY_TYPE_OFDM];
> + data[ei++] += mstats->tx_mode[MT_PHY_TYPE_HT];
> + data[ei++] += mstats->tx_mode[MT_PHY_TYPE_HT_GF];
> + data[ei++] += mstats->tx_mode[MT_PHY_TYPE_VHT];
> + data[ei++] += mstats->tx_mode[MT_PHY_TYPE_HE_SU];
> + data[ei++] += mstats->tx_mode[MT_PHY_TYPE_HE_EXT_SU];
> + data[ei++] += mstats->tx_mode[MT_PHY_TYPE_HE_TB];
> + data[ei++] += mstats->tx_mode[MT_PHY_TYPE_HE_MU];
> +
> + for (q = 0; q < ARRAY_SIZE(mstats->tx_bw); q++)
> + data[ei++] += mstats->tx_bw[q];
> +
> + for (q = 0; q < 12; q++)
> + data[ei++] += mstats->tx_mcs[q];
> + found_sta = true;
> + }
> + }
> +
> + rcu_read_unlock();
> + local_bh_enable();
> +
> + /* If we have no stations above, then we will not have filled out
> + * the STA stats. Zero those stats.
> + */
> + if (!found_sta) {
> + int q;
> +
> + for (q = 0; q < 28; q++)
> + data[ei++] = 0;
> + }
> +
> + if (ei != MT7915_SSTATS_LEN) {
> + pr_err("ei: %d MT7915_SSTATS_LEN: %d", ei, (int)(MT7915_SSTATS_LEN));
> + WARN_ON_ONCE(ei != MT7915_SSTATS_LEN);
> + }
> }
>
> const struct ieee80211_ops mt7915_ops = {
> --
> 2.20.1
>
Attachment:
signature.asc
Description: PGP signature
