wifi: cfg80211: add statistics for providing overview for MLO station

Currently statistics are handled at link level for multi-link
operation(MLO). There is no provision to check accumulated statistics
for a multi-link(ML) station. Other statistics, such as signal, rates,
are also managed at the link level only.

Statistics such as packets, bytes, signal, rates, etc are useful to
provide overall overview for the ML stations.

Statistics such as packets, bytes are accumulated statistics at MLO level.
However, MLO statistics for rates and signal can not be accumulated since
it won't make much sense. Hence, handle other statistics such as signal,
rates, etc bit differently at MLO level.

The signal could be the best of all links-
e.g. if Link 1 has a signal strength of -70 dBm and Link 2 has -65 dBm,
the signal for MLO will be -65 dBm.

The rate could be determined based on the most recently updated link-
e.g. if link 1 has a rate of 300 Mbps and link 2 has a rate of 450 Mbps,
the MLO rate can be calculated based on the inactivity of each link.
If the inactive time for link 1 is 20 seconds and for link 2 is 10 seconds,
the MLO rate will be the most recently updated rate, which is link 2's
rate of 450 Mbps.

The inactive time, dtim_period and beacon_interval can be taken as the
least value of field from link level.

Similarly, other MLO level applicable fields are handled and the fields
which don't make much sense at MLO level, a subsequent change will handle
to embed NL message.

Hence, add accumulated and other statistics for MLO station if valid links
are present to represent comprehensive overview for the ML stations.

Signed-off-by: Sarika Sharma <quic_sarishar@quicinc.com>
Link: https://patch.msgid.link/20250528054420.3050133-5-quic_sarishar@quicinc.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 0626cd3836b5cde7c049df070270fd81c38381d0..83f6291eac9297340700fb3108b89364b54bb839 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -7176,6 +7176,188 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
        return -EMSGSIZE;
 }
 
+static void cfg80211_sta_set_mld_sinfo(struct station_info *sinfo)
+{
+       struct link_station_info *link_sinfo;
+       int link_id, init = 0;
+       u32 link_inactive_time;
+
+       sinfo->signal = -99;
+
+       for_each_valid_link(sinfo, link_id) {
+               link_sinfo = sinfo->links[link_id];
+               if (!link_sinfo)
+                       continue;
+
+               if ((link_sinfo->filled &
+                    BIT_ULL(NL80211_STA_INFO_TX_PACKETS))) {
+                       sinfo->tx_packets += link_sinfo->tx_packets;
+                       sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_PACKETS);
+               }
+
+               if ((link_sinfo->filled &
+                    BIT_ULL(NL80211_STA_INFO_RX_PACKETS))) {
+                       sinfo->rx_packets += link_sinfo->rx_packets;
+                       sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_PACKETS);
+               }
+
+               if (link_sinfo->filled &
+                   (BIT_ULL(NL80211_STA_INFO_TX_BYTES) |
+                    BIT_ULL(NL80211_STA_INFO_TX_BYTES64))) {
+                       sinfo->tx_bytes += link_sinfo->tx_bytes;
+                       sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BYTES);
+               }
+
+               if (link_sinfo->filled &
+                   (BIT_ULL(NL80211_STA_INFO_RX_BYTES) |
+                    BIT_ULL(NL80211_STA_INFO_TX_BYTES64))) {
+                       sinfo->rx_bytes += link_sinfo->rx_bytes;
+                       sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BYTES);
+               }
+
+               if (link_sinfo->filled &
+                   BIT_ULL(NL80211_STA_INFO_TX_RETRIES)) {
+                       sinfo->tx_retries += link_sinfo->tx_retries;
+                       sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_RETRIES);
+               }
+
+               if (link_sinfo->filled & BIT_ULL(NL80211_STA_INFO_TX_FAILED)) {
+                       sinfo->tx_failed += link_sinfo->tx_failed;
+                       sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_FAILED);
+               }
+
+               if (link_sinfo->filled &
+                   BIT_ULL(NL80211_STA_INFO_RX_DROP_MISC)) {
+                       sinfo->rx_dropped_misc += link_sinfo->rx_dropped_misc;
+                       sinfo->filled |=
+                               BIT_ULL(NL80211_STA_INFO_RX_DROP_MISC);
+               }
+
+               if (link_sinfo->filled &
+                   BIT_ULL(NL80211_STA_INFO_BEACON_LOSS)) {
+                       sinfo->beacon_loss_count +=
+                               link_sinfo->beacon_loss_count;
+                       sinfo->filled |= BIT_ULL(NL80211_STA_INFO_BEACON_LOSS);
+               }
+
+               if (link_sinfo->filled &
+                   BIT_ULL(NL80211_STA_INFO_EXPECTED_THROUGHPUT)) {
+                       sinfo->expected_throughput +=
+                               link_sinfo->expected_throughput;
+                       sinfo->filled |=
+                               BIT_ULL(NL80211_STA_INFO_EXPECTED_THROUGHPUT);
+               }
+
+               if (link_sinfo->filled & BIT_ULL(NL80211_STA_INFO_RX_MPDUS)) {
+                       sinfo->rx_mpdu_count += link_sinfo->rx_mpdu_count;
+                       sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_MPDUS);
+               }
+
+               if (link_sinfo->filled &
+                   BIT_ULL(NL80211_STA_INFO_FCS_ERROR_COUNT)) {
+                       sinfo->fcs_err_count += link_sinfo->fcs_err_count;
+                       sinfo->filled |=
+                               BIT_ULL(NL80211_STA_INFO_FCS_ERROR_COUNT);
+               }
+
+               if (link_sinfo->filled &
+                   BIT_ULL(NL80211_STA_INFO_BEACON_RX)) {
+                       sinfo->rx_beacon += link_sinfo->rx_beacon;
+                       sinfo->filled |= BIT_ULL(NL80211_STA_INFO_BEACON_RX);
+               }
+
+               /* Update MLO signal, signal_avg as best among links */
+               if ((link_sinfo->filled & BIT_ULL(NL80211_STA_INFO_SIGNAL)) &&
+                   link_sinfo->signal > sinfo->signal) {
+                       sinfo->signal = link_sinfo->signal;
+                       sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL);
+               }
+
+               if ((link_sinfo->filled &
+                       BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG)) &&
+                   link_sinfo->signal_avg > sinfo->signal_avg) {
+                       sinfo->signal_avg = link_sinfo->signal_avg;
+                       sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG);
+               }
+
+               /* Update MLO inactive_time, bss_param based on least
+                * value for corresponding field of link.
+                */
+               if ((link_sinfo->filled &
+                    BIT_ULL(NL80211_STA_INFO_INACTIVE_TIME)) &&
+                   (!init ||
+                    link_inactive_time > link_sinfo->inactive_time)) {
+                       link_inactive_time = link_sinfo->inactive_time;
+                       sinfo->inactive_time = link_sinfo->inactive_time;
+                       sinfo->filled |= NL80211_STA_INFO_INACTIVE_TIME;
+               }
+
+               if (link_sinfo->filled & BIT_ULL(NL80211_STA_INFO_BSS_PARAM) &&
+                   (!init ||
+                    sinfo->bss_param.dtim_period >
+                     link_sinfo->bss_param.dtim_period)) {
+                       sinfo->bss_param.dtim_period =
+                               link_sinfo->bss_param.dtim_period;
+                       sinfo->filled |= NL80211_STA_BSS_PARAM_DTIM_PERIOD;
+                       sinfo->bss_param.beacon_interval =
+                               link_sinfo->bss_param.beacon_interval;
+                       sinfo->filled |= NL80211_STA_BSS_PARAM_BEACON_INTERVAL;
+               }
+
+               /* Update MLO rates as per last updated link rate */
+               if ((link_sinfo->filled &
+                    BIT_ULL(NL80211_STA_INFO_TX_BITRATE)) &&
+                   (!init ||
+                    link_inactive_time > link_sinfo->inactive_time)) {
+                       sinfo->txrate = link_sinfo->txrate;
+                       sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);
+               }
+               if ((link_sinfo->filled &
+                    BIT_ULL(NL80211_STA_INFO_RX_BITRATE)) &&
+                   (!init ||
+                    link_inactive_time > link_sinfo->inactive_time)) {
+                       sinfo->rxrate = link_sinfo->rxrate;
+                       sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BITRATE);
+               }
+
+               if (link_sinfo->filled &
+                   BIT_ULL(NL80211_STA_INFO_TX_DURATION) &&
+                   (!init ||
+                    link_inactive_time > link_sinfo->inactive_time)) {
+                       sinfo->tx_duration += link_sinfo->tx_duration;
+                       sinfo->filled |=
+                               BIT_ULL(NL80211_STA_INFO_TX_DURATION);
+               }
+               if (link_sinfo->filled &
+                   BIT_ULL(NL80211_STA_INFO_RX_DURATION) &&
+                   (!init ||
+                    link_inactive_time > link_sinfo->inactive_time)) {
+                       sinfo->rx_duration += link_sinfo->rx_duration;
+                       sinfo->filled |=
+                               BIT_ULL(NL80211_STA_INFO_RX_DURATION);
+               }
+               init++;
+
+               /* pertid stats accumulate for rx/tx fields */
+               if (sinfo->pertid) {
+                       sinfo->pertid->rx_msdu +=
+                               link_sinfo->pertid->rx_msdu;
+                       sinfo->pertid->tx_msdu +=
+                               link_sinfo->pertid->tx_msdu;
+                       sinfo->pertid->tx_msdu_retries +=
+                               link_sinfo->pertid->tx_msdu_retries;
+                       sinfo->pertid->tx_msdu_failed +=
+                               link_sinfo->pertid->tx_msdu_failed;
+
+                       sinfo->pertid->filled |=
+                               BIT(NL80211_TID_STATS_RX_MSDU) |
+                               BIT(NL80211_TID_STATS_TX_MSDU) |
+                               BIT(NL80211_TID_STATS_TX_MSDU_RETRIES) |
+                               BIT(NL80211_TID_STATS_TX_MSDU_FAILED);
+               }
+       }
+}
+
 static int nl80211_dump_station(struct sk_buff *skb,
                                struct netlink_callback *cb)
 {
@@ -7211,6 +7393,9 @@ static int nl80211_dump_station(struct sk_buff *skb,
                if (err)
                        goto out_err;
 
+               if (sinfo.valid_links)
+                       cfg80211_sta_set_mld_sinfo(&sinfo);
+
                if (nl80211_send_station(skb, NL80211_CMD_NEW_STATION,
                                NETLINK_CB(cb->skb).portid,
                                cb->nlh->nlmsg_seq, NLM_F_MULTI,
@@ -7259,6 +7444,9 @@ static int nl80211_get_station(struct sk_buff *skb, struct genl_info *info)
                return -ENOMEM;
        }
 
+       if (sinfo.valid_links)
+               cfg80211_sta_set_mld_sinfo(&sinfo);
+
        if (nl80211_send_station(msg, NL80211_CMD_NEW_STATION,
                                 info->snd_portid, info->snd_seq, 0,
                                 rdev, dev, mac_addr, &sinfo) < 0) {