iwlwifi: pcie: trace IOVA for iwlwifi_dev_tx_tb

We trace the whole TFD with all TBs when in iwlwifi_dev_tx,
but sometimes we add TBs to it later and then we don't have
any of this data. Trace the I/O virtual address (IOVA) (it
can be the physical address, or as returned by the IOMMU)
here to aid debugging the DMA flows.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h
index 9e86436185781504d2a3132083ad3d4eab5d38d2..1bc6ecc3214049f72082567c5a412fa0eaf98b35 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h
@@ -3,7 +3,7 @@
  *
  * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2015        Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * Contact Information:
  *  Intel Linux Wireless <linuxwifi@intel.com>
@@ -21,16 +21,18 @@
 
 TRACE_EVENT(iwlwifi_dev_tx_tb,
        TP_PROTO(const struct device *dev, struct sk_buff *skb,
-                u8 *data_src, size_t data_len),
-       TP_ARGS(dev, skb, data_src, data_len),
+                u8 *data_src, dma_addr_t phys, size_t data_len),
+       TP_ARGS(dev, skb, data_src, phys, data_len),
        TP_STRUCT__entry(
                DEV_ENTRY
+               __field(u64, phys)
 
                __dynamic_array(u8, data,
                                iwl_trace_data(skb) ? data_len : 0)
        ),
        TP_fast_assign(
                DEV_ASSIGN;
+               __entry->phys = phys;
                if (iwl_trace_data(skb))
                        memcpy(__get_dynamic_array(data), data_src, data_len);
        ),

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
index 1ca9a7e48c1a3a2a67251997312a94253f2e9af9..8ca0250de99ec06882b27ff8e176998db97c72c9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
@@ -333,7 +333,8 @@ static int iwl_pcie_gen2_build_amsdu(struct iwl_trans *trans,
                        goto out_err;
                }
                iwl_pcie_gen2_set_tb(trans, tfd, tb_phys, tb_len);
-               trace_iwlwifi_dev_tx_tb(trans->dev, skb, start_hdr, tb_len);
+               trace_iwlwifi_dev_tx_tb(trans->dev, skb, start_hdr,
+                                       tb_phys, tb_len);
                /* add this subframe's headers' length to the tx_cmd */
                le16_add_cpu(&tx_cmd->len, hdr_page->pos - subf_hdrs_start);
 
@@ -351,7 +352,7 @@ static int iwl_pcie_gen2_build_amsdu(struct iwl_trans *trans,
                        }
                        iwl_pcie_gen2_set_tb(trans, tfd, tb_phys, tb_len);
                        trace_iwlwifi_dev_tx_tb(trans->dev, skb, tso.data,
-                                               tb_len);
+                                               tb_phys, tb_len);
 
                        data_left -= tb_len;
                        tso_build_data(skb, &tso, tb_len);
@@ -441,9 +442,8 @@ static int iwl_pcie_gen2_tx_add_frags(struct iwl_trans *trans,
                        return -ENOMEM;
                tb_idx = iwl_pcie_gen2_set_tb(trans, tfd, tb_phys,
                                              skb_frag_size(frag));
-               trace_iwlwifi_dev_tx_tb(trans->dev, skb,
-                                       skb_frag_address(frag),
-                                       skb_frag_size(frag));
+               trace_iwlwifi_dev_tx_tb(trans->dev, skb, skb_frag_address(frag),
+                                       tb_phys, skb_frag_size(frag));
                if (tb_idx < 0)
                        return tb_idx;
 
@@ -509,9 +509,8 @@ iwl_tfh_tfd *iwl_pcie_gen2_build_tx(struct iwl_trans *trans,
                if (unlikely(dma_mapping_error(trans->dev, tb_phys)))
                        goto out_err;
                iwl_pcie_gen2_set_tb(trans, tfd, tb_phys, tb2_len);
-               trace_iwlwifi_dev_tx_tb(trans->dev, skb,
-                                       skb->data + hdr_len,
-                                       tb2_len);
+               trace_iwlwifi_dev_tx_tb(trans->dev, skb, skb->data + hdr_len,
+                                       tb_phys, tb2_len);
        }
 
        if (iwl_pcie_gen2_tx_add_frags(trans, skb, tfd, out_meta))
@@ -523,9 +522,8 @@ iwl_tfh_tfd *iwl_pcie_gen2_build_tx(struct iwl_trans *trans,
                if (unlikely(dma_mapping_error(trans->dev, tb_phys)))
                        goto out_err;
                iwl_pcie_gen2_set_tb(trans, tfd, tb_phys, skb_headlen(frag));
-               trace_iwlwifi_dev_tx_tb(trans->dev, skb,
-                                       frag->data,
-                                       skb_headlen(frag));
+               trace_iwlwifi_dev_tx_tb(trans->dev, skb, frag->data,
+                                       tb_phys, skb_headlen(frag));
                if (iwl_pcie_gen2_tx_add_frags(trans, frag, tfd, out_meta))
                        goto out_err;
        }

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
index b710b8a25b54ca12c67a0d64b014cf788320a5af..f21f16ab2a97003d2f3b0ace53e8dd2b3f0fdb50 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
@@ -2019,9 +2019,8 @@ static int iwl_fill_data_tbs(struct iwl_trans *trans, struct sk_buff *skb,
                                                    head_tb_len, DMA_TO_DEVICE);
                if (unlikely(dma_mapping_error(trans->dev, tb_phys)))
                        return -EINVAL;
-               trace_iwlwifi_dev_tx_tb(trans->dev, skb,
-                                       skb->data + hdr_len,
-                                       head_tb_len);
+               trace_iwlwifi_dev_tx_tb(trans->dev, skb, skb->data + hdr_len,
+                                       tb_phys, head_tb_len);
                iwl_pcie_txq_build_tfd(trans, txq, tb_phys, head_tb_len, false);
        }
 
@@ -2039,9 +2038,8 @@ static int iwl_fill_data_tbs(struct iwl_trans *trans, struct sk_buff *skb,
 
                if (unlikely(dma_mapping_error(trans->dev, tb_phys)))
                        return -EINVAL;
-               trace_iwlwifi_dev_tx_tb(trans->dev, skb,
-                                       skb_frag_address(frag),
-                                       skb_frag_size(frag));
+               trace_iwlwifi_dev_tx_tb(trans->dev, skb, skb_frag_address(frag),
+                                       tb_phys, skb_frag_size(frag));
                tb_idx = iwl_pcie_txq_build_tfd(trans, txq, tb_phys,
                                                skb_frag_size(frag), false);
                if (tb_idx < 0)
@@ -2222,7 +2220,7 @@ static int iwl_fill_data_tbs_amsdu(struct iwl_trans *trans, struct sk_buff *skb,
                iwl_pcie_txq_build_tfd(trans, txq, hdr_tb_phys,
                                       hdr_tb_len, false);
                trace_iwlwifi_dev_tx_tb(trans->dev, skb, start_hdr,
-                                       hdr_tb_len);
+                                       hdr_tb_phys, hdr_tb_len);
                /* add this subframe's headers' length to the tx_cmd */
                le16_add_cpu(&tx_cmd->len, hdr_page->pos - subf_hdrs_start);
 
@@ -2248,7 +2246,7 @@ static int iwl_fill_data_tbs_amsdu(struct iwl_trans *trans, struct sk_buff *skb,
                        iwl_pcie_txq_build_tfd(trans, txq, tb_phys,
                                               size, false);
                        trace_iwlwifi_dev_tx_tb(trans->dev, skb, tso.data,
-                                               size);
+                                               tb_phys, size);
 
                        data_left -= size;
                        tso_build_data(skb, &tso, size);