diff mbox series

[v3,08/12] wifi: cfg80211: add flag to indicate driver supports ML station statistics

Message ID 20250213171632.1646538-9-quic_sarishar@quicinc.com
State New
Headers show
Series wifi: cfg80211/mac80211: add support to handle per link statistics of multi-link station | expand

Commit Message

Sarika Sharma Feb. 13, 2025, 5:16 p.m. UTC 
Currently, while filling the link level station statistics, valid_links
is checked. There might be the case when driver offload link station
statistics and does not provide per-link statistics.

Hence, add flag WIPHY_FLAG_SUPPORTS_MLO_STA_PER_LINK_STATS in wiphy
structure to indicate that driver supports per link station statistics.
Set this flag during hw_register if driver supports per-link station
statistics and check this flag while filling the station_info structure
for MLO.

Signed-off-by: Sarika Sharma <quic_sarishar@quicinc.com>
---
 drivers/net/wireless/ath/ath12k/mac.c | 1 +
 include/net/cfg80211.h                | 9 ++++++++-
 net/mac80211/sta_info.c               | 4 +++-
 net/wireless/nl80211.c                | 2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

Comments

Sarika Sharma March 3, 2025, 8:49 a.m. UTC | #1 
On 2/28/2025 6:54 PM, Johannes Berg wrote:
> 
>> +++ b/include/net/cfg80211.h
>> @@ -2158,6 +2158,9 @@ 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
>> + * @is_per_link_stats_support: 0- for non-ML STA and for ML STA,if driver
>> + *	offload link decisions and do not provide per-link statistics.
>> + *	1- if driver provides per-link statistics.
> 
> Seems like that should be false/true since it's bool, but I also don't
> really see why you need to list the values at all.

I intended for true-1, false-0, will add actual true/false as it's 
misleading.

> 
> Or even need this extra value at all since you have
> WIPHY_FLAG_SUPPORTS_MLO_STA_PER_LINK_STATS?? And perhaps that should
> rather be an nl80211 flag so userspace knows what to expect? Not sure it
> would care though.

Yes, Flag directly can be used everywhere but at some use case we are 
not having wiphy structure, there either we have to pass an extra 
argument, or need to fetch back wiphy structure and check.
So instead, added a boolean in sinfo structure.

For eg: in cfg80211_sinfo_release_content() only sinfo is passed, so 
instead of passing an additional argument everywhere, added a flag in 
sinfo itself.

> 
>> +++ b/net/mac80211/sta_info.c
> 
> Don't mix that in where not needed for API changes.

Sure, will split this patch.

> 
> johannes
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 82fc1a5d71e8..7767971ae4c8 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -10942,6 +10942,7 @@  static int ath12k_mac_hw_register(struct ath12k_hw *ah)
 	 * once WIPHY_FLAG_SUPPORTS_MLO is enabled.
 	 */
 	wiphy->flags |= WIPHY_FLAG_DISABLE_WEXT;
+	wiphy->flags |= WIPHY_FLAG_SUPPORTS_MLO_STA_PER_LINK_STATS;
 
 	/* Copy over MLO related capabilities received from
 	 * WMI_SERVICE_READY_EXT2_EVENT if single_chip_mlo_supp is set.
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index e07eb657fdfe..eb0fba002776 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -2158,6 +2158,9 @@  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
+ * @is_per_link_stats_support: 0- for non-ML STA and for ML STA,if driver
+ *	offload link decisions and do not provide per-link statistics.
+ *	1- if driver provides per-link statistics.
  * @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.
@@ -2201,6 +2204,7 @@  struct station_info {
 	enum nl80211_mesh_power_mode peer_pm;
 	enum nl80211_mesh_power_mode nonpeer_pm;
 
+	bool is_per_link_stats_support;
 	u8 assoc_link_id;
 	u8 mld_addr[ETH_ALEN] __aligned(2);
 	const u8 *assoc_resp_ies;
@@ -5062,6 +5066,8 @@  struct cfg80211_ops {
  * @WIPHY_FLAG_SUPPORTS_NSTR_NONPRIMARY: support connection to non-primary link
  *	of an NSTR mobile AP MLD.
  * @WIPHY_FLAG_DISABLE_WEXT: disable wireless extensions for this device
+ * @WIPHY_FLAG_SUPPORTS_MLO_STA_PER_LINK_STATS: The driver does not offload
+ *	link decisions and provide per-link statistics for MLO STA.
  */
 enum wiphy_flags {
 	WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK		= BIT(0),
@@ -5090,6 +5096,7 @@  enum wiphy_flags {
 	WIPHY_FLAG_HAS_CHANNEL_SWITCH		= BIT(23),
 	WIPHY_FLAG_NOTIFY_REGDOM_BY_DRIVER	= BIT(24),
 	WIPHY_FLAG_CHANNEL_CHANGE_ON_BEACON     = BIT(25),
+	WIPHY_FLAG_SUPPORTS_MLO_STA_PER_LINK_STATS = BIT(26),
 };
 
 /**
@@ -8503,7 +8510,7 @@  static inline void cfg80211_sinfo_release_content(struct station_info *sinfo)
 {
 	int link_id;
 
-	if (sinfo->valid_links) {
+	if (sinfo->is_per_link_stats_support && sinfo->valid_links) {
 		for_each_valid_link(sinfo, link_id) {
 			if (sinfo->links[link_id]) {
 				kfree(sinfo->links[link_id]->pertid);
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 1bfe1a55888d..694ba84ec778 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -2867,6 +2867,8 @@  void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo,
 
 	sinfo->generation = sdata->local->sta_generation;
 	sinfo->valid_links = sta->sta.valid_links;
+	sinfo->is_per_link_stats_support =
+		!!(sdata->local->hw.wiphy->flags & WIPHY_FLAG_SUPPORTS_MLO_STA_PER_LINK_STATS);
 
 	sinfo->filled |= BIT_ULL(NL80211_STA_INFO_STA_FLAGS) |
 			 BIT_ULL(NL80211_STA_INFO_CONNECTED_TIME) |
@@ -2903,7 +2905,7 @@  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);
 
-	if (sinfo->valid_links) {
+	if (sinfo->is_per_link_stats_support && sinfo->valid_links) {
 		memcpy(sinfo->mld_addr, sta->addr, ETH_ALEN);
 
 		for_each_valid_link(sinfo, link_id) {
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 3527cea4e071..7c68c5f87f9d 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -6906,7 +6906,7 @@  static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,
 		    &sinfo->sta_flags))
 		goto nla_put_failure;
 
-	if (sinfo->valid_links) {
+	if (sinfo->is_per_link_stats_support && sinfo->valid_links) {
 		/* TODO: Add accumulated stats for packets, bytes for
 		 *	 better representation at MLO level.
 		 */