qcacld-3.0: Save assoc request frame in qdf_nbuf_t

Legacy mlme need notify assoc request frame to mlo mgr. It should
be sent to mlo mgr in qdf_nbuf_t.

Change-Id: I192503a00346498408971462d3b15cc98efa9919
CRs-Fixed: 2976150

core/cds/src/i_cds_packet.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016, 2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2016, 2019, 2021 The Linux Foundation. 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
@@ -55,6 +55,7 @@
  * @session_id: PE session
  * @tsf_delta: Delta between tsf in frame and local value of tsf
  * @rssi_raw: rssi based on actual noise floor in hardware.
+ * @pkt_buf: Pointer to Packet
  */
 typedef struct {
 	uint32_t frequency;
@@ -73,6 +74,7 @@ typedef struct {
 	uint8_t session_id;
 	uint32_t tsf_delta;
 	uint32_t rssi_raw;
+	void *pkt_qdf_buf;
 } t_packetmeta, *tp_packetmeta;
 
 /* implementation specific cds packet type */

core/mac/src/include/parser_api.h

@@ -365,6 +365,7 @@ typedef struct sSirAssocReq {
 	uint8_t supportedChannelsPresent;
 	/* keeping copy of association request received, this is
 	   required for indicating the frame to upper layers */
+	qdf_nbuf_t assoc_req_buf;
 	uint32_t assocReqFrameLength;
 	uint8_t *assocReqFrame;
 	tDot11fIEVHTCaps VHTCaps;

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

@@ -723,24 +723,42 @@ lim_reject_association(struct mac_context *mac_ctx, tSirMacAddr peer_addr,
 				      sub_type, 0, session_entry, false);
 
 	if (session_entry->parsedAssocReq[sta_ds->assocId]) {
-		uint8_t *assoc_req_frame;
-
-		assoc_req_frame = (uint8_t *)((tpSirAssocReq) (session_entry->
-			parsedAssocReq[sta_ds->assocId]))->assocReqFrame;
-		/*
-		 *Assoction confirmation is complete,
-		 *free the copy of association request frame.
-		 */
-		if (assoc_req_frame) {
-			qdf_mem_free(assoc_req_frame);
-			assoc_req_frame = NULL;
-		}
+		lim_free_assoc_req_frm_buf(
+			session_entry->parsedAssocReq[sta_ds->assocId]);
 
 		qdf_mem_free(session_entry->parsedAssocReq[sta_ds->assocId]);
 		session_entry->parsedAssocReq[sta_ds->assocId] = NULL;
 	}
 }
 
+void lim_free_assoc_req_frm_buf(tpSirAssocReq assoc_req)
+{
+	if (!assoc_req)
+		return;
+	if (assoc_req->assoc_req_buf) {
+		qdf_nbuf_free(assoc_req->assoc_req_buf);
+		assoc_req->assoc_req_buf = NULL;
+		assoc_req->assocReqFrame = NULL;
+		assoc_req->assocReqFrameLength = 0;
+	}
+}
+
+bool lim_alloc_assoc_req_frm_buf(tpSirAssocReq assoc_req,
+				 qdf_nbuf_t buf, uint32_t mac_header_len,
+				 uint32_t frame_len)
+{
+	if (!assoc_req)
+		return false;
+	assoc_req->assoc_req_buf = qdf_nbuf_clone(buf);
+	if (!assoc_req->assoc_req_buf)
+		return false;
+	assoc_req->assocReqFrame = qdf_nbuf_data(assoc_req->assoc_req_buf) +
+				   mac_header_len;
+	assoc_req->assocReqFrameLength = frame_len;
+
+	return true;
+}
+
 /**
  * lim_decide_ap_protection_on_ht20_delete() - function to update protection
  *                                              parameters.

core/mac/src/pe/lim/lim_assoc_utils.h

@@ -401,4 +401,23 @@ void lim_update_vhtcaps_assoc_resp(struct mac_context *mac_ctx,
 				   struct bss_params *pAddBssParams,
 				   tDot11fIEVHTCaps *vht_caps,
 				   struct pe_session *pe_session);
+
+/**
+ * lim_free_assoc_req_frm_buf() - free assoc request frame buffer
+ * @assoc_req: pointer to tpSirAssocReq
+ *
+ * Return : void
+ */
+void lim_free_assoc_req_frm_buf(tpSirAssocReq assoc_req);
+
+/**
+ * lim_alloc_assoc_req_frm_buf() - allocate assoc request frame buffer
+ * @assoc_req: pointer to tpSirAssocReq
+ * @buf: pointer to assoc request frame
+ * @mac_header_len: ieee80211 header length
+ * @frame_len: payload length of assoc request frame
+ */
+bool lim_alloc_assoc_req_frm_buf(tpSirAssocReq assoc_req,
+				 qdf_nbuf_t buf, uint32_t mac_header_len,
+				 uint32_t frame_len);
 #endif /* __LIM_ASSOC_UTILS_H */

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

@@ -1554,11 +1554,7 @@ static bool lim_update_sta_ds(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 	if (session->parsedAssocReq) {
 		tmp_assoc_req = session->parsedAssocReq[sta_ds->assocId];
 		if (tmp_assoc_req) {
-			if (tmp_assoc_req->assocReqFrame) {
-				qdf_mem_free(tmp_assoc_req->assocReqFrame);
-				tmp_assoc_req->assocReqFrame = NULL;
-				tmp_assoc_req->assocReqFrameLength = 0;
-			}
+			lim_free_assoc_req_frm_buf(tmp_assoc_req);
 			qdf_mem_free(tmp_assoc_req);
 			tmp_assoc_req = NULL;
 		}
@@ -2003,11 +1999,7 @@ void lim_process_assoc_cleanup(struct mac_context *mac_ctx,
 	tpSirAssocReq tmp_assoc_req;
 
 	if (assoc_req) {
-		if (assoc_req->assocReqFrame) {
-			qdf_mem_free(assoc_req->assocReqFrame);
-			assoc_req->assocReqFrame = NULL;
-			assoc_req->assocReqFrameLength = 0;
-		}
+		lim_free_assoc_req_frm_buf(assoc_req);
 
 		qdf_mem_free(assoc_req);
 		/* to avoid double free */
@@ -2022,12 +2014,7 @@ void lim_process_assoc_cleanup(struct mac_context *mac_ctx,
 			tmp_assoc_req =
 				session->parsedAssocReq[sta_ds->assocId];
 			if (tmp_assoc_req) {
-				if (tmp_assoc_req->assocReqFrame) {
-					qdf_mem_free(
-						tmp_assoc_req->assocReqFrame);
-					tmp_assoc_req->assocReqFrame = NULL;
-					tmp_assoc_req->assocReqFrameLength = 0;
-				}
+				lim_free_assoc_req_frm_buf(tmp_assoc_req);
 				qdf_mem_free(tmp_assoc_req);
 				session->parsedAssocReq[sta_ds->assocId] = NULL;
 			}
@@ -2473,14 +2460,12 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in
 				assoc_req, sub_type, frm_body, frame_len))
 		goto error;
 
-	assoc_req->assocReqFrame = qdf_mem_malloc(frame_len);
-	if (!assoc_req->assocReqFrame)
+	if (!lim_alloc_assoc_req_frm_buf(assoc_req,
+					 WMA_GET_QDF_NBUF(rx_pkt_info),
+					 WMA_GET_RX_MAC_HEADER_LEN(rx_pkt_info),
+					 frame_len))
 		goto error;
 
-	qdf_mem_copy((uint8_t *) assoc_req->assocReqFrame,
-		(uint8_t *) frm_body, frame_len);
-	assoc_req->assocReqFrameLength = frame_len;
-
 	if (false == lim_chk_capab(mac_ctx, hdr, session, assoc_req,
 				sub_type, &local_cap))
 		goto error;

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

@@ -5790,10 +5790,7 @@ end:
 		!assoc_cnf.need_assoc_rsp_tx_cb) {
 		assoc_req = (tpSirAssocReq)
 			session_entry->parsedAssocReq[sta_ds->assocId];
-		if (assoc_req->assocReqFrame) {
-			qdf_mem_free(assoc_req->assocReqFrame);
-			assoc_req->assocReqFrame = NULL;
-		}
+		lim_free_assoc_req_frm_buf(assoc_req);
 		qdf_mem_free(session_entry->parsedAssocReq[sta_ds->assocId]);
 		session_entry->parsedAssocReq[sta_ds->assocId] = NULL;
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2021 The Linux Foundation. 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
@@ -38,6 +38,7 @@
 #include "lim_security_utils.h"
 #include "lim_ft_defs.h"
 #include "lim_session.h"
+#include <lim_assoc_utils.h>
 
 #define LIM_SEED_LENGTH 16
 /*
@@ -311,8 +312,7 @@ void lim_release_pre_auth_node(struct mac_context *mac,
 		tpSirAssocReq assoc =
 			 (tpSirAssocReq)pAuthNode->assoc_req.assoc_req;
 
-		if (assoc->assocReqFrameLength)
-			qdf_mem_free(assoc->assocReqFrame);
+		lim_free_assoc_req_frm_buf(assoc);
 		qdf_mem_free(assoc);
 		pAuthNode->assoc_req.assoc_req = NULL;
 		pAuthNode->assoc_req.present = false;

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

@@ -1357,10 +1357,7 @@ static QDF_STATUS lim_assoc_rsp_tx_complete(
 	qdf_mem_free(lim_assoc_ind);
 
 free_buffers:
-	if (assoc_req->assocReqFrame) {
-		qdf_mem_free(assoc_req->assocReqFrame);
-		assoc_req->assocReqFrame = NULL;
-	}
+	lim_free_assoc_req_frm_buf(assoc_req);
 	qdf_mem_free(session_entry->parsedAssocReq[sta_ds->assocId]);
 	session_entry->parsedAssocReq[sta_ds->assocId] = NULL;
 	qdf_nbuf_free(buf);
@@ -1370,10 +1367,7 @@ free_buffers:
 lim_assoc_ind:
 	qdf_mem_free(lim_assoc_ind);
 free_assoc_req:
-	if (assoc_req->assocReqFrame) {
-		qdf_mem_free(assoc_req->assocReqFrame);
-		assoc_req->assocReqFrame = NULL;
-	}
+	lim_free_assoc_req_frm_buf(assoc_req);
 	qdf_mem_free(session_entry->parsedAssocReq[sta_ds->assocId]);
 	session_entry->parsedAssocReq[sta_ds->assocId] = NULL;
 end:

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

@@ -38,6 +38,7 @@
 #include "sch_api.h"
 #include "lim_send_messages.h"
 #include "cfg_ucfg_api.h"
+#include <lim_assoc_utils.h>
 
 #ifdef WLAN_ALLOCATE_GLOBAL_BUFFERS_DYNAMICALLY
 static struct sDphHashNode *g_dph_node_array;
@@ -935,11 +936,7 @@ void pe_delete_session(struct mac_context *mac_ctx, struct pe_session *session)
 				continue;
 			tmp_ptr = ((tpSirAssocReq)
 				  (session->parsedAssocReq[i]));
-			if (tmp_ptr->assocReqFrame) {
-				qdf_mem_free(tmp_ptr->assocReqFrame);
-				tmp_ptr->assocReqFrame = NULL;
-				tmp_ptr->assocReqFrameLength = 0;
-			}
+			lim_free_assoc_req_frm_buf(tmp_ptr);
 			qdf_mem_free(session->parsedAssocReq[i]);
 			session->parsedAssocReq[i] = NULL;
 		}

core/wma/inc/wma_types.h

@@ -30,6 +30,12 @@
 
 #define DPU_FEEDBACK_UNPROTECTED_ERROR 0x0F
 
+#define WMA_GET_QDF_NBUF(pRxMeta) \
+	(((t_packetmeta *)pRxMeta)->pkt_qdf_buf)
+
+#define WMA_GET_RX_MAC_HEADER_LEN(pRxMeta) \
+	(((t_packetmeta *)pRxMeta)->mpdu_hdr_len)
+
 #define WMA_GET_RX_MAC_HEADER(pRxMeta) \
 	(tpSirMacMgmtHdr)(((t_packetmeta *)pRxMeta)->mpdu_hdr_ptr)
 

core/wma/src/wma_mgmt.c

@@ -3465,6 +3465,7 @@ int wma_form_rx_packet(qdf_nbuf_t buf,
 					 rx_pkt->pkt_meta.mpdu_hdr_len;
 	rx_pkt->pkt_meta.tsf_delta = mgmt_rx_params->tsf_delta;
 	rx_pkt->pkt_buf = buf;
+	rx_pkt->pkt_meta.pkt_qdf_buf = buf;
 
 	/* If it is a beacon/probe response, save it for future use */
 	mgt_type = (wh)->i_fc[0] & IEEE80211_FC0_TYPE_MASK;