qcacld-3.0: Store and send keys after peer assoc

For STA mlo connection the AP might send M1 right after assoc
response on assoc link which can result in keys sent down to FW
for mlo links before host has sent wmi_peer_assoc for link vdev.
Current code does not have handling for this case.

To solve this, store the keys and once connection is completed
on link vdev send keys.

Change-Id: I3675451ef0e047caf8c77d256ea67f0eac6ed797
CRs-Fixed: 3289589

components/umac/mlme/connection_mgr/core/src/wlan_cm_vdev_connect.c

@@ -1491,6 +1491,56 @@ static void cm_process_connect_complete(struct wlan_objmgr_psoc *psoc,
 
 }
 
+static void
+cm_install_link_vdev_keys(struct wlan_objmgr_vdev *vdev)
+{
+	struct wlan_objmgr_peer *peer;
+	struct wlan_crypto_key *crypto_key;
+	enum QDF_OPMODE op_mode = wlan_vdev_mlme_get_opmode(vdev);
+	uint16_t i;
+	bool pairwise;
+	uint8_t vdev_id;
+	uint16_t max_key_index = WLAN_CRYPTO_MAXKEYIDX +
+				 WLAN_CRYPTO_MAXIGTKKEYIDX +
+				 WLAN_CRYPTO_MAXBIGTKKEYIDX;
+
+	if (!vdev)
+		return;
+
+	vdev_id = wlan_vdev_get_id(vdev);
+	if (op_mode != QDF_STA_MODE ||
+	    !wlan_vdev_mlme_is_mlo_link_vdev(vdev))
+		return;
+
+	peer = wlan_objmgr_vdev_try_get_bsspeer(vdev, WLAN_MLME_CM_ID);
+	if (!peer) {
+		mlo_err("Peer is null return");
+		return;
+	}
+
+	if (!mlo_get_keys_saved(vdev, wlan_peer_get_macaddr(peer))) {
+		mlo_debug("keys are not saved for vdev_id %d", vdev_id);
+		wlan_objmgr_peer_release_ref(peer, WLAN_MLME_CM_ID);
+		return;
+	}
+
+	for (i = 0; i < max_key_index; i++) {
+		crypto_key = wlan_crypto_get_key(vdev, i);
+		if (!crypto_key)
+			continue;
+
+		pairwise = crypto_key->key_type ? WLAN_CRYPTO_KEY_TYPE_UNICAST : WLAN_CRYPTO_KEY_TYPE_GROUP;
+		mlo_debug("MLO:send keys for vdev_id %d, key_idx %d, pairwise %d",
+			  vdev_id, i, pairwise);
+		mlme_cm_osif_send_keys(vdev, i, pairwise,
+				       crypto_key->cipher_type);
+	}
+	mlo_set_keys_saved(vdev,
+			   (struct qdf_mac_addr *)wlan_peer_get_macaddr(peer),
+			   false);
+	wlan_objmgr_peer_release_ref(peer, WLAN_MLME_CM_ID);
+}
+
 QDF_STATUS
 cm_connect_complete_ind(struct wlan_objmgr_vdev *vdev,
 			struct wlan_cm_connect_resp *rsp)
@@ -1532,7 +1582,9 @@ cm_connect_complete_ind(struct wlan_objmgr_vdev *vdev,
 								psoc, vdev_id);
 		else
 			policy_mgr_incr_active_session(psoc, op_mode, vdev_id);
+
 		cm_process_connect_complete(psoc, pdev, vdev, rsp);
+		cm_install_link_vdev_keys(vdev);
 		wlan_tdls_notify_sta_connect(vdev_id,
 					     mlme_get_tdls_chan_switch_prohibited(vdev),
 					     mlme_get_tdls_prohibited(vdev),

components/umac/mlme/mlo_mgr/inc/wlan_mlo_mgr_roam.h

@@ -241,6 +241,18 @@ QDF_STATUS
 wlan_mlo_roam_abort_on_link(struct wlan_objmgr_psoc *psoc,
 			    uint8_t *event, uint8_t vdev_id);
 
+/**
+ * mlo_check_if_all_links_up - Check if all links are up
+ * @vdev: vdev pointer
+ *
+ * This api will check if all the requested links are  in CM connected
+ * state.
+ *
+ * Return: QDF_STATUS
+ */
+bool
+mlo_check_if_all_links_up(struct wlan_objmgr_vdev *vdev);
+
 #else /* WLAN_FEATURE_11BE_MLO */
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 static inline
@@ -336,5 +348,11 @@ mlo_roam_get_bssid_chan_for_link(uint8_t vdev_id,
 {
 	return QDF_STATUS_E_NOSUPPORT;
 }
+
+static inline bool
+mlo_check_if_all_links_up(struct wlan_objmgr_vdev *vdev)
+{
+	return false;
+}
 #endif /* WLAN_FEATURE_11BE_MLO */
 #endif

components/umac/mlme/mlo_mgr/src/wlan_mlo_mgr_roam.c

@@ -581,3 +581,37 @@ mlo_roam_get_bssid_chan_for_link(uint8_t vdev_id,
 	return status;
 }
 
+bool
+mlo_check_if_all_links_up(struct wlan_objmgr_vdev *vdev)
+{
+	struct wlan_mlo_dev_context *mlo_dev_ctx;
+	struct wlan_mlo_sta *sta_ctx;
+	uint8_t i;
+
+	if (!vdev || !vdev->mlo_dev_ctx) {
+		mlo_err("Vdev is null");
+		return false;
+	}
+
+	mlo_dev_ctx = vdev->mlo_dev_ctx;
+	sta_ctx = mlo_dev_ctx->sta_ctx;
+	for (i = 0; i < WLAN_UMAC_MLO_MAX_VDEVS; i++) {
+		if (!mlo_dev_ctx->wlan_vdev_list[i])
+			continue;
+
+		if (qdf_test_bit(i, sta_ctx->wlan_connected_links) &&
+		    !wlan_cm_is_vdev_connected(mlo_dev_ctx->wlan_vdev_list[i])) {
+			mlo_debug("Vdev id %d is not in connected state",
+				  wlan_vdev_get_id(mlo_dev_ctx->wlan_vdev_list[i]));
+			return false;
+		}
+	}
+
+	if (i == WLAN_UMAC_MLO_MAX_VDEVS) {
+		mlo_debug("all links are up");
+		return true;
+	}
+
+	return false;
+}
+

core/hdd/src/wlan_hdd_assoc.c

@@ -2515,6 +2515,7 @@ struct osif_cm_ops osif_ops = {
 #ifdef WLAN_VENDOR_HANDOFF_CONTROL
 	.vendor_handoff_params_cb = hdd_cm_get_vendor_handoff_params,
 #endif
+	.send_vdev_keys_cb = hdd_cm_send_vdev_keys,
 };
 
 QDF_STATUS hdd_cm_register_cb(void)

core/hdd/src/wlan_hdd_cfg80211.c

@@ -20254,6 +20254,37 @@ static int wlan_hdd_add_key_sta(struct wlan_objmgr_pdev *pdev,
 	return errno;
 }
 
+#ifdef WLAN_FEATURE_11BE_MLO
+static bool
+wlan_hdd_mlo_set_keys_saved(struct hdd_adapter *adapter,
+			    struct wlan_objmgr_vdev *vdev,
+			    struct qdf_mac_addr *mac_address)
+{
+	if (!adapter)
+		return false;
+
+	if (!vdev)
+		return false;
+
+	if ((adapter->device_mode == QDF_STA_MODE) &&
+	    (!wlan_cm_is_vdev_connected(vdev))) {
+		hdd_debug("MLO:Save keys for vdev %d", wlan_vdev_get_id(vdev));
+		mlo_set_keys_saved(vdev, mac_address, true);
+		return true;
+	}
+
+	return false;
+}
+#else
+static bool
+wlan_hdd_mlo_set_keys_saved(struct hdd_adapter *adapter,
+			    struct wlan_objmgr_vdev *vdev,
+			    struct qdf_mac_addr *mac_address)
+{
+	return false;
+}
+#endif
+
 static int wlan_hdd_add_key_vdev(mac_handle_t mac_handle,
 				 struct wlan_objmgr_vdev *vdev,
 				 u8 key_index, bool pairwise,
@@ -20268,7 +20299,6 @@ static int wlan_hdd_add_key_vdev(mac_handle_t mac_handle,
 	enum wlan_crypto_cipher_type cipher;
 	bool ft_mode = false;
 
-
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
 	if (hdd_is_btk_enc_type(params->cipher))
@@ -20278,7 +20308,6 @@ static int wlan_hdd_add_key_vdev(mac_handle_t mac_handle,
 		return sme_add_key_krk(mac_handle, wlan_vdev_get_id(vdev),
 				       params->key, params->key_len);
 
-
 	if (!pairwise && ((wlan_vdev_mlme_get_opmode(vdev) == QDF_STA_MODE) ||
 	   (wlan_vdev_mlme_get_opmode(vdev) == QDF_P2P_CLIENT_MODE))) {
 		peer = wlan_objmgr_vdev_try_get_bsspeer(vdev, WLAN_OSIF_ID);
@@ -20296,12 +20325,15 @@ static int wlan_hdd_add_key_vdev(mac_handle_t mac_handle,
 				     QDF_MAC_ADDR_SIZE);
 	}
 
-
 	errno = wlan_cfg80211_store_key(vdev, key_index,
 					(pairwise ?
 					WLAN_CRYPTO_KEY_TYPE_UNICAST :
 					WLAN_CRYPTO_KEY_TYPE_GROUP),
 					mac_address.bytes, params);
+
+	if (wlan_hdd_mlo_set_keys_saved(adapter, vdev, &mac_address))
+		return 0;
+
 	cipher_cap = wlan_crypto_get_param(vdev, WLAN_CRYPTO_PARAM_CIPHER_CAP);
 	if (errno)
 		return errno;
@@ -20339,6 +20371,68 @@ static int wlan_hdd_add_key_vdev(mac_handle_t mac_handle,
 	return errno;
 }
 
+#ifdef WLAN_FEATURE_11BE_MLO
+QDF_STATUS wlan_hdd_send_key_vdev(struct wlan_objmgr_vdev *vdev,
+				  u8 key_index, bool pairwise,
+				  enum wlan_crypto_cipher_type cipher_type)
+{
+	struct wlan_objmgr_peer *peer;
+	struct qdf_mac_addr mac_address;
+	int32_t cipher_cap, ucast_cipher = 0;
+	QDF_STATUS status = QDF_STATUS_SUCCESS;
+	int errno;
+	bool ft_mode = false;
+	struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
+	struct hdd_adapter *adapter;
+
+	if (!hdd_ctx) {
+		hdd_err("hdd_ctx is NULL");
+		return QDF_STATUS_E_NULL_VALUE;
+	}
+
+	adapter = hdd_get_adapter_by_vdev(hdd_ctx, wlan_vdev_get_id(vdev));
+	if (!adapter) {
+		hdd_err("adapter is NULL for vdev %d", wlan_vdev_get_id(vdev));
+		return QDF_STATUS_E_NULL_VALUE;
+	}
+
+	if (wlan_vdev_mlme_get_opmode(vdev) != QDF_STA_MODE) {
+		hdd_debug("vdev opmode is not STA mode");
+		return QDF_STATUS_E_INVAL;
+	}
+	peer = wlan_objmgr_vdev_try_get_bsspeer(vdev, WLAN_OSIF_ID);
+	if (!peer) {
+		hdd_err("Peer is null return");
+		return QDF_STATUS_E_NULL_VALUE;
+	}
+	qdf_mem_copy(mac_address.bytes,
+		     wlan_peer_get_macaddr(peer), QDF_MAC_ADDR_SIZE);
+	wlan_objmgr_peer_release_ref(peer, WLAN_OSIF_ID);
+
+	cipher_cap = wlan_crypto_get_param(vdev, WLAN_CRYPTO_PARAM_CIPHER_CAP);
+	QDF_SET_PARAM(ucast_cipher, cipher_type);
+	if (pairwise)
+		wma_set_peer_ucast_cipher(mac_address.bytes,
+					  ucast_cipher, cipher_cap);
+
+	cdp_peer_flush_frags(cds_get_context(QDF_MODULE_ID_SOC),
+			     wlan_vdev_get_id(vdev), mac_address.bytes);
+
+	errno = wlan_hdd_add_key_sta(hdd_ctx->pdev, adapter, pairwise,
+				     key_index, &ft_mode);
+	if (ft_mode)
+		return QDF_STATUS_SUCCESS;
+
+	if (!errno)
+		wma_update_set_key(wlan_vdev_get_id(vdev), pairwise, key_index,
+				   cipher_type);
+	else
+		status = QDF_STATUS_E_FAILURE;
+
+	return status;
+}
+#endif
+
 #if defined(WLAN_FEATURE_11BE_MLO) && \
 defined(CFG80211_SINGLE_NETDEV_MULTI_LINK_SUPPORT)
 static int wlan_hdd_add_key_all_mlo_vdev(mac_handle_t mac_handle,

core/hdd/src/wlan_hdd_cfg80211.h

@@ -982,4 +982,29 @@ bool wlan_hdd_cfg80211_rx_control_port(struct net_device *dev,
 int hdd_send_dbam_config(struct hdd_adapter *adapter,
 			 enum coex_dbam_config_mode dbam_mode);
 #endif
+
+#ifdef WLAN_FEATURE_11BE_MLO
+/**
+ * wlan_hdd_send_key_vdev() - api to send vdev keys
+ * @vdev: vdev pointer
+ * @key_index: key index value
+ * @pairwise: pairwise keys
+ * @cipher_type: cipher type value
+ *
+ * Api to send vdev keys for mlo link
+ *
+ * Return: none
+ */
+QDF_STATUS wlan_hdd_send_key_vdev(struct wlan_objmgr_vdev *vdev,
+				  u8 key_index, bool pairwise,
+				  enum wlan_crypto_cipher_type cipher_type);
+#else
+static inline
+QDF_STATUS wlan_hdd_send_key_vdev(struct wlan_objmgr_vdev *vdev,
+				  u8 key_index, bool pairwise,
+				  enum wlan_crypto_cipher_type cipher_type)
+{
+	return QDF_STATUS_E_NOSUPPORT;
+}
+#endif /* WLAN_FEATURE_11BE_MLO */
 #endif

core/hdd/src/wlan_hdd_cm_api.h

@@ -85,6 +85,22 @@ QDF_STATUS hdd_cm_connect_complete(struct wlan_objmgr_vdev *vdev,
 				   struct wlan_cm_connect_resp *rsp,
 				   enum osif_cb_type type);
 
+/**
+ * hdd_cm_send_vdev_keys() - send vdev keys
+ * @vdev: Pointer to vdev
+ * @key_index: key index value
+ * @pairwise: pairwise boolean value
+ * @cipher_type: cipher type enum value
+ *
+ * This function is used to send vdev keys
+ *
+ * Context: Any context.
+ * Return: QDF_STATUS
+ */
+QDF_STATUS hdd_cm_send_vdev_keys(struct wlan_objmgr_vdev *vdev,
+				 u8 key_index, bool pairwise,
+				 enum wlan_crypto_cipher_type cipher_type);
+
 #ifdef WLAN_VENDOR_HANDOFF_CONTROL
 /**
  * hdd_cm_get_vendor_handoff_params() - to get vendor handoff params from fw

core/hdd/src/wlan_hdd_cm_connect.c

@@ -1418,6 +1418,13 @@ QDF_STATUS hdd_cm_connect_complete(struct wlan_objmgr_vdev *vdev,
 	return QDF_STATUS_SUCCESS;
 }
 
+QDF_STATUS hdd_cm_send_vdev_keys(struct wlan_objmgr_vdev *vdev,
+				 u8 key_index, bool pairwise,
+				 enum wlan_crypto_cipher_type cipher_type)
+{
+	return wlan_hdd_send_key_vdev(vdev, key_index, pairwise, cipher_type);
+}
+
 #ifdef WLAN_VENDOR_HANDOFF_CONTROL
 #define WLAN_WAIT_TIME_HANDOFF_PARAMS 1000
 

core/sme/src/csr/csr_api_roam.c

@@ -84,6 +84,8 @@
 #include "wlan_mlme_twt_api.h"
 #include <wlan_serialization_api.h>
 #include <wlan_vdev_mlme_ser_if.h>
+#include "wlan_mlo_mgr_sta.h"
+#include "wlan_mlo_mgr_roam.h"
 
 #define RSN_AUTH_KEY_MGMT_SAE           WLAN_RSN_SEL(WLAN_AKM_SAE)
 #define MAX_PWR_FCC_CHAN_12 8
@@ -3404,6 +3406,49 @@ csr_roam_diag_set_ctx_rsp(struct mac_context *mac_ctx,
 }
 #endif /* FEATURE_WLAN_DIAG_SUPPORT_CSR */
 
+#ifdef WLAN_FEATURE_11BE_MLO
+static QDF_STATUS
+csr_roam_send_rso_enable(struct mac_context *mac_ctx, uint8_t vdev_id)
+{
+	struct wlan_objmgr_vdev *vdev = NULL;
+	struct wlan_objmgr_vdev *assoc_vdev = NULL;
+
+	vdev = wlan_objmgr_get_vdev_by_id_from_psoc(mac_ctx->psoc,
+						    vdev_id,
+						    WLAN_MLME_OBJMGR_ID);
+	if (!vdev) {
+		sme_err("vdev object is NULL for vdev %d", vdev_id);
+		return QDF_STATUS_E_FAILURE;
+	}
+
+	if (wlan_vdev_mlme_is_mlo_vdev(vdev) &&
+	    mlo_check_if_all_links_up(vdev)) {
+		assoc_vdev = wlan_mlo_get_assoc_link_vdev(vdev);
+		if (!assoc_vdev) {
+			sme_err("Assoc vdev is null");
+			wlan_objmgr_vdev_release_ref(vdev,
+						     WLAN_MLME_OBJMGR_ID);
+			return QDF_STATUS_E_FAILURE;
+		}
+		cm_roam_start_init_on_connect(mac_ctx->pdev,
+					      wlan_vdev_get_id(assoc_vdev));
+	} else if (!wlan_vdev_mlme_is_mlo_vdev(vdev)) {
+		cm_roam_start_init_on_connect(mac_ctx->pdev, vdev_id);
+	}
+	wlan_objmgr_vdev_release_ref(vdev,
+				     WLAN_MLME_OBJMGR_ID);
+
+	return QDF_STATUS_SUCCESS;
+}
+#else
+static QDF_STATUS
+csr_roam_send_rso_enable(struct mac_context *mac_ctx, uint8_t vdev_id)
+{
+	cm_roam_start_init_on_connect(mac_ctx->pdev, vdev_id);
+	return QDF_STATUS_SUCCESS;
+}
+#endif
+
 static void
 csr_roam_chk_lnk_set_ctx_rsp(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 {
@@ -3448,7 +3493,11 @@ csr_roam_chk_lnk_set_ctx_rsp(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
 		csr_roam_substate_change(mac_ctx, eCSR_ROAM_SUBSTATE_NONE,
 					 sessionId);
 		cm_stop_wait_for_key_timer(mac_ctx->psoc, sessionId);
-		cm_roam_start_init_on_connect(mac_ctx->pdev, sessionId);
+		if (QDF_IS_STATUS_ERROR(csr_roam_send_rso_enable(mac_ctx,
+								 sessionId))) {
+			qdf_mem_free(roam_info);
+			return;
+		}
 	}
 	if (eSIR_SME_SUCCESS == pRsp->status_code) {
 		qdf_copy_macaddr(&roam_info->peerMac, &pRsp->peer_macaddr);