qcacld-3.0: Enhance the dequeue logic to limit logs per second

Restrict the dequeue logic to send only 20 logs per second
to userspace. Add check to see if queue is empty before
trying to dequeue.

Change-Id: I778556c649d123718cf76c943c5b2ed7f6c6e8e5
CRs-Fixed: 3014554

components/cmn_services/logging/inc/wlan_connectivity_logging.h

@@ -28,6 +28,7 @@
 #include "wlan_crypto_global_api.h"
 #include <wlan_cm_api.h>
 #include "wlan_cm_roam_api.h"
+#include "wlan_logging_sock_svc.h"
 
 #define WLAN_MAX_LOGGING_FREQ 90
 
@@ -273,7 +274,9 @@ struct wlan_connect_info {
 
 #define WLAN_MAX_LOG_RECORDS 45
 #define WLAN_MAX_LOG_LEN     256
-#define MAX_RECORD_IN_SINGLE_EVT 5
+#define WLAN_RECORDS_PER_SEC 20
+#define MAX_RECORD_IN_SINGLE_EVT 10
+
 /**
  * struct wlan_log_record  - Structure for indvidual records in the ring
  * buffer
@@ -325,6 +328,8 @@ struct wlan_cl_hdd_cbks {
  * struct wlan_connectivity_log_buf_data  - Master structure to hold the
  * pointers to the ring buffers.
  * @hdd_cbks: Hdd callbacks
+ * @first_record_timestamp_in_last_sec: First record timestamp
+ * @sent_msgs_count: Total sent messages counter in the last 1 sec
  * @head: Pointer to the 1st record allocated in the ring buffer.
  * @read_ptr: Pointer to the next record that can be read.
  * @write_ptr: Pointer to the next empty record to be written.
@@ -337,6 +342,8 @@ struct wlan_cl_hdd_cbks {
  */
 struct wlan_connectivity_log_buf_data {
 	struct wlan_cl_hdd_cbks hdd_cbks;
+	uint64_t first_record_timestamp_in_last_sec;
+	uint64_t sent_msgs_count;
 	struct wlan_log_record *head;
 	struct wlan_log_record *read_ptr;
 	struct wlan_log_record *write_ptr;

components/cmn_services/logging/src/wlan_connectivity_logging.c

@@ -71,6 +71,24 @@ void wlan_connectivity_logging_deinit(void)
 }
 #endif
 
+static bool wlan_logging_is_queue_empty(void)
+{
+	if (!qdf_atomic_read(&global_cl.is_active))
+		return true;
+
+	qdf_spin_lock_bh(&global_cl.write_ptr_lock);
+
+	if (global_cl.read_ptr == global_cl.write_ptr &&
+	    !global_cl.write_ptr->is_record_filled) {
+		qdf_spin_unlock_bh(&global_cl.write_ptr_lock);
+		return true;
+	}
+
+	qdf_spin_unlock_bh(&global_cl.write_ptr_lock);
+
+	return false;
+}
+
 QDF_STATUS
 wlan_connectivity_log_enqueue(struct wlan_log_record *new_record)
 {
@@ -96,6 +114,8 @@ wlan_connectivity_log_enqueue(struct wlan_log_record *new_record)
 		logging_debug("vdev:%d dropping msg sub-type:%d total drpd:%d",
 			      new_record->vdev_id, new_record->log_subtype,
 			      qdf_atomic_read(&global_cl.dropped_msgs));
+		wlan_logging_set_connectivity_log();
+
 		return QDF_STATUS_E_NOMEM;
 	}
 
@@ -110,6 +130,8 @@ wlan_connectivity_log_enqueue(struct wlan_log_record *new_record)
 
 	qdf_spin_unlock_bh(&global_cl.write_ptr_lock);
 
+	wlan_logging_set_connectivity_log();
+
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -118,12 +140,37 @@ wlan_connectivity_log_dequeue(void)
 {
 	struct wlan_log_record *data;
 	uint8_t idx = 0;
+	uint64_t current_timestamp, time_delta;
+
+	if (wlan_logging_is_queue_empty())
+		return QDF_STATUS_SUCCESS;
 
 	data = qdf_mem_malloc(MAX_RECORD_IN_SINGLE_EVT * sizeof(*data));
 	if (!data)
 		return QDF_STATUS_E_NOMEM;
 
 	while (global_cl.read_ptr->is_record_filled) {
+		current_timestamp = qdf_get_time_of_the_day_ms();
+		time_delta = current_timestamp -
+				global_cl.first_record_timestamp_in_last_sec;
+		/*
+		 * Don't send logs if the time difference between the first
+		 * packet queued and current timestamp is less than 1 second and
+		 * the sent messages count is 20.
+		 * Else if the current record to be dequeued is 1 sec apart from
+		 * the previous first packet timestamp, then reset the
+		 * sent messages counter and first packet timestamp.
+		 */
+		if (time_delta < 1000 &&
+		    global_cl.sent_msgs_count >= WLAN_RECORDS_PER_SEC) {
+			break;
+		} else if (time_delta > 1000) {
+			global_cl.sent_msgs_count = 0;
+			global_cl.first_record_timestamp_in_last_sec =
+							current_timestamp;
+		}
+
+		global_cl.sent_msgs_count %= WLAN_RECORDS_PER_SEC;
 		data[idx] = *global_cl.read_ptr;
 
 		global_cl.read_idx++;
@@ -132,6 +179,7 @@ wlan_connectivity_log_dequeue(void)
 		global_cl.read_ptr =
 			&global_cl.head[global_cl.read_idx];
 
+		global_cl.sent_msgs_count++;
 		idx++;
 		if (idx >= MAX_RECORD_IN_SINGLE_EVT)
 			break;

components/mlme/core/inc/wlan_mlme_main.h

@@ -93,34 +93,18 @@ struct pwr_channel_info {
 	int8_t max_tx_pwr;
 };
 
-#ifdef WLAN_FEATURE_CONNECTIVITY_LOGGING
-/**
- * struct wlan_mlme_logging  - Data structures related to the logging
- * to userspace infrastructure
- * @user_log: Log to userspace periodic work. This work will be rescheduled
- * every 1 sec.
- */
-struct wlan_mlme_logging {
-	struct qdf_periodic_work logging_work;
-};
-#endif
-
 /**
  * struct wlan_mlme_psoc_ext_obj -MLME ext psoc priv object
  * @cfg:     cfg items
  * @rso_tx_ops: Roam Tx ops to send roam offload commands to firmware
  * @rso_rx_ops: Roam Rx ops to receive roam offload events from firmware
  * @wfa_testcmd: WFA config tx ops to send to FW
- * @logger_data: Logging related periodic work data
  */
 struct wlan_mlme_psoc_ext_obj {
 	struct wlan_mlme_cfg cfg;
 	struct wlan_cm_roam_tx_ops rso_tx_ops;
 	struct wlan_cm_roam_rx_ops rso_rx_ops;
 	struct wlan_mlme_wfa_cmd wfa_testcmd;
-#ifdef WLAN_FEATURE_CONNECTIVITY_LOGGING
-	struct wlan_mlme_logging logger_data;
-#endif
 };
 
 /**