qcacld-3.0: Allow drop pkts when pending is large
On some cases, dp_rx_thread can not handle nbufs in time,
then a large number of packets are pending in
rx_thread->nbuf_queue, which run out of system memory at
last and failed to malloc new buffers for refill buffer ring,
fw crash is encountered. To avoid this, drop RX packets when
the pending number becomes large.
Change-Id: Ie4e001dc584821cf68253aa3a15a5fd72394c736
CRs-Fixed: 2737181
diff --git a/Kbuild b/Kbuild
index 6d24af4..aaf203f 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2813,6 +2813,7 @@
cppflags-$(CONFIG_HTT_PADDR64) += -DHTT_PADDR64
cppflags-$(CONFIG_OL_RX_INDICATION_RECORD) += -DOL_RX_INDICATION_RECORD
cppflags-$(CONFIG_TSOSEG_DEBUG) += -DTSOSEG_DEBUG
+cppflags-$(CONFIG_ALLOW_PKT_DROPPING) += -DFEATURE_ALLOW_PKT_DROPPING
cppflags-$(CONFIG_ENABLE_DEBUG_ADDRESS_MARKING) += -DENABLE_DEBUG_ADDRESS_MARKING
cppflags-$(CONFIG_FEATURE_TSO) += -DFEATURE_TSO
diff --git a/configs/default_defconfig b/configs/default_defconfig
index da29f37..bbf3a6a 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -935,6 +935,7 @@
CONFIG_WLAN_RECORD_RX_PADDR := y
CONFIG_HIF_CPU_PERF_AFFINE_MASK := y
CONFIG_WLAN_FEATURE_DP_RX_RING_HISTORY := y
+ CONFIG_ALLOW_PKT_DROPPING := y
endif
CONFIG_DYNAMIC_RX_AGGREGATION := y
CONFIG_RX_DESC_DEBUG_CHECK:= y
diff --git a/core/dp/txrx3.0/dp_rx_thread.c b/core/dp/txrx3.0/dp_rx_thread.c
index 9edb7e9..5adec7d 100644
--- a/core/dp/txrx3.0/dp_rx_thread.c
+++ b/core/dp/txrx3.0/dp_rx_thread.c
@@ -104,7 +104,7 @@
if (!total_queued)
return;
- dp_info("thread:%u - qlen:%u queued:(total:%u %s) dequeued:%u stack:%u gro_flushes: %u gro_flushes_by_vdev_del: %u rx_flushes: %u max_len:%u invalid(peer:%u vdev:%u rx-handle:%u others:%u)",
+ dp_info("thread:%u - qlen:%u queued:(total:%u %s) dequeued:%u stack:%u gro_flushes: %u gro_flushes_by_vdev_del: %u rx_flushes: %u max_len:%u invalid(peer:%u vdev:%u rx-handle:%u others:%u enq fail:%u)",
rx_thread->id,
qdf_nbuf_queue_head_qlen(&rx_thread->nbuf_queue),
total_queued,
@@ -118,7 +118,8 @@
rx_thread->stats.dropped_invalid_peer,
rx_thread->stats.dropped_invalid_vdev,
rx_thread->stats.dropped_invalid_os_rx_handles,
- rx_thread->stats.dropped_others);
+ rx_thread->stats.dropped_others,
+ rx_thread->stats.dropped_enq_fail);
}
QDF_STATUS dp_rx_tm_dump_stats(struct dp_rx_tm_handle *rx_tm_hdl)
@@ -133,6 +134,79 @@
return QDF_STATUS_SUCCESS;
}
+#ifdef FEATURE_ALLOW_PKT_DROPPING
+/*
+ * dp_check_and_update_pending() - Check and Set RX Pending flag
+ * @tm_handle_cmn - DP thread pointer
+ *
+ * Returns: QDF_STATUS_SUCCESS on success or qdf error code on
+ * failure
+ */
+static inline
+QDF_STATUS dp_check_and_update_pending(struct dp_rx_tm_handle_cmn
+ *tm_handle_cmn)
+{
+ struct dp_txrx_handle_cmn *txrx_handle_cmn;
+ struct dp_rx_tm_handle *rx_tm_hdl =
+ (struct dp_rx_tm_handle *)tm_handle_cmn;
+ struct dp_soc *dp_soc;
+ uint32_t rx_pending_hl_threshold;
+ uint32_t rx_pending_lo_threshold;
+ uint32_t nbuf_queued_total = 0;
+ uint32_t nbuf_dequeued_total = 0;
+ uint32_t pending = 0;
+ int i;
+
+ txrx_handle_cmn =
+ dp_rx_thread_get_txrx_handle(tm_handle_cmn);
+ if (!txrx_handle_cmn) {
+ dp_err("invalid txrx_handle_cmn!");
+ QDF_BUG(0);
+ return QDF_STATUS_E_FAILURE;
+ }
+
+ dp_soc = (struct dp_soc *)dp_txrx_get_soc_from_ext_handle(
+ txrx_handle_cmn);
+ if (!dp_soc) {
+ dp_err("invalid soc!");
+ QDF_BUG(0);
+ return QDF_STATUS_E_FAILURE;
+ }
+
+ rx_pending_hl_threshold = wlan_cfg_rx_pending_hl_threshold(
+ dp_soc->wlan_cfg_ctx);
+ rx_pending_lo_threshold = wlan_cfg_rx_pending_lo_threshold(
+ dp_soc->wlan_cfg_ctx);
+
+ for (i = 0; i < rx_tm_hdl->num_dp_rx_threads; i++) {
+ if (likely(rx_tm_hdl->rx_thread[i])) {
+ nbuf_queued_total +=
+ rx_tm_hdl->rx_thread[i]->stats.nbuf_queued_total;
+ nbuf_dequeued_total +=
+ rx_tm_hdl->rx_thread[i]->stats.nbuf_dequeued;
+ }
+ }
+
+ if (nbuf_queued_total > nbuf_dequeued_total)
+ pending = nbuf_queued_total - nbuf_dequeued_total;
+
+ if (unlikely(pending > rx_pending_hl_threshold))
+ qdf_atomic_set(&rx_tm_hdl->allow_dropping, 1);
+ else if (pending < rx_pending_lo_threshold)
+ qdf_atomic_set(&rx_tm_hdl->allow_dropping, 0);
+
+ return QDF_STATUS_SUCCESS;
+}
+
+#else
+static inline
+QDF_STATUS dp_check_and_update_pending(struct dp_rx_tm_handle_cmn
+ *tm_handle_cmn)
+{
+ return QDF_STATUS_SUCCESS;
+}
+#endif
+
/**
* dp_rx_tm_thread_enqueue() - enqueue nbuf list into rx_thread
* @rx_thread - rx_thread in which the nbuf needs to be queued
@@ -157,6 +231,7 @@
struct dp_rx_tm_handle_cmn *tm_handle_cmn;
uint8_t reo_ring_num = QDF_NBUF_CB_RX_CTX_ID(nbuf_list);
qdf_wait_queue_head_t *wait_q_ptr;
+ uint8_t allow_dropping;
tm_handle_cmn = rx_thread->rtm_handle_cmn;
@@ -177,6 +252,15 @@
num_elements_in_nbuf = QDF_NBUF_CB_RX_NUM_ELEMENTS_IN_LIST(nbuf_list);
nbuf_queued = num_elements_in_nbuf;
+ allow_dropping = qdf_atomic_read(
+ &((struct dp_rx_tm_handle *)tm_handle_cmn)->allow_dropping);
+ if (unlikely(allow_dropping)) {
+ qdf_nbuf_list_free(nbuf_list);
+ rx_thread->stats.dropped_enq_fail += num_elements_in_nbuf;
+ nbuf_queued = 0;
+ goto enq_done;
+ }
+
dp_rx_tm_walk_skb_list(nbuf_list);
head_ptr = nbuf_list;
@@ -214,6 +298,9 @@
temp_qlen = qdf_nbuf_queue_head_qlen(&rx_thread->nbuf_queue);
rx_thread->stats.nbuf_queued[reo_ring_num] += nbuf_queued;
+ rx_thread->stats.nbuf_queued_total += nbuf_queued;
+
+ dp_check_and_update_pending(tm_handle_cmn);
if (temp_qlen > rx_thread->stats.nbufq_max_len)
rx_thread->stats.nbufq_max_len = temp_qlen;
diff --git a/core/dp/txrx3.0/dp_rx_thread.h b/core/dp/txrx3.0/dp_rx_thread.h
index cd82010..f7f8864 100644
--- a/core/dp/txrx3.0/dp_rx_thread.h
+++ b/core/dp/txrx3.0/dp_rx_thread.h
@@ -40,6 +40,7 @@
/**
* struct dp_rx_thread_stats - structure holding stats for DP RX thread
* @nbuf_queued: packets queued into the thread per reo ring
+ * @nbuf_queued_total: packets queued into the thread for all reo rings
* @nbuf_dequeued: packets de-queued from the thread
* @nbuf_sent_to_stack: packets sent to the stack. some dequeued packets may be
* dropped due to no peer or vdev, hence this stat.
@@ -50,10 +51,11 @@
* @rx_flushed: packets flushed after vdev delete
* @dropped_invalid_peer: packets(nbuf_list) dropped due to no peer
* @dropped_others: packets dropped due to other reasons
-
+ * @dropped_enq_fail: packets dropped due to pending queue full
*/
struct dp_rx_thread_stats {
unsigned int nbuf_queued[DP_RX_TM_MAX_REO_RINGS];
+ unsigned int nbuf_queued_total;
unsigned int nbuf_dequeued;
unsigned int nbuf_sent_to_stack;
unsigned int gro_flushes;
@@ -64,6 +66,7 @@
unsigned int dropped_invalid_peer;
unsigned int dropped_invalid_os_rx_handles;
unsigned int dropped_others;
+ unsigned int dropped_enq_fail;
};
/**
@@ -126,12 +129,14 @@
* @txrx_handle_cmn: opaque txrx handle to get to pdev and soc
* @state: state of the rx_threads. All of them should be in the same state.
* @rx_thread: array of pointers of type struct dp_rx_thread
+ * @allow_dropping: flag to indicate frame dropping is enabled
*/
struct dp_rx_tm_handle {
uint8_t num_dp_rx_threads;
struct dp_txrx_handle_cmn *txrx_handle_cmn;
enum dp_rx_thread_state state;
struct dp_rx_thread **rx_thread;
+ qdf_atomic_t allow_dropping;
};
/**