qcacld-3.0: add DPTRACE Enhancements - Phase 2
Change data packets printing to one line
Add msdu-id to TX packets
Increase data packets size to include the complete IP packets
Indication/print when the throttling occurs
Change-Id: I4831c517b41f81003b8d28448a3093d911ac978c
CRs-Fixed: 2157768
diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c
index 4e3c0d0..70f3d8d 100644
--- a/core/hdd/src/wlan_hdd_softap_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c
@@ -569,24 +569,13 @@
hdd_inspect_dhcp_packet(adapter, STAId, skb, QDF_TX);
hdd_event_eapol_log(skb, QDF_TX);
- qdf_dp_trace_log_pkt(adapter->session_id, skb, QDF_TX,
- QDF_TRACE_DEFAULT_PDEV_ID);
QDF_NBUF_CB_TX_PACKET_TRACK(skb) = QDF_NBUF_TX_PKT_DATA_TRACK;
QDF_NBUF_UPDATE_TX_PKT_COUNT(skb, QDF_NBUF_TX_PKT_HDD);
-
qdf_dp_trace_set_track(skb, QDF_TX);
DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_TX_PACKET_PTR_RECORD,
QDF_TRACE_DEFAULT_PDEV_ID, qdf_nbuf_data_addr(skb),
sizeof(qdf_nbuf_data(skb)),
QDF_TX));
- DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_TX_PACKET_RECORD,
- QDF_TRACE_DEFAULT_PDEV_ID, (uint8_t *)skb->data,
- qdf_nbuf_len(skb), QDF_TX));
- if (qdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE)
- DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_TX_PACKET_RECORD,
- QDF_TRACE_DEFAULT_PDEV_ID,
- (uint8_t *)&skb->data[QDF_DP_TRACE_RECORD_SIZE],
- (qdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE), QDF_TX));
/* check whether need to linearize skb, like non-linear udp data */
if (hdd_skb_nontso_linearize(skb) != QDF_STATUS_SUCCESS) {
@@ -614,14 +603,9 @@
qdf_net_buf_debug_release_skb(skb);
drop_pkt:
- DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_DROP_PACKET_RECORD,
- QDF_TRACE_DEFAULT_PDEV_ID, (uint8_t *)skb->data,
- qdf_nbuf_len(skb), QDF_TX));
- if (qdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE)
- DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_DROP_PACKET_RECORD,
- QDF_TRACE_DEFAULT_PDEV_ID,
- (uint8_t *)&skb->data[QDF_DP_TRACE_RECORD_SIZE],
- (qdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE), QDF_TX));
+ qdf_dp_trace_data_pkt(skb, QDF_TRACE_DEFAULT_PDEV_ID,
+ QDF_DP_TRACE_DROP_PACKET_RECORD, 0,
+ QDF_TX);
kfree_skb(skb);
drop_pkt_accounting:
@@ -844,8 +828,8 @@
struct sk_buff *next = NULL;
struct hdd_context *hdd_ctx = NULL;
struct qdf_mac_addr *src_mac;
+
uint8_t staid;
- bool proto_pkt_logged = false;
/* Sanity check on inputs */
if (unlikely((NULL == context) || (NULL == rxBuf))) {
@@ -913,28 +897,15 @@
hdd_inspect_dhcp_packet(adapter, staid, skb, QDF_RX);
hdd_event_eapol_log(skb, QDF_RX);
- proto_pkt_logged = qdf_dp_trace_log_pkt(adapter->session_id,
- skb, QDF_RX,
- QDF_TRACE_DEFAULT_PDEV_ID);
+ qdf_dp_trace_log_pkt(adapter->session_id,
+ skb, QDF_RX, QDF_TRACE_DEFAULT_PDEV_ID);
DPTRACE(qdf_dp_trace(skb,
QDF_DP_TRACE_RX_HDD_PACKET_PTR_RECORD,
QDF_TRACE_DEFAULT_PDEV_ID,
qdf_nbuf_data_addr(skb),
sizeof(qdf_nbuf_data(skb)), QDF_RX));
- if (!proto_pkt_logged) {
- DPTRACE(qdf_dp_trace(skb,
- QDF_DP_TRACE_HDD_RX_PACKET_RECORD,
- QDF_TRACE_DEFAULT_PDEV_ID,
- (uint8_t *)skb->data, qdf_nbuf_len(skb),
- QDF_RX));
- if (qdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE)
- DPTRACE(qdf_dp_trace(skb,
- QDF_DP_TRACE_HDD_RX_PACKET_RECORD,
- QDF_TRACE_DEFAULT_PDEV_ID,
- (uint8_t *)&skb->data[QDF_DP_TRACE_RECORD_SIZE],
- (qdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE),
- QDF_RX));
- }
+ DPTRACE(qdf_dp_trace_data_pkt(skb, QDF_TRACE_DEFAULT_PDEV_ID,
+ QDF_DP_TRACE_RX_PACKET_RECORD, 0, QDF_RX));
skb->protocol = eth_type_trans(skb, skb->dev);