qcacld-3.0: Enhance hdd_get_sta_info_by_mac() API for MLO

The sta_info_list of SAP adapter has two entries for a single
ML STA client, one with link address and other with MLD address.

Hostapd will request peer stats with MLD address for ML client,
and driver will lookup in sta_info_list with MLD address and
finds one, but that entry will not have link address and sends
MLD address to FW to get peer stats which results in timeout
as FW doesn't respond to peer stats request with MLD address.

Remove the second entry in sta_info_list for ML client and
enhance hdd_get_sta_info_by_mac() API to also lookup mld_addr
of each single sta_info in the list.

Change-Id: I8a0f38cec0290e5f82a71380585ebac78812bb53
CRs-Fixed: 3363384

core/hdd/src/wlan_hdd_hostapd.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -1565,6 +1565,8 @@ static void hdd_fill_station_info(struct hdd_adapter *adapter,
 					    cache_sta_info);
 		}
 	} else {
+		qdf_copy_macaddr(&cache_sta_info->sta_mac, &event->staMac);
+		qdf_copy_macaddr(&cache_sta_info->mld_addr, &event->sta_mld);
 		hdd_put_sta_info_ref(&adapter->cache_sta_info_list,
 				     &cache_sta_info, true,
 				     STA_INFO_FILL_STATION_INFO);
@@ -1744,74 +1746,6 @@ static QDF_STATUS hdd_hostapd_chan_change(struct hdd_adapter *adapter,
 				      chan_change, legacy_phymode);
 }
 
-#ifdef WLAN_FEATURE_11BE_MLO
-static inline QDF_STATUS
-hdd_hostapd_sap_register_mlo_sta(struct hdd_adapter *adapter,
-				 struct hdd_ap_ctx *ap_ctx,
-				 struct hdd_context *hdd_ctx,
-				 tSap_StationAssocReassocCompleteEvent *event,
-				 bool bAuthRequired,
-				 uint8_t *notify_new_sta)
-{
-	uint8_t *mld;
-	QDF_STATUS qdf_status;
-	struct wlan_objmgr_peer *peer;
-
-	hdd_debug("Registering STA MLD :" QDF_MAC_ADDR_FMT,
-		  QDF_MAC_ADDR_REF(event->sta_mld.bytes));
-	qdf_status = hdd_softap_register_sta(adapter,
-					     bAuthRequired,
-					     ap_ctx->privacy,
-					     (struct qdf_mac_addr *)
-					     &event->sta_mld,
-					     event);
-
-	if (!QDF_IS_STATUS_SUCCESS(qdf_status))
-		hdd_err("Failed to register STA MLD %d "
-			QDF_MAC_ADDR_FMT, qdf_status,
-			QDF_MAC_ADDR_REF(event->sta_mld.bytes));
-
-	peer = wlan_objmgr_get_peer_by_mac(hdd_ctx->psoc,
-					   event->staMac.bytes,
-					   WLAN_OSIF_ID);
-	if (!peer) {
-		hdd_err("Peer object not found");
-		return QDF_STATUS_E_INVAL;
-	}
-
-	if (bAuthRequired) {
-		mld = wlan_peer_mlme_get_mldaddr(peer);
-		if (!wlan_peer_mlme_is_assoc_peer(peer) &&
-		    !qdf_is_macaddr_zero((struct qdf_mac_addr *)mld)) {
-			hdd_err("skip userspace notification");
-			*notify_new_sta = 0;
-		}
-	} else {
-		if (!qdf_is_macaddr_zero((struct qdf_mac_addr *)
-				peer->mldaddr) &&
-		    !wlan_peer_mlme_is_assoc_peer(peer)) {
-			wlan_objmgr_peer_release_ref(peer, WLAN_OSIF_ID);
-			return QDF_STATUS_E_NOSUPPORT;
-		}
-	}
-
-	wlan_objmgr_peer_release_ref(peer, WLAN_OSIF_ID);
-
-	return QDF_STATUS_SUCCESS;
-}
-#else /* WLAN_FEATURE_11BE_MLO */
-static inline QDF_STATUS
-hdd_hostapd_sap_register_mlo_sta(struct hdd_adapter *adapter,
-				 struct hdd_ap_ctx *ap_ctx,
-				 struct hdd_context *hdd_ctx,
-				 tSap_StationAssocReassocCompleteEvent *event,
-				 bool bAuthRequired,
-				 uint8_t *notify_new_sta)
-{
-	return QDF_STATUS_SUCCESS;
-}
-#endif /* WLAN_FEATURE_11BE_MLO */
-
 static inline void
 hdd_hostapd_update_beacon_country_ie(struct hdd_adapter *adapter)
 {
@@ -1968,8 +1902,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 	tSap_StationSetKeyCompleteEvent *key_complete;
 	int ret = 0;
 	tSap_StationDisassocCompleteEvent *disassoc_comp;
-	struct hdd_station_info *stainfo, *cache_stainfo, *tmp = NULL,
-				*mld_sta_info;
+	struct hdd_station_info *stainfo, *cache_stainfo, *tmp = NULL;
 	mac_handle_t mac_handle;
 	struct sap_config *sap_config;
 	struct sap_context *sap_ctx = NULL;
@@ -2473,18 +2406,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 				hdd_err("Failed to register STA %d "
 					QDF_MAC_ADDR_FMT, qdf_status,
 					QDF_MAC_ADDR_REF(wrqu.addr.sa_data));
-			qdf_status = hdd_hostapd_sap_register_mlo_sta(adapter,
-								      ap_ctx,
-								      hdd_ctx,
-								      event,
-								      bAuthRequired,
-								      (uint8_t *)&notify_new_sta);
-
-			if (qdf_status == QDF_STATUS_E_NOSUPPORT)
-				goto skip_reassoc;
-			else if (qdf_status == QDF_STATUS_E_INVAL)
-				return QDF_STATUS_E_INVAL;
-
 		} else {
 			qdf_status = hdd_softap_register_sta(
 						adapter,
@@ -2499,17 +2420,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 				hdd_err("Failed to register STA %d "
 					QDF_MAC_ADDR_FMT, qdf_status,
 					QDF_MAC_ADDR_REF(wrqu.addr.sa_data));
-			qdf_status = hdd_hostapd_sap_register_mlo_sta(adapter,
-								      ap_ctx,
-								      hdd_ctx,
-								      event,
-								      bAuthRequired,
-								      (uint8_t *)&notify_new_sta);
-
-			if (qdf_status == QDF_STATUS_E_NOSUPPORT)
-				goto skip_reassoc;
-			else if (qdf_status == QDF_STATUS_E_INVAL)
-				return QDF_STATUS_E_INVAL;
 		}
 
 		sta_id = event->staId;
@@ -2679,20 +2589,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 
 		if (wlan_vdev_mlme_is_mlo_vdev(adapter->vdev) &&
 		    !qdf_is_macaddr_zero(&stainfo->mld_addr)) {
-			mld_sta_info = hdd_get_sta_info_by_mac(
-						&adapter->sta_info_list,
-						stainfo->mld_addr.bytes,
-						STA_INFO_HOSTAPD_SAP_EVENT_CB);
-			if (!mld_sta_info) {
-				hdd_debug("Failed to find the MLD station");
-			} else {
-				hdd_softap_deregister_sta(adapter,
-							  &mld_sta_info);
-				hdd_put_sta_info_ref(&adapter->sta_info_list,
-						&mld_sta_info, true,
-						STA_INFO_HOSTAPD_SAP_EVENT_CB);
-				qdf_copy_macaddr(&sta_addr, &stainfo->mld_addr);
-			}
+			qdf_copy_macaddr(&sta_addr, &stainfo->mld_addr);
 		} else {
 			/* Copy legacy MAC address on
 			 * non-ML type client disassoc.
@@ -3014,7 +2911,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		return QDF_STATUS_SUCCESS;
 	}
 
-skip_reassoc:
 	hdd_wext_send_event(dev, we_event, &wrqu,
 			    (char *)we_custom_event_generic);
 	qdf_mem_free(we_custom_start_event);

core/hdd/src/wlan_hdd_sta_info.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -190,7 +190,8 @@ struct hdd_station_info *hdd_get_sta_info_by_mac(
 {
 	struct hdd_station_info *sta_info = NULL;
 
-	if (!mac_addr || !sta_info_container) {
+	if (!mac_addr || !sta_info_container ||
+	    qdf_is_macaddr_zero((struct qdf_mac_addr *)mac_addr)) {
 		hdd_err("Parameter(s) null");
 		return NULL;
 	}
@@ -199,6 +200,8 @@ struct hdd_station_info *hdd_get_sta_info_by_mac(
 
 	qdf_list_for_each(&sta_info_container->sta_obj, sta_info, sta_node) {
 		if (qdf_is_macaddr_equal(&sta_info->sta_mac,
+					 (struct qdf_mac_addr *)mac_addr) ||
+		    qdf_is_macaddr_equal(&sta_info->mld_addr,
 					 (struct qdf_mac_addr *)mac_addr)) {
 			hdd_take_sta_info_ref(sta_info_container,
 					      sta_info, false, sta_info_dbgid);

core/hdd/src/wlan_hdd_station_info.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -1434,7 +1434,6 @@ static int hdd_get_station_remote(struct hdd_context *hdd_ctx,
 				  struct qdf_mac_addr mac_addr)
 {
 	int status = 0;
-	bool is_associated = false;
 	struct hdd_station_info *stainfo =
 			hdd_get_sta_info_by_mac(
 					&adapter->sta_info_list,
@@ -1447,15 +1446,6 @@ static int hdd_get_station_remote(struct hdd_context *hdd_ctx,
 		return status;
 	}
 
-	is_associated = hdd_is_peer_associated(adapter, &mac_addr);
-	if (!is_associated) {
-		status = hdd_get_cached_station_remote(hdd_ctx, adapter,
-						       mac_addr);
-		hdd_put_sta_info_ref(&adapter->sta_info_list, &stainfo, true,
-				     STA_INFO_HDD_GET_STATION_REMOTE);
-		return status;
-	}
-
 	status = hdd_get_connected_station_info(hdd_ctx, adapter,
 						mac_addr, stainfo);
 	hdd_put_sta_info_ref(&adapter->sta_info_list, &stainfo, true,
@@ -2150,6 +2140,7 @@ static int hdd_get_connected_station_info_ex(struct hdd_context *hdd_ctx,
 	uint32_t nl_buf_len, guard_interval;
 	bool sap_get_peer_info;
 	struct nl80211_sta_flag_update sta_flags = {0};
+	const uint8_t *mac_addr;
 	QDF_STATUS status;
 
 	if (hdd_get_peer_stats(adapter, stainfo)) {
@@ -2178,8 +2169,13 @@ static int hdd_get_connected_station_info_ex(struct hdd_context *hdd_ctx,
 		goto fail;
 	}
 
+	if (qdf_is_macaddr_zero(&stainfo->mld_addr))
+		mac_addr = &stainfo->sta_mac.bytes[0];
+	else
+		mac_addr = &stainfo->mld_addr.bytes[0];
+
 	if (nla_put(skb, QCA_WLAN_VENDOR_ATTR_GET_STA_INFO_MAC,
-		    QDF_MAC_ADDR_SIZE, stainfo->sta_mac.bytes)) {
+		    QDF_MAC_ADDR_SIZE, mac_addr)) {
 		hdd_err_rl("Failed to put MAC address");
 		goto fail;
 	}
@@ -2255,7 +2251,6 @@ static int hdd_get_station_remote_ex(struct hdd_context *hdd_ctx,
 				     struct hdd_adapter *adapter,
 				     struct qdf_mac_addr mac_addr)
 {
-	bool is_associated = false;
 	struct hdd_station_info *stainfo =
 				hdd_get_sta_info_by_mac(&adapter->sta_info_list,
 					       mac_addr.bytes,
@@ -2269,15 +2264,6 @@ static int hdd_get_station_remote_ex(struct hdd_context *hdd_ctx,
 		return -ENXIO;
 	}
 
-	is_associated = hdd_is_peer_associated(adapter, &mac_addr);
-	if (!is_associated) {
-		hdd_err_rl("Peer STA is not associated " QDF_MAC_ADDR_FMT,
-			   QDF_MAC_ADDR_REF(mac_addr.bytes));
-		hdd_put_sta_info_ref(&adapter->sta_info_list, &stainfo, true,
-				     STA_INFO_HDD_GET_STATION_REMOTE);
-		return -EINVAL;
-	}
-
 	status = hdd_get_connected_station_info_ex(hdd_ctx, adapter, stainfo);
 	hdd_put_sta_info_ref(&adapter->sta_info_list, &stainfo, true,
 			     STA_INFO_HDD_GET_STATION_REMOTE);