qcacld-3.0: Use MLD address for auth frames in SAE ML roaming

SAE authentication happens with MLD address rather than link
addresses as it's common authentication for all links in an ML
connection. But OTA exchange of authentication frames happens
with a chosen link address from available links.
As userspace takes care of the SAE authentication, host driver
has to replace the rx SAE auth frame SA with peer MLD and DA with
self MLD address. Similarly for tx SAE auth frames, replace self
SA with link address and DA with peer link address.

Current change is to support the same for roaming case. Fetch the
MLD from scan cache corresponds to link address provided in roam
auth event and replace as mentioned above.

Change-Id: Ide15caa122f78301391b5ea891e2e6eaf4af8974
CRs-Fixed: 3441483

components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_api.h

@@ -1933,4 +1933,105 @@ wlan_cm_get_assoc_btm_cap(struct wlan_objmgr_vdev *vdev);
  * Return: bool, true: self mld roam supported
  */
 bool wlan_cm_is_self_mld_roam_supported(struct wlan_objmgr_psoc *psoc);
+
+#ifdef WLAN_FEATURE_11BE_MLO
+/**
+ * wlan_cm_is_sae_auth_addr_conversion_required() - check whether address
+ * conversion is required or not.
+ * @vdev: pointer to vdev
+ *
+ * This API checks the address conversion (mld to link and vice-versa) for sae
+ * auth frames for below listed scenarios when mlo sae auth external conversion
+ * is true.
+ *
+ * Connected AP Roam AP Connection Conversion
+ * (MLO vdev)
+ *	non-ML  non-ML  initial     FALSE
+ *	non-ML  ML      initial     FALSE
+ *	non-ML  non-ML  roam        FALSE
+ *	non-ML  ML      roam        TRUE
+ *	ML      non-ML  initial     TRUE
+ *	ML      ML      initial     TRUE
+ *	ML      non-ML  roam        FALSE
+ *	ML      ML      roam        TRUE
+ *
+ * Return: true if address conversion required, otherwise false.
+ */
+bool
+wlan_cm_is_sae_auth_addr_conversion_required(struct wlan_objmgr_vdev *vdev);
+#else
+static inline bool
+wlan_cm_is_sae_auth_addr_conversion_required(struct wlan_objmgr_vdev *vdev)
+{
+	return false;
+}
+#endif /* WLAN_FEATURE_11BE_MLO */
+
+#if defined(WLAN_FEATURE_11BE_MLO) && defined(WLAN_FEATURE_ROAM_OFFLOAD)
+/**
+ * wlan_cm_store_mlo_roam_peer_address() - cache peer mld and link address
+ * while roaming
+ * @pdev: pdev object
+ * @auth_event: auth offload event data
+ *
+ * Return: void
+ */
+void
+wlan_cm_store_mlo_roam_peer_address(struct wlan_objmgr_pdev *pdev,
+				    struct auth_offload_event *auth_event);
+
+/**
+ * wlan_cm_roaming_get_peer_mld_addr() - retrieve the peer mld address for
+ * roaming.
+ * @vdev: vdev pointer
+ *
+ * Return: pointer to struct qdf_mac_addr
+ */
+struct qdf_mac_addr *
+wlan_cm_roaming_get_peer_mld_addr(struct wlan_objmgr_vdev *vdev);
+
+/**
+ * wlan_cm_roaming_get_peer_link_addr() - get peer link address for roaming
+ * @vdev: vdev pointer
+ *
+ * Return: pointer to struct qdf_mac_addr
+ */
+struct qdf_mac_addr *
+wlan_cm_roaming_get_peer_link_addr(struct wlan_objmgr_vdev *vdev);
+
+/**
+ * wlan_cm_roam_is_mlo_ap() - to check whether vdev will be roam to ml ap
+ * @vdev: object manager vdev
+ *
+ * this function check whether roaming vdev will be connected to ml ap or not.
+ *
+ * Return: true if roam ap is ml capable otherwise false
+ */
+bool
+wlan_cm_roam_is_mlo_ap(struct wlan_objmgr_vdev *vdev);
+#else
+static inline void
+wlan_cm_store_mlo_roam_peer_address(struct wlan_objmgr_pdev *pdev,
+				    struct auth_offload_event *auth_event)
+{
+}
+
+static inline struct qdf_mac_addr *
+wlan_cm_roaming_get_mld_addr(struct wlan_objmgr_vdev *vdev)
+{
+	return NULL;
+}
+
+static inline struct qdf_mac_addr *
+wlan_cm_roaming_get_peer_link_addr(struct wlan_objmgr_vdev *vdev)
+{
+	return NULL;
+}
+
+static inline bool
+wlan_cm_roam_is_mlo_ap(struct wlan_objmgr_vdev *vdev)
+{
+	return false;
+}
+#endif /* WLAN_FEATURE_11BE_MLO && WLAN_FEATURE_ROAM_OFFLOAD */
 #endif  /* WLAN_CM_ROAM_API_H__ */

components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_public_struct.h

@@ -500,6 +500,18 @@ struct owe_transition_mode_info {
 	struct wlan_ssid  ssid;
 };
 
+/**
+ * struct sae_roam_auth_map - map the peer address for the sae raom
+ * @is_mlo_ap: to check ap (to which roam) is mlo capable.
+ * @peer_mldaddr: peer MLD address
+ * @peer_linkaddr: peer link address
+ */
+struct sae_roam_auth_map {
+	bool is_mlo_ap;
+	struct qdf_mac_addr peer_mldaddr;
+	struct qdf_mac_addr peer_linkaddr;
+};
+
 /**
  * struct rso_config - connect config to be used to send info in
  * RSO. This is the info we dont have in VDEV or CM ctx
@@ -553,6 +565,7 @@ struct owe_transition_mode_info {
  * @lost_link_rssi: lost link RSSI
  * @roam_sync_frame_ind: roam sync frame ind
  * @roam_band_bitmask: This allows the driver to roam within this band
+ * @sae_roam_auth: structure containing roam peer mld and link address.
  */
 struct rso_config {
 #ifdef WLAN_FEATURE_HOST_ROAM
@@ -599,6 +612,9 @@ struct rso_config {
 	int32_t lost_link_rssi;
 	struct roam_synch_frame_ind roam_sync_frame_ind;
 	uint32_t roam_band_bitmask;
+#if defined(WLAN_FEATURE_11BE_MLO) && defined(WLAN_FEATURE_ROAM_OFFLOAD)
+	struct sae_roam_auth_map sae_roam_auth;
+#endif
 };
 
 /**

components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_ucfg_api.h

@@ -723,4 +723,46 @@ ucfg_cm_roam_stats_info_put(struct enhance_roam_info *roam_info)
 {
 }
 #endif
+
+#ifdef WLAN_FEATURE_11BE_MLO
+/**
+ * ucfg_cm_is_sae_auth_addr_conversion_required() - this api is wrapper for
+ * "wlan_cm_is_sae_auth_addr_conversion_required" function
+ * @vdev: pointer to vdev
+ *
+ * Return: true for address conversion otherwise false
+ */
+static inline bool
+ucfg_cm_is_sae_auth_addr_conversion_required(struct wlan_objmgr_vdev *vdev)
+{
+	return wlan_cm_is_sae_auth_addr_conversion_required(vdev);
+}
+#else
+static inline bool
+ucfg_cm_is_sae_auth_addr_conversion_required(struct wlan_objmgr_vdev *vdev)
+{
+	return false;
+}
+#endif
+
+#if defined(WLAN_FEATURE_ROAM_OFFLOAD) && defined(WLAN_FEATURE_11BE_MLO)
+/**
+ * ucfg_cm_roaming_get_peer_mld_addr() - this api is wrapper for
+ * "wlan_cm_roaming_get_peer_mld_addr" function.
+ * @vdev: pointer to vdev
+ *
+ * Return: mld address of peer
+ */
+static inline struct qdf_mac_addr *
+ucfg_cm_roaming_get_peer_mld_addr(struct wlan_objmgr_vdev *vdev)
+{
+	return wlan_cm_roaming_get_peer_mld_addr(vdev);
+}
+#else
+static inline struct qdf_mac_addr *
+ucfg_cm_roaming_get_peer_mld_addr(struct wlan_objmgr_vdev *vdev)
+{
+	return NULL;
+}
+#endif
 #endif /* _WLAN_CM_ROAM_UCFG_API_H_ */

components/umac/mlme/connection_mgr/dispatcher/src/wlan_cm_roam_api.c

@@ -4655,3 +4655,137 @@ end:
 	return status;
 }
 #endif
+
+#ifdef WLAN_FEATURE_11BE_MLO
+bool wlan_cm_is_sae_auth_addr_conversion_required(struct wlan_objmgr_vdev *vdev)
+{
+	if (!wlan_vdev_get_mlo_external_sae_auth_conversion(vdev))
+		return false;
+
+	if (wlan_cm_is_vdev_roaming(vdev)) {
+		if (!wlan_cm_roam_is_mlo_ap(vdev))
+			return false;
+	} else if (!wlan_vdev_mlme_is_mlo_vdev(vdev)) {
+		return false;
+	}
+
+	return true;
+}
+#endif /* WLAN_FEATURE_11BE_MLO */
+
+#if defined(WLAN_FEATURE_ROAM_OFFLOAD) && defined(WLAN_FEATURE_11BE_MLO)
+/**
+ * wlan_cm_reset_mlo_roam_peer_address() - this API reset the sae_roam_auth
+ * structure values to zero.
+ * @rso_config: pointer to struct rso_config
+ *
+ * Return: void
+ */
+static void wlan_cm_reset_mlo_roam_peer_address(struct rso_config *rso_config)
+{
+	qdf_mem_zero(&rso_config->sae_roam_auth.peer_mldaddr,
+		     QDF_MAC_ADDR_SIZE);
+	qdf_mem_zero(&rso_config->sae_roam_auth.peer_linkaddr,
+		     QDF_MAC_ADDR_SIZE);
+}
+
+void wlan_cm_store_mlo_roam_peer_address(struct wlan_objmgr_pdev *pdev,
+					 struct auth_offload_event *auth_event)
+{
+	struct wlan_objmgr_vdev *vdev;
+	struct rso_config *rso_config;
+	struct qdf_mac_addr mld_addr;
+	QDF_STATUS status;
+
+	if (!pdev) {
+		mlme_err("pdev is NULL");
+		return;
+	}
+
+	vdev = wlan_objmgr_get_vdev_by_id_from_pdev(pdev, auth_event->vdev_id,
+						    WLAN_LEGACY_MAC_ID);
+	if (!vdev) {
+		mlme_err("vdev %d not found", auth_event->vdev_id);
+		return;
+	}
+
+	if (!wlan_vdev_get_mlo_external_sae_auth_conversion(vdev))
+		goto rel_ref;
+
+	if (!wlan_cm_is_vdev_roaming(vdev))
+		goto rel_ref;
+
+	rso_config = wlan_cm_get_rso_config(vdev);
+	if (!rso_config)
+		goto rel_ref;
+
+	if (qdf_is_macaddr_zero(&auth_event->ta)) {
+		/* ta have zero value for non-ML AP */
+		rso_config->sae_roam_auth.is_mlo_ap = false;
+		wlan_cm_reset_mlo_roam_peer_address(rso_config);
+		goto rel_ref;
+	}
+
+	status = scm_get_mld_addr_by_link_addr(pdev, &auth_event->ap_bssid,
+					       &mld_addr);
+
+	rso_config->sae_roam_auth.is_mlo_ap = true;
+
+	if (QDF_IS_STATUS_ERROR(status)) {
+		wlan_cm_reset_mlo_roam_peer_address(rso_config);
+		goto rel_ref;
+	}
+
+	qdf_mem_copy(rso_config->sae_roam_auth.peer_mldaddr.bytes,
+		     mld_addr.bytes, QDF_MAC_ADDR_SIZE);
+	qdf_mem_copy(rso_config->sae_roam_auth.peer_linkaddr.bytes,
+		     &auth_event->ap_bssid, QDF_MAC_ADDR_SIZE);
+
+	mlme_debug("mld addr " QDF_MAC_ADDR_FMT "link addr " QDF_MAC_ADDR_FMT,
+		   QDF_MAC_ADDR_REF(rso_config->sae_roam_auth.peer_mldaddr.bytes),
+		   QDF_MAC_ADDR_REF(rso_config->sae_roam_auth.peer_linkaddr.bytes));
+rel_ref:
+	wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_MAC_ID);
+}
+
+struct qdf_mac_addr *
+wlan_cm_roaming_get_peer_mld_addr(struct wlan_objmgr_vdev *vdev)
+{
+	struct rso_config *rso_config;
+
+	rso_config = wlan_cm_get_rso_config(vdev);
+	if (!rso_config)
+		return NULL;
+
+	if (qdf_is_macaddr_zero(&rso_config->sae_roam_auth.peer_mldaddr))
+		return NULL;
+
+	return &rso_config->sae_roam_auth.peer_mldaddr;
+}
+
+struct qdf_mac_addr *
+wlan_cm_roaming_get_peer_link_addr(struct wlan_objmgr_vdev *vdev)
+{
+	struct rso_config *rso_config;
+
+	rso_config = wlan_cm_get_rso_config(vdev);
+	if (!rso_config)
+		return NULL;
+
+	if (qdf_is_macaddr_zero(&rso_config->sae_roam_auth.peer_linkaddr))
+		return NULL;
+
+	return &rso_config->sae_roam_auth.peer_linkaddr;
+}
+
+bool wlan_cm_roam_is_mlo_ap(struct wlan_objmgr_vdev *vdev)
+{
+	struct rso_config *rso_config;
+
+	rso_config = wlan_cm_get_rso_config(vdev);
+	if (!rso_config)
+		return false;
+
+	return rso_config->sae_roam_auth.is_mlo_ap;
+}
+#endif /* WLAN_FEATURE_ROAM_OFFLOAD && WLAN_FEATURE_11BE_MLO */

core/hdd/src/wlan_hdd_assoc.c

@@ -285,20 +285,44 @@ wlan_hdd_sae_update_mld_addr(struct cfg80211_external_auth_params *params,
 			     struct hdd_adapter *adapter)
 {
 	struct qdf_mac_addr mld_addr;
-	QDF_STATUS status;
-
-	if (!wlan_vdev_mlme_is_mlo_vdev(adapter->deflink->vdev))
-		return QDF_STATUS_SUCCESS;
+	struct qdf_mac_addr *mld_roaming_addr;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
+	struct wlan_objmgr_vdev *vdev;
 
-	status = wlan_vdev_get_bss_peer_mld_mac(adapter->deflink->vdev,
-						&mld_addr);
-	if (QDF_IS_STATUS_ERROR(status))
+	if (!adapter->deflink->vdev)
 		return QDF_STATUS_E_INVAL;
 
-	qdf_mem_copy(params->mld_addr, mld_addr.bytes,
-		     QDF_MAC_ADDR_SIZE);
+	vdev = adapter->deflink->vdev;
+	wlan_objmgr_vdev_get_ref(vdev, WLAN_HDD_ID_OBJ_MGR);
 
-	return QDF_STATUS_SUCCESS;
+	if (!ucfg_cm_is_sae_auth_addr_conversion_required(vdev))
+		goto end;
+
+	if (ucfg_cm_is_vdev_roaming(vdev)) {
+		/*
+		 * while roaming, peer is not created yet till authentication
+		 * So retrieving the MLD address which is cached from the
+		 * scan entry.
+		 */
+		mld_roaming_addr = ucfg_cm_roaming_get_peer_mld_addr(vdev);
+		if (!mld_roaming_addr) {
+			status = QDF_STATUS_E_INVAL;
+			goto end;
+		}
+		mld_addr = *mld_roaming_addr;
+	} else {
+		status = wlan_vdev_get_bss_peer_mld_mac(vdev, &mld_addr);
+		if (QDF_IS_STATUS_ERROR(status)) {
+			status = QDF_STATUS_E_INVAL;
+			goto end;
+		}
+	}
+
+	qdf_mem_copy(params->mld_addr, mld_addr.bytes, QDF_MAC_ADDR_SIZE);
+
+end:
+	wlan_objmgr_vdev_release_ref(vdev, WLAN_HDD_ID_OBJ_MGR);
+	return status;
 }
 #else
 static inline QDF_STATUS

core/mac/src/pe/lim/lim_process_auth_frame.c

@@ -550,11 +550,11 @@ static QDF_STATUS lim_update_link_to_mld_address(struct mac_context *mac_ctx,
 	struct qdf_mac_addr *self_mld_addr;
 	struct tLimPreAuthNode *pre_auth_node;
 	struct qdf_mac_addr peer_mld_addr;
+	struct qdf_mac_addr *peer_roaming_mld_addr;
 	enum QDF_OPMODE opmode;
 	QDF_STATUS status;
 
-	if (!wlan_vdev_mlme_is_mlo_vdev(vdev) ||
-	    !wlan_vdev_get_mlo_external_sae_auth_conversion(vdev))
+	if (!wlan_cm_is_sae_auth_addr_conversion_required(vdev))
 		return QDF_STATUS_SUCCESS;
 
 	opmode = wlan_vdev_mlme_get_opmode(vdev);
@@ -572,9 +572,19 @@ static QDF_STATUS lim_update_link_to_mld_address(struct mac_context *mac_ctx,
 			     QDF_MAC_ADDR_SIZE);
 		break;
 	case QDF_STA_MODE:
-		status = wlan_vdev_get_bss_peer_mld_mac(vdev, &peer_mld_addr);
-		if (QDF_IS_STATUS_ERROR(status))
-			return status;
+		if (!wlan_cm_is_vdev_roaming(vdev)) {
+			status = wlan_vdev_get_bss_peer_mld_mac(vdev,
+								&peer_mld_addr);
+			if (QDF_IS_STATUS_ERROR(status))
+				return status;
+		} else {
+			peer_roaming_mld_addr =
+				wlan_cm_roaming_get_peer_mld_addr(vdev);
+			if (!peer_roaming_mld_addr)
+				return QDF_STATUS_E_FAILURE;
+
+			peer_mld_addr = *peer_roaming_mld_addr;
+		}
 
 		qdf_mem_copy(mac_hdr->sa, peer_mld_addr.bytes,
 			     QDF_MAC_ADDR_SIZE);
@@ -2102,8 +2112,9 @@ bool lim_process_sae_preauth_frame(struct mac_context *mac, uint8_t *rx_pkt)
 	tpSirMacMgmtHdr dot11_hdr;
 	uint16_t auth_alg, frm_len;
 	uint16_t sae_auth_seq = 0, sae_status_code = 0;
-	uint8_t *frm_body, pdev_id, vdev_id = 0;
+	uint8_t *frm_body, pdev_id, vdev_id;
 	struct wlan_objmgr_vdev *vdev;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	dot11_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt);
 	frm_body = WMA_GET_RX_MPDU_DATA(rx_pkt);
@@ -2131,12 +2142,32 @@ bool lim_process_sae_preauth_frame(struct mac_context *mac, uint8_t *rx_pkt)
 		  (dot11_hdr->seqControl.fragNum)), *(uint16_t *)(frm_body + 2));
 	pdev_id = wlan_objmgr_pdev_get_pdev_id(mac->pdev);
 	vdev = wlan_objmgr_get_vdev_by_macaddr_from_psoc(
-			mac->psoc, pdev_id, dot11_hdr->da, WLAN_LEGACY_SME_ID);
+			mac->psoc, pdev_id, dot11_hdr->da, WLAN_LEGACY_MAC_ID);
+
 	if (vdev) {
 		vdev_id = wlan_vdev_get_id(vdev);
-
 		lim_sae_auth_cleanup_retry(mac, vdev_id);
-		wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_SME_ID);
+		status = lim_update_link_to_mld_address(mac, vdev, dot11_hdr);
+
+		wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_MAC_ID);
+	} else {
+		vdev = wlan_objmgr_pdev_get_roam_vdev(mac->pdev,
+						      WLAN_LEGACY_MAC_ID);
+		if (!vdev) {
+			pe_err("not able to find roaming vdev");
+			return false;
+		}
+
+		vdev_id = wlan_vdev_get_id(vdev);
+		status = lim_update_link_to_mld_address(mac, vdev, dot11_hdr);
+
+		wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_MAC_ID);
+	}
+
+	if (QDF_IS_STATUS_ERROR(status)) {
+		pe_err("dropping the auth frame for vdev id: %d and BSSID " QDF_MAC_ADDR_FMT,
+		       vdev_id, QDF_MAC_ADDR_REF(dot11_hdr->bssId));
+		return false;
 	}
 
 	wlan_connectivity_mgmt_event(mac->psoc,

core/mac/src/pe/lim/lim_send_management_frames.c

@@ -6695,11 +6695,11 @@ static QDF_STATUS lim_update_mld_to_link_address(struct mac_context *mac_ctx,
 	struct qdf_mac_addr *self_link_addr;
 	struct tLimPreAuthNode *pre_auth_node;
 	struct qdf_mac_addr peer_link_addr;
+	struct qdf_mac_addr *peer_roaming_link_addr;
 	enum QDF_OPMODE opmode;
 	QDF_STATUS status;
 
-	if (!wlan_vdev_mlme_is_mlo_vdev(vdev) ||
-	    !wlan_vdev_get_mlo_external_sae_auth_conversion(vdev))
+	if (!wlan_cm_is_sae_auth_addr_conversion_required(vdev))
 		return QDF_STATUS_SUCCESS;
 
 	opmode = wlan_vdev_mlme_get_opmode(vdev);
@@ -6720,9 +6720,18 @@ static QDF_STATUS lim_update_mld_to_link_address(struct mac_context *mac_ctx,
 			     QDF_MAC_ADDR_SIZE);
 		break;
 	case QDF_STA_MODE:
-		status = wlan_vdev_get_bss_peer_mac(vdev, &peer_link_addr);
-		if (QDF_IS_STATUS_ERROR(status))
-			return status;
+		if (!wlan_cm_is_vdev_roaming(vdev)) {
+			status = wlan_vdev_get_bss_peer_mac(vdev,
+							    &peer_link_addr);
+			if (QDF_IS_STATUS_ERROR(status))
+				return status;
+		} else {
+			peer_roaming_link_addr =
+				wlan_cm_roaming_get_peer_link_addr(vdev);
+			if (!peer_roaming_link_addr)
+				return QDF_STATUS_E_FAILURE;
+			peer_link_addr = *peer_roaming_link_addr;
+		}
 
 		qdf_mem_copy(mac_hdr->da, peer_link_addr.bytes,
 			     QDF_MAC_ADDR_SIZE);

core/wma/src/wma_scan_roam.c

@@ -297,6 +297,8 @@ cm_handle_auth_offload(struct auth_offload_event *auth_event)
 				auth_event->vdev_id,
 				auth_event->ta);
 
+	wlan_cm_store_mlo_roam_peer_address(mac_ctx->pdev, auth_event);
+
 	status = wlan_cm_set_offload_ssid(mac_ctx->pdev, auth_event->vdev_id,
 					  &auth_event->ap_bssid);