@@ -2158,11 +2158,6 @@ struct link_station_info {
* @local_pm: local mesh STA power save mode
* @peer_pm: peer mesh STA power save mode
* @nonpeer_pm: non-peer mesh STA power save mode
- * @mlo_params_valid: Indicates @assoc_link_id and @mld_addr fields are filled
- * by driver. Drivers use this only in cfg80211_new_sta() calls when AP
- * MLD's MLME/SME is offload to driver. Drivers won't fill this
- * information in cfg80211_del_sta_sinfo(), get_station() and
- * dump_station() callbacks.
* @assoc_link_id: Indicates MLO link ID of the AP, with which the station
* completed (re)association. This information filled for both MLO
* and non-MLO STA connections when the AP affiliated with an MLD.
@@ -2176,6 +2171,9 @@ struct link_station_info {
* dump_station() callbacks. User space needs this information to determine
* the accepted and rejected affiliated links of the connected station.
* @assoc_resp_ies_len: Length of @assoc_resp_ies buffer in octets.
+ * @valid_links: bitmap of valid links, or 0 for non-MLO. Drivers fill this
+ * information in cfg80211_new_sta(), cfg80211_del_sta_sinfo(),
+ * get_station() and dump_station() callbacks.
* @links: reference to Link sta entries for MLO STA. For non-MLO STA
* and case where the driver offload link decisions and do not provide
* per-link statistics, all link specific information is accessed
@@ -2203,12 +2201,12 @@ struct station_info {
enum nl80211_mesh_power_mode peer_pm;
enum nl80211_mesh_power_mode nonpeer_pm;
- bool mlo_params_valid;
u8 assoc_link_id;
u8 mld_addr[ETH_ALEN] __aligned(2);
const u8 *assoc_resp_ies;
size_t assoc_resp_ies_len;
+ u16 valid_links;
/* TODO: Need to check and add protection access to links memory */
struct link_station_info *links[IEEE80211_MLD_MAX_NUM_LINKS];
};
@@ -8476,8 +8474,17 @@ int cfg80211_sinfo_alloc_tid_stats(struct link_station_info *sinfo, gfp_t gfp);
*/
static inline void cfg80211_sinfo_release_content(struct station_info *sinfo)
{
- kfree(sinfo->links[0]->pertid);
- kfree(sinfo->links[0]);
+ int link_id;
+
+ if (sinfo->valid_links) {
+ for_each_valid_link(sinfo, link_id) {
+ kfree(sinfo->links[link_id]->pertid);
+ kfree(sinfo->links[link_id]);
+ }
+ } else {
+ kfree(sinfo->links[0]->pertid);
+ kfree(sinfo->links[0]);
+ }
}
/**
@@ -2618,14 +2618,23 @@ static void sta_set_mesh_sinfo(struct sta_info *sta,
static void sta_set_link_sinfo(struct sta_info *sta, struct link_station_info *sinfo,
struct ieee80211_link_data *link_sdata, bool tidstats)
{
- struct link_sta_info *link_sta_info = &sta->deflink;
struct ieee80211_sub_if_data *sdata = sta->sdata;
struct ieee80211_local *local = sdata->local;
struct ieee80211_sta_rx_stats *last_rxstats;
+ struct link_sta_info *link_sta_info;
u32 thr = 0;
- int i, ac, cpu;
+ int i, ac, cpu, link_id;
+
- last_rxstats = sta_get_last_rx_stats(sta, -1);
+ link_id = sinfo->link_id;
+ last_rxstats = sta_get_last_rx_stats(sta, link_id);
+
+ if (link_id < 0)
+ link_sta_info = &sta->deflink;
+ else
+ link_sta_info =
+ rcu_dereference_protected(sta->link[link_id],
+ lockdep_is_held(&local->hw.wiphy->mtx));
/* do before driver, so beacon filtering drivers have a
* chance to e.g. just add the number of filtered beacons
@@ -2634,6 +2643,8 @@ static void sta_set_link_sinfo(struct sta_info *sta, struct link_station_info *s
if (sdata->vif.type == NL80211_IFTYPE_STATION)
sinfo->rx_beacon = link_sdata->u.mgd.count_beacon_signal;
+ memcpy(sinfo->addr, link_sta_info->addr, ETH_ALEN);
+
drv_link_sta_statistics(local, sdata, &sta->sta, sinfo);
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_INACTIVE_TIME) |
BIT_ULL(NL80211_STA_INFO_BSS_PARAM) |
@@ -2646,7 +2657,7 @@ static void sta_set_link_sinfo(struct sta_info *sta, struct link_station_info *s
}
sinfo->inactive_time =
- jiffies_to_msecs(jiffies - ieee80211_sta_last_active(sta, -1));
+ jiffies_to_msecs(jiffies - ieee80211_sta_last_active(sta, link_id));
if (!(sinfo->filled & (BIT_ULL(NL80211_STA_INFO_TX_BYTES64) |
BIT_ULL(NL80211_STA_INFO_TX_BYTES)))) {
@@ -2735,7 +2746,7 @@ static void sta_set_link_sinfo(struct sta_info *sta, struct link_station_info *s
!(sdata->vif.driver_flags & IEEE80211_VIF_BEACON_FILTER)) {
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_BEACON_RX) |
BIT_ULL(NL80211_STA_INFO_BEACON_SIGNAL_AVG);
- sinfo->rx_beacon_signal_avg = ieee80211_ave_rssi(&sdata->vif, -1);
+ sinfo->rx_beacon_signal_avg = ieee80211_ave_rssi(&sdata->vif, link_id);
}
if (ieee80211_hw_check(&sta->local->hw, SIGNAL_DBM) ||
@@ -2775,22 +2786,20 @@ static void sta_set_link_sinfo(struct sta_info *sta, struct link_station_info *s
}
if (!(sinfo->filled & BIT_ULL(NL80211_STA_INFO_TX_BITRATE)) &&
- !sta->sta.valid_links &&
ieee80211_rate_valid(&link_sta_info->tx_stats.last_rate)) {
sta_set_rate_info_tx(sta, &link_sta_info->tx_stats.last_rate,
&sinfo->txrate);
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);
}
- if (!(sinfo->filled & BIT_ULL(NL80211_STA_INFO_RX_BITRATE)) &&
- !sta->sta.valid_links) {
- if (sta_set_rate_info_rx(sta, &sinfo->rxrate, -1) == 0)
+ if (!(sinfo->filled & BIT_ULL(NL80211_STA_INFO_RX_BITRATE))) {
+ if (sta_set_rate_info_rx(sta, &sinfo->rxrate, link_id) == 0)
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BITRATE);
}
if (tidstats && !cfg80211_sinfo_alloc_tid_stats(sinfo, GFP_KERNEL)) {
for (i = 0; i < IEEE80211_NUM_TIDS + 1; i++)
- sta_set_tidstats(sta, &sinfo->pertid[i], i, -1);
+ sta_set_tidstats(sta, &sinfo->pertid[i], i, link_id);
}
sinfo->bss_param.flags = 0;
@@ -2830,10 +2839,13 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo,
bool tidstats)
{
struct ieee80211_sub_if_data *sdata = sta->sdata;
- struct link_station_info *link_sinfo = sinfo->links[0];
- struct ieee80211_link_data *link_sdata = &sdata->deflink;
+ struct link_station_info *link_sinfo;
+ struct ieee80211_link_data *link_sdata;
+ struct link_sta_info *link_sta;
+ int link_id;
sinfo->generation = sdata->local->sta_generation;
+ sinfo->valid_links = sta->sta.valid_links;
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_STA_FLAGS) |
BIT_ULL(NL80211_STA_INFO_CONNECTED_TIME) |
@@ -2870,11 +2882,36 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo,
if (test_sta_flag(sta, WLAN_STA_TDLS_PEER))
sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_TDLS_PEER);
- link_sinfo = kzalloc(sizeof(*link_sinfo), GFP_KERNEL);
- if (!link_sinfo)
- return;
+ if (sinfo->valid_links) {
+ memcpy(sinfo->mld_addr, sta->addr, ETH_ALEN);
+
+ for_each_valid_link(sinfo, link_id) {
+ link_sta =
+ rcu_dereference_protected(sta->link[link_id],
+ lockdep_is_held(&sta->local->hw.wiphy->mtx));
+ if (!link_sta)
+ continue;
- sta_set_link_sinfo(sta, link_sinfo, link_sdata, tidstats);
+ link_sinfo = kzalloc(sizeof(*link_sinfo), GFP_KERNEL);
+ if (!link_sinfo)
+ return;
+
+ link_sinfo->link_id = link_id;
+ link_sdata =
+ rcu_dereference_protected(sdata->link[link_id],
+ lockdep_is_held(&sdata->local->hw.wiphy->mtx));
+ sta_set_link_sinfo(sta, link_sinfo, link_sdata, tidstats);
+ sinfo->links[link_id] = link_sinfo;
+ }
+ } else {
+ link_sinfo = kzalloc(sizeof(*link_sinfo), GFP_KERNEL);
+ if (!link_sinfo)
+ return;
+ link_sinfo->link_id = -1;
+ link_sdata = &sdata->deflink;
+ sta_set_link_sinfo(sta, link_sinfo, link_sdata, tidstats);
+ sinfo->links[0] = link_sinfo;
+ }
}
u32 sta_get_expected_throughput(struct sta_info *sta)
@@ -6843,8 +6843,9 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
const u8 *mac_addr, struct station_info *sinfo)
{
void *hdr;
- struct nlattr *sinfoattr;
- struct link_station_info *link_sinfo = sinfo->links[0];
+ struct nlattr *sinfoattr, *link_sinfoattr, *links, *link;
+ struct link_station_info *link_sinfo;
+ int link_id;
hdr = nl80211hdr_put(msg, portid, seq, flags, cmd);
if (!hdr) {
@@ -6881,22 +6882,16 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
&sinfo->sta_flags))
goto nla_put_failure;
- if (nl80211_fill_link_station(msg, rdev, link_sinfo))
- goto nla_put_failure;
-
- nla_nest_end(msg, sinfoattr);
-
- if (sinfo->assoc_req_ies_len &&
- nla_put(msg, NL80211_ATTR_IE, sinfo->assoc_req_ies_len,
- sinfo->assoc_req_ies))
- goto nla_put_failure;
+ if (sinfo->valid_links) {
+ /* TODO: Add accumulated stats for packets, bytes for
+ * better representation at MLO level.
+ */
- if (sinfo->assoc_resp_ies_len &&
- nla_put(msg, NL80211_ATTR_RESP_IE, sinfo->assoc_resp_ies_len,
- sinfo->assoc_resp_ies))
- goto nla_put_failure;
+ /* Closing nested STA_INFO as MLO links ATTR should not
+ * be in nested STA_INFO
+ */
+ nla_nest_end(msg, sinfoattr);
- if (sinfo->mlo_params_valid) {
if (nla_put_u8(msg, NL80211_ATTR_MLO_LINK_ID,
sinfo->assoc_link_id))
goto nla_put_failure;
@@ -6905,8 +6900,55 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
nla_put(msg, NL80211_ATTR_MLD_ADDR, ETH_ALEN,
sinfo->mld_addr))
goto nla_put_failure;
+
+ links = nla_nest_start(msg, NL80211_ATTR_MLO_LINKS);
+ if (!links)
+ goto nla_put_failure;
+
+ for_each_valid_link(sinfo, link_id) {
+ link_sinfo = sinfo->links[link_id];
+ link = nla_nest_start(msg, link_id + 1);
+ if (!link)
+ goto nla_put_failure;
+
+ if (nla_put_u8(msg, NL80211_ATTR_MLO_LINK_ID,
+ link_id))
+ goto nla_put_failure;
+
+ if (!is_zero_ether_addr(link_sinfo->addr) &&
+ nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN,
+ link_sinfo->addr))
+ goto nla_put_failure;
+
+ link_sinfoattr = nla_nest_start_noflag(msg, NL80211_ATTR_STA_INFO);
+ if (!link_sinfoattr)
+ goto nla_put_failure;
+
+ if (nl80211_fill_link_station(msg, rdev, link_sinfo))
+ goto nla_put_failure;
+
+ nla_nest_end(msg, link_sinfoattr);
+ nla_nest_end(msg, link);
+ }
+ nla_nest_end(msg, links);
+ } else {
+ link_sinfo = sinfo->links[0];
+ if (nl80211_fill_link_station(msg, rdev, link_sinfo))
+ goto nla_put_failure;
+
+ nla_nest_end(msg, sinfoattr);
}
+ if (sinfo->assoc_req_ies_len &&
+ nla_put(msg, NL80211_ATTR_IE, sinfo->assoc_req_ies_len,
+ sinfo->assoc_req_ies))
+ goto nla_put_failure;
+
+ if (sinfo->assoc_resp_ies_len &&
+ nla_put(msg, NL80211_ATTR_RESP_IE, sinfo->assoc_resp_ies_len,
+ sinfo->assoc_resp_ies))
+ goto nla_put_failure;
+
cfg80211_sinfo_release_content(sinfo);
genlmsg_end(msg, hdr);
return 0;
Currently, statistics is supported at deflink( or one of the links) level for station. This has problems when applied to multi-link(ML) connections. Hence, add changes to support link level statistics in sinfo structure. Additionally, remove mlo_params_valid from the sinfo structure and add valid_links to indicate bitmap of valid links for MLO. This will be helpful to check the link related statistics during MLO. The statistics could be embedded into NL message as below: For MLO: cmd -> NL80211_ATTR_IFINDEX NL80211_ATTR_MAC NL80211_ATTR_GENERATION .......etc NL80211_ATTR_STA_INFO | nest flag NL80211_STA_INFO_CONNECTED_TIME, NL80211_STA_INFO_STA_FLAGS, ........etc NL80211_ATTR_MLO_LINK_ID, NL80211_ATTR_MLD_ADDR, NL80211_ATTR_MLO_LINKS | nested link_id-1 | nested NL80211_ATTR_MLO_LINK_ID, NL80211_ATTR_MAC, NL80211_ATTR_STA_INFO | nest flag NL80211_STA_INFO_RX_BYTES, NL80211_STA_INFO_TX_BYTES, ..........etc. link_id-2 | nested NL80211_ATTR_MLO_LINK_ID, NL80211_ATTR_MAC, NL80211_ATTR_STA_INFO | nest flag NL80211_STA_INFO_RX_BYTES, NL80211_STA_INFO_TX_BYTES, .........etc For non-ML: cmd-> NL80211_ATTR_IFINDEX NL80211_ATTR_MAC NL80211_ATTR_GENERATION .... NL80211_ATTR_STA_INFO | nest flag NL80211_STA_INFO_CONNECTED_TIME, NL80211_STA_INFO_STA_FLAGS, NL80211_STA_INFO_RX_BYTES, NL80211_STA_INFO_TX_BYTES, .........etc The output of iw dev wlan0 station dump for MLO could look like below: Station 00:03:7f:04:31:78 (on wlan0) authorized: yes authenticated: yes associated: yes preamble: long WMM/WME: yes MFP: yes TDLS peer: no connected time: 383 seconds associated at [boottime]: 93.740s associated at: 93685 ms current time: 340046 ms MLD address: 00:03:7f:04:31:78 Link 0: Address: 00:03:7f:04:31:78 inactive time: 330120 ms rx bytes: 116 rx packets: 3 tx bytes: 0 tx packets: 0 tx retries: 0 tx failed: 0 rx drop misc: 0 signal: -95 dBm tx bitrate: 6.0 MBit/s tx duration: 2669 us rx duration: 0 us DTIM period: 2 beacon interval:100 Link 1: Address: 00:03:7f:04:31:79 inactive time: 81268 ms rx bytes: 1323 rx packets: 12 tx bytes: 1538 tx packets: 8 tx retries: 0 tx failed: 0 rx drop misc: 0 signal: -95 dBm tx bitrate: 6.0 MBit/s tx duration: 2669 us rx bitrate: 6.0 MBit/s rx duration: 0 us DTIM period: 2 beacon interval:100 Signed-off-by: Sarika Sharma <quic_sarishar@quicinc.com> --- include/net/cfg80211.h | 23 ++++++++----- net/mac80211/sta_info.c | 69 +++++++++++++++++++++++++++++--------- net/wireless/nl80211.c | 74 ++++++++++++++++++++++++++++++++--------- 3 files changed, 126 insertions(+), 40 deletions(-)