qcacld-3.0: Featurize dynamic rx agggregation feature
Dynamic rx aggregation feature depends on the context
id which is obtained from the packet context block.
This context id is invalid when this feature is not
enabled, and hence can lead to out of array access/write
leading to memory corruption.
Fix this issue by not using the context id when the dynamic
rx aggregation feature is not enabled.
Change-Id: Ie551217409b0f5aa2f704f9c617949e0d42a74d0
CRs-Fixed: 2742653
diff --git a/Kbuild b/Kbuild
index 65d0550..13a946f 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2877,6 +2877,7 @@
ccflags-$(CONFIG_HIF_IPCI) += -DCE_SVC_CMN_INIT
ccflags-$(CONFIG_HIF_SNOC) += -DCE_SVC_CMN_INIT
cppflags-$(CONFIG_RX_DESC_SANITY_WAR) += -DRX_DESC_SANITY_WAR
+cppflags-$(CONFIG_DYNAMIC_RX_AGGREGATION) += -DWLAN_FEATURE_DYNAMIC_RX_AGGREGATION
ifeq ($(CONFIG_QCA6290_11AX), y)
cppflags-y += -DQCA_WIFI_QCA6290_11AX -DQCA_WIFI_QCA6290_11AX_MU_UL
diff --git a/configs/default_defconfig b/configs/default_defconfig
index 77aa723..9552b02 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -935,6 +935,7 @@
CONFIG_HIF_CPU_PERF_AFFINE_MASK := y
CONFIG_WLAN_FEATURE_DP_RX_RING_HISTORY := y
endif
+ CONFIG_DYNAMIC_RX_AGGREGATION := y
CONFIG_RX_DESC_DEBUG_CHECK:= y
CONFIG_WLAN_SUPPORT_DATA_STALL := y
CONFIG_WLAN_DP_PER_RING_TYPE_CONFIG := y
diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c
index a1d7e27..6ef2489 100644
--- a/core/hdd/src/wlan_hdd_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_tx_rx.c
@@ -1560,6 +1560,7 @@
}
}
+#ifdef WLAN_FEATURE_DYNAMIC_RX_AGGREGATION
/**
* hdd_gro_rx_bh_disable() - GRO RX/flush function.
* @napi_to_use: napi to be used to give packets to the stack, gro flush
@@ -1610,6 +1611,49 @@
return status;
}
+#else /* WLAN_FEATURE_DYNAMIC_RX_AGGREGATION */
+
+/**
+ * hdd_gro_rx_bh_disable() - GRO RX/flush function.
+ * @napi_to_use: napi to be used to give packets to the stack, gro flush
+ * @skb: pointer to sk_buff
+ *
+ * Function calls napi_gro_receive for the skb. If the skb indicates that a
+ * flush needs to be done (set by the lower DP layer), the function also calls
+ * napi_gro_flush. Local softirqs are disabled (and later enabled) while making
+ * napi_gro__ calls.
+ *
+ * Return: QDF_STATUS_SUCCESS if not dropped by napi_gro_receive or
+ * QDF error code.
+ */
+static QDF_STATUS hdd_gro_rx_bh_disable(struct hdd_adapter *adapter,
+ struct napi_struct *napi_to_use,
+ struct sk_buff *skb)
+{
+ QDF_STATUS status = QDF_STATUS_SUCCESS;
+ struct hdd_context *hdd_ctx = adapter->hdd_ctx;
+ gro_result_t gro_res;
+
+ skb_set_hash(skb, QDF_NBUF_CB_RX_FLOW_ID(skb), PKT_HASH_TYPE_L4);
+
+ local_bh_disable();
+ gro_res = napi_gro_receive(napi_to_use, skb);
+
+ if (hdd_get_current_throughput_level(hdd_ctx) == PLD_BUS_WIDTH_IDLE) {
+ if (gro_res != GRO_DROP && gro_res != GRO_NORMAL) {
+ adapter->hdd_stats.tx_rx_stats.rx_gro_low_tput_flush++;
+ napi_gro_flush(napi_to_use, false);
+ }
+ }
+ local_bh_enable();
+
+ if (gro_res == GRO_DROP)
+ status = QDF_STATUS_E_GRO_DROP;
+
+ return status;
+}
+#endif /* WLAN_FEATURE_DYNAMIC_RX_AGGREGATION */
+
/**
* hdd_gro_rx_dp_thread() - Handle Rx procesing via GRO for DP thread
* @adapter: pointer to adapter context
@@ -2023,6 +2067,7 @@
}
#endif
+#ifdef WLAN_FEATURE_DYNAMIC_RX_AGGREGATION
/**
* hdd_rx_check_qdisc_for_adapter() - Check if any ingress qdisc is configured
* for given adapter
@@ -2156,6 +2201,64 @@
return status;
}
+
+#else /* WLAN_FEATURE_DYNAMIC_RX_AGGREGATION */
+
+QDF_STATUS hdd_rx_deliver_to_stack(struct hdd_adapter *adapter,
+ struct sk_buff *skb)
+{
+ struct hdd_context *hdd_ctx = adapter->hdd_ctx;
+ int status = QDF_STATUS_E_FAILURE;
+ int netif_status;
+ bool skb_receive_offload_ok = false;
+
+ if (QDF_NBUF_CB_RX_TCP_PROTO(skb) &&
+ !QDF_NBUF_CB_RX_PEER_CACHED_FRM(skb))
+ skb_receive_offload_ok = true;
+
+ if (skb_receive_offload_ok && hdd_ctx->receive_offload_cb) {
+ status = hdd_ctx->receive_offload_cb(adapter, skb);
+
+ if (QDF_IS_STATUS_SUCCESS(status)) {
+ adapter->hdd_stats.tx_rx_stats.rx_aggregated++;
+ return status;
+ }
+
+ if (status == QDF_STATUS_E_GRO_DROP) {
+ adapter->hdd_stats.tx_rx_stats.rx_gro_dropped++;
+ return status;
+ }
+ }
+
+ adapter->hdd_stats.tx_rx_stats.rx_non_aggregated++;
+
+ /* Account for GRO/LRO ineligible packets, mostly UDP */
+ hdd_ctx->no_rx_offload_pkt_cnt++;
+
+ if (qdf_likely(hdd_ctx->enable_dp_rx_threads ||
+ hdd_ctx->enable_rxthread)) {
+ local_bh_disable();
+ netif_status = netif_receive_skb(skb);
+ local_bh_enable();
+ } else if (qdf_unlikely(QDF_NBUF_CB_RX_PEER_CACHED_FRM(skb))) {
+ /*
+ * Frames before peer is registered to avoid contention with
+ * NAPI softirq.
+ * Refer fix:
+ * qcacld-3.0: Do netif_rx_ni() for frames received before
+ * peer assoc
+ */
+ netif_status = netif_rx_ni(skb);
+ } else { /* NAPI Context */
+ netif_status = netif_receive_skb(skb);
+ }
+
+ if (netif_status == NET_RX_SUCCESS)
+ status = QDF_STATUS_SUCCESS;
+
+ return status;
+}
+#endif /* WLAN_FEATURE_DYNAMIC_RX_AGGREGATION */
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0))