qcacld-3.0: Optimize HDD pkt classify packet func

Currently there is a overlap of functionality between
hdd_wmm_classify_pkt and wlan_hdd_classify_pkt.

Move most functionality in hdd_wmm_classify_pkt which gets called during
hdd_select_queue.

Change-Id: I1eb735ecd2dfd7b6df6e78a134e7d16ee396b0f0
CRs-Fixed: 3114436

core/hdd/inc/wlan_hdd_tx_rx.h

@@ -426,7 +426,15 @@ void hdd_adapter_set_rps(uint8_t vdev_id, bool enable)
 }
 #endif
 
-void wlan_hdd_classify_pkt(struct sk_buff *skb);
+/**
+ * wlan_hdd_mark_pkt_type() - Mark packet type in qdf_nbuf_cb
+ * @skb - sk buff
+ *
+ * The function zeros out skb->cb and marks packet type in it.
+ *
+ * Return: none
+ */
+void wlan_hdd_mark_pkt_type(struct sk_buff *skb);
 
 #ifdef WLAN_FEATURE_DP_BUS_BANDWIDTH
 void hdd_reset_tcp_delack(struct hdd_context *hdd_ctx);

core/hdd/src/wlan_hdd_softap_tx_rx.c

@@ -726,7 +726,7 @@ static void __hdd_softap_hard_start_xmit(struct sk_buff *skb,
 	if (QDF_IS_STATUS_ERROR(hdd_softap_validate_driver_state(adapter)))
 		goto drop_pkt;
 
-	wlan_hdd_classify_pkt(skb);
+	wlan_hdd_mark_pkt_type(skb);
 
 	hdd_pkt_add_timestamp(adapter, QDF_PKT_TX_DRIVER_ENTRY,
 			      qdf_get_log_timestamp(), skb);

core/hdd/src/wlan_hdd_tx_rx.c

@@ -485,10 +485,9 @@ uint32_t hdd_txrx_get_tx_ack_count(struct hdd_adapter *adapter)
 
 #ifdef FEATURE_WLAN_DIAG_SUPPORT
 /**
- * qdf_event_eapol_log() - send event to wlan diag
+ * hdd_event_eapol_log() - send event to wlan diag
  * @skb: skb ptr
  * @dir: direction
- * @eapol_key_info: eapol key info
  *
  * Return: None
  */
@@ -549,15 +548,57 @@ int hdd_set_udp_qos_upgrade_config(struct hdd_adapter *adapter,
 }
 
 /**
- * wlan_hdd_classify_pkt() - classify packet
- * @skb - sk buff
+ * wlan_hdd_mark_critical_pkt() - Identify and mark critical packets
+ * @skb: skb ptr
  *
- * Return: none
+ * Return: None
+ */
+static void wlan_hdd_mark_critical_pkt(struct sk_buff *skb)
+{
+	if (qdf_nbuf_is_ipv4_eapol_pkt(skb)) {
+		QDF_NBUF_CB_GET_PACKET_TYPE(skb) =
+				QDF_NBUF_CB_PACKET_TYPE_EAPOL;
+	} else if (qdf_nbuf_is_ipv4_arp_pkt(skb)) {
+		QDF_NBUF_CB_GET_PACKET_TYPE(skb) =
+				QDF_NBUF_CB_PACKET_TYPE_ARP;
+	} else if (qdf_nbuf_is_ipv4_dhcp_pkt(skb)) {
+		QDF_NBUF_CB_GET_PACKET_TYPE(skb) =
+				QDF_NBUF_CB_PACKET_TYPE_DHCP;
+	} else if (qdf_nbuf_is_ipv6_dhcp_pkt(skb)) {
+		QDF_NBUF_CB_GET_PACKET_TYPE(skb) =
+				QDF_NBUF_CB_PACKET_TYPE_DHCPV6;
+	} else if (qdf_nbuf_is_icmpv6_pkt(skb)) {
+		QDF_NBUF_CB_GET_PACKET_TYPE(skb) =
+			QDF_NBUF_CB_PACKET_TYPE_ICMPv6;
+	}
+
+	QDF_NBUF_CB_TX_EXTRA_IS_CRITICAL(skb) = true;
+}
+
+/**
+ * wlan_hdd_mark_non_critical_pkt() - Identify and mark non-critical packets
+ * @skb: skb ptr
+ *
+ * Return: None
  */
-void wlan_hdd_classify_pkt(struct sk_buff *skb)
+static void wlan_hdd_mark_non_critical_pkt(struct sk_buff *skb)
+{
+	if (qdf_nbuf_is_icmp_pkt(skb))
+		QDF_NBUF_CB_GET_PACKET_TYPE(skb) =
+				QDF_NBUF_CB_PACKET_TYPE_ICMP;
+	else if (qdf_nbuf_is_ipv4_wapi_pkt(skb))
+		QDF_NBUF_CB_GET_PACKET_TYPE(skb) =
+			QDF_NBUF_CB_PACKET_TYPE_WAPI;
+}
+
+void wlan_hdd_mark_pkt_type(struct sk_buff *skb)
 {
 	struct ethhdr *eh = (struct ethhdr *)skb->data;
 
+	/*
+	 * Zero out CB before accessing it. Expection is that cb is accessed
+	 * for the first time here on TX path in hard_start_xmit.
+	 */
 	qdf_mem_zero(skb->cb, sizeof(skb->cb));
 
 	/* check destination mac address is broadcast/multicast */
@@ -566,24 +607,14 @@ void wlan_hdd_classify_pkt(struct sk_buff *skb)
 	else if (is_multicast_ether_addr((uint8_t *)eh))
 		QDF_NBUF_CB_GET_IS_MCAST(skb) = true;
 
-	if (qdf_nbuf_is_ipv4_arp_pkt(skb))
-		QDF_NBUF_CB_GET_PACKET_TYPE(skb) =
-			QDF_NBUF_CB_PACKET_TYPE_ARP;
-	else if (qdf_nbuf_is_ipv4_dhcp_pkt(skb))
-		QDF_NBUF_CB_GET_PACKET_TYPE(skb) =
-			QDF_NBUF_CB_PACKET_TYPE_DHCP;
-	else if (qdf_nbuf_is_ipv4_eapol_pkt(skb))
-		QDF_NBUF_CB_GET_PACKET_TYPE(skb) =
-			QDF_NBUF_CB_PACKET_TYPE_EAPOL;
-	else if (qdf_nbuf_is_ipv4_wapi_pkt(skb))
-		QDF_NBUF_CB_GET_PACKET_TYPE(skb) =
-			QDF_NBUF_CB_PACKET_TYPE_WAPI;
-	else if (qdf_nbuf_is_icmp_pkt(skb))
-		QDF_NBUF_CB_GET_PACKET_TYPE(skb) =
-			QDF_NBUF_CB_PACKET_TYPE_ICMP;
-	else if (qdf_nbuf_is_icmpv6_pkt(skb))
-		QDF_NBUF_CB_GET_PACKET_TYPE(skb) =
-			QDF_NBUF_CB_PACKET_TYPE_ICMPv6;
+	/*
+	 * TX Packets in the HI_PRIO queue are assumed to be critical and
+	 * marked accordingly.
+	 */
+	if (skb->queue_mapping == TX_GET_QUEUE_IDX(HDD_LINUX_AC_HI_PRIO, 0))
+		wlan_hdd_mark_critical_pkt(skb);
+	else
+		wlan_hdd_mark_non_critical_pkt(skb);
 }
 
 /**
@@ -1134,8 +1165,11 @@ static void __hdd_hard_start_xmit(struct sk_buff *skb,
 		goto drop_pkt;
 	}
 
-	wlan_hdd_classify_pkt(skb);
-
+	/*
+	 * wlan_hdd_mark_pkt_type zeros out skb->cb.  All skb->cb access
+	 * should be after it.
+	 */
+	wlan_hdd_mark_pkt_type(skb);
 	QDF_NBUF_CB_TX_EXTRA_FRAG_FLAGS_NOTIFY_COMP(skb) = 1;
 
 	if (QDF_NBUF_CB_GET_PACKET_TYPE(skb) == QDF_NBUF_CB_PACKET_TYPE_ARP) {

core/hdd/src/wlan_hdd_wmm.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. 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
@@ -1805,21 +1805,63 @@ hdd_check_and_upgrade_udp_qos(struct hdd_adapter *adapter,
 }
 
 /**
- * hdd_wmm_classify_pkt() - Function which will classify an OS packet
- * into a WMM AC based on DSCP
- *
- * @adapter: adapter upon which the packet is being transmitted
+ * hdd_wmm_classify_critical_pkt() - Function checks and classifies critical skb
+ * @adapter: adapter for which skb is being transmitted
  * @skb: pointer to network buffer
- * @user_pri: user priority of the OS packet
- * @is_eapol: eapol packet flag
+ * @user_pri: user priority of the OS packet to be determined
+ * @is_critical: pointer to be marked true for a critical packet
+ *
+ * Function checks if the packet is one of the critical packets and determines
+ * 'user_pri' for it. EAPOL, ARP, DHCP(v4,v6), NS, NA are considered critical.
  *
+ * Note that wlan_hdd_mark_critical_pkt is used to mark packet type in CB for
+ * these critical packets. This is done as skb->cb amay be overwritten between
+ * _select_queue and_hard_start_xmit functions. hdd_wmm_classify_critical_pkt
+ * and wlan_hdd_mark_critical_pkt should be in sync w.r.t packet types.
+
  * Return: None
  */
 static
-void hdd_wmm_classify_pkt(struct hdd_adapter *adapter,
-			  struct sk_buff *skb,
-			  enum sme_qos_wmmuptype *user_pri,
-			  bool *is_eapol)
+void hdd_wmm_classify_critical_pkt(struct hdd_adapter *adapter,
+				   struct sk_buff *skb,
+				   enum sme_qos_wmmuptype *user_pri,
+				   bool *is_critical)
+{
+	enum qdf_proto_subtype proto_subtype;
+
+	 /* Send EAPOL on TID 6(VO). Rest are sent on TID 0(BE). */
+
+	if (qdf_nbuf_is_ipv4_eapol_pkt(skb)) {
+		*is_critical = true;
+		*user_pri = SME_QOS_WMM_UP_VO;
+	} else if (qdf_nbuf_is_ipv4_arp_pkt(skb)) {
+		*is_critical = true;
+		*user_pri = SME_QOS_WMM_UP_BE;
+	} else if (qdf_nbuf_is_ipv4_dhcp_pkt(skb)) {
+		*is_critical = true;
+		*user_pri = SME_QOS_WMM_UP_BE;
+	} else if (qdf_nbuf_is_ipv6_dhcp_pkt(skb)) {
+		*is_critical = true;
+		*user_pri = SME_QOS_WMM_UP_BE;
+	} else if (qdf_nbuf_is_icmpv6_pkt(skb)) {
+		proto_subtype = qdf_nbuf_get_icmpv6_subtype(skb);
+		switch (proto_subtype) {
+		case QDF_PROTO_ICMPV6_NA:
+		case QDF_PROTO_ICMPV6_NS:
+			*is_critical = true;
+			*user_pri = SME_QOS_WMM_UP_BE;
+			break;
+		default:
+			break;
+		}
+	}
+}
+
+static
+void hdd_wmm_get_user_priority_from_ip_tos(struct hdd_adapter *adapter,
+					   struct sk_buff *skb,
+					   enum sme_qos_wmmuptype *user_pri)
+
 {
 	unsigned char dscp;
 	unsigned char tos;
@@ -1917,7 +1959,6 @@ void hdd_wmm_classify_pkt(struct hdd_adapter *adapter,
 		if (eth_hdr->eth_II.h_proto ==
 			htons(HDD_ETHERTYPE_802_1_X)) {
 			tos = 0xC0;
-			*is_eapol = true;
 		} else
 			tos = 0;
 	}
@@ -1925,17 +1966,38 @@ void hdd_wmm_classify_pkt(struct hdd_adapter *adapter,
 	dscp = (tos >> 2) & 0x3f;
 	*user_pri = adapter->dscp_to_up_map[dscp];
 
-	/*
-	 * Upgrade the priority, if the user priority of this packet is
-	 * less than the configured threshold.
-	 */
-	hdd_check_and_upgrade_udp_qos(adapter, skb, user_pri);
-
 #ifdef HDD_WMM_DEBUG
 	hdd_debug("tos is %d, dscp is %d, up is %d", tos, dscp, *user_pri);
 #endif /* HDD_WMM_DEBUG */
 }
 
+/**
+ * hdd_wmm_classify_pkt() - Function to classify skb into WMM AC based on DSCP
+ *
+ * @adapter: adapter upon which the packet is being transmitted
+ * @skb: pointer to network buffer
+ * @user_pri: user priority of the OS packet
+ * @is_critical: pointer to be marked true for a critical packet
+ *
+ * Function checks if the packet is one of the critical packets and determines
+ * 'user_pri' for it. Else it uses IP TOS value to determine 'user_pri'.
+ * It is the responsibility of caller to set the user_pri to skb->priority.
+ * Return: None
+ */
+static
+void hdd_wmm_classify_pkt(struct hdd_adapter *adapter,
+			  struct sk_buff *skb,
+			  enum sme_qos_wmmuptype *user_pri,
+			  bool *is_critical)
+{
+	hdd_wmm_get_user_priority_from_ip_tos(adapter, skb, user_pri);
+
+	hdd_wmm_classify_critical_pkt(adapter, skb, user_pri, is_critical);
+
+	if (!is_critical)
+		hdd_check_and_upgrade_udp_qos(adapter, skb, user_pri);
+}
+
 #ifdef TX_MULTIQ_PER_AC
 /**
  * hdd_get_tx_queue_for_ac() - Get the netdev tx queue index
@@ -2018,20 +2080,20 @@ static uint16_t __hdd_get_queue_index(uint16_t up)
 /**
  * hdd_get_queue_index() - get queue index
  * @up: user priority
- * @is_eapol: is_eapol flag
+ * @is_critical: is_critical flag
  *
  * Return: queue_index
  */
 static
-uint16_t hdd_get_queue_index(uint16_t up, bool is_eapol)
+uint16_t hdd_get_queue_index(uint16_t up, bool is_critical)
 {
-	if (qdf_unlikely(is_eapol == true))
+	if (qdf_unlikely(is_critical))
 		return HDD_LINUX_AC_HI_PRIO;
 	return __hdd_get_queue_index(up);
 }
 #else
 static
-uint16_t hdd_get_queue_index(uint16_t up, bool is_eapol)
+uint16_t hdd_get_queue_index(uint16_t up, bool is_critical)
 {
 	return __hdd_get_queue_index(up);
 }
@@ -2043,9 +2105,8 @@ static uint16_t __hdd_wmm_select_queue(struct net_device *dev,
 	enum sme_qos_wmmuptype up = SME_QOS_WMM_UP_BE;
 	uint16_t index;
 	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
-	bool is_crtical = false;
+	bool is_critical = false;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	enum qdf_proto_subtype proto_subtype;
 
 	if (qdf_unlikely(!hdd_ctx || cds_is_driver_transitioning())) {
 		hdd_debug_rl("driver is transitioning! Using default(BE) queue.");
@@ -2054,24 +2115,11 @@ static uint16_t __hdd_wmm_select_queue(struct net_device *dev,
 	}
 
 	/* Get the user priority from IP header */
-	hdd_wmm_classify_pkt(adapter, skb, &up, &is_crtical);
-
-	if (qdf_nbuf_is_ipv4_arp_pkt(skb)) {
-		is_crtical = true;
-	} else if (qdf_nbuf_is_icmpv6_pkt(skb)) {
-		proto_subtype = qdf_nbuf_get_icmpv6_subtype(skb);
-		switch (proto_subtype) {
-		case QDF_PROTO_ICMPV6_NA:
-		case QDF_PROTO_ICMPV6_NS:
-			is_crtical = true;
-			break;
-		default:
-			break;
-		}
-	}
+	hdd_wmm_classify_pkt(adapter, skb, &up, &is_critical);
 
 	skb->priority = up;
-	index = hdd_get_queue_index(skb->priority, is_crtical);
+
+	index = hdd_get_queue_index(skb->priority, is_critical);
 
 	return hdd_get_tx_queue_for_ac(adapter, skb, index);
 }