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 will be embedded into NL message as below:
For MLO:
cmd ->
NL80211_ATTR_IFINDEX
NL80211_ATTR_MAC
NL80211_ATTR_GENERATION
.......etc
NL80211_ATTR_STA_INFO | nested
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 | nested
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 | nested
NL80211_STA_INFO_RX_BYTES,
NL80211_STA_INFO_TX_BYTES,
.........etc
For non-ML:
cmd->
NL80211_ATTR_IFINDEX
NL80211_ATTR_MAC
NL80211_ATTR_GENERATION
....etc
NL80211_ATTR_STA_INFO | nested
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 will 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@xxxxxxxxxxx>
---
include/net/cfg80211.h | 20 +++++++-----
net/wireless/nl80211.c | 74 +++++++++++++++++++++++++++++++++---------
2 files changed, 69 insertions(+), 25 deletions(-)
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index a198b6ee0629..a7f7bfbc87f3 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -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];
};
@@ -8506,9 +8504,13 @@ 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)
{
- if (sinfo->links[0]) {
- kfree(sinfo->links[0]->pertid);
- kfree(sinfo->links[0]);
+ int link_id;
+
+ for_each_valid_link(sinfo, link_id) {
+ if (sinfo->links[link_id]) {
+ kfree(sinfo->links[link_id]->pertid);
+ kfree(sinfo->links[link_id]);
+ }
}
}
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 1f51b295c958..619427513361 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -6867,8 +6867,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) {
@@ -6905,22 +6906,16 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
&sinfo->sta_flags))
goto nla_put_failure;
- if (link_sinfo && 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;
@@ -6929,8 +6924,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 (link_sinfo && !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 (link_sinfo && 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 (link_sinfo && 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;
--
2.34.1
