idpf: simplify and fix splitq Tx packet rollback error path

Move (and rename) the existing rollback logic to singleq.c since that
will be the only consumer. Create a simplified splitq specific rollback
function to loop through and unmap tx_bufs based on the completion tag.
This is critical before replacing the Tx buffer ring with the buffer
pool since the previous rollback indexing will not work to unmap the
chained buffers from the pool.

Cache the next_to_use index before any portion of the packet is put on
the descriptor ring. In case of an error, the rollback will bump tail to
the correct next_to_use value. Because the splitq path now supports
different types of context descriptors (and potentially multiple in the
future), this will take care of rolling back any and all context
descriptors encoded on the ring for the erroneous packet. The previous
rollback logic was broken for PTP packets since it would not account for
the PTP context descriptor.

Fixes: 1a49cf814fe1 ("idpf: add Tx timestamp flows")
Signed-off-by: Joshua Hay <joshua.a.hay@intel.com>
Reviewed-by: Madhu Chittim <madhu.chittim@intel.com>
Tested-by: Samuel Salin <Samuel.salin@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c b/drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c
index 555879b1248d8474d85a0412738b9b4d80f96d18..57c0f5ab8f9ed83f4fd087d9ca2c192facc6b8b8 100644 (file)
--- a/drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c
@@ -179,6 +179,58 @@ static int idpf_tx_singleq_csum(struct sk_buff *skb,
        return 1;
 }
 
+/**
+ * idpf_tx_singleq_dma_map_error - handle TX DMA map errors
+ * @txq: queue to send buffer on
+ * @skb: send buffer
+ * @first: original first buffer info buffer for packet
+ * @idx: starting point on ring to unwind
+ */
+static void idpf_tx_singleq_dma_map_error(struct idpf_tx_queue *txq,
+                                         struct sk_buff *skb,
+                                         struct idpf_tx_buf *first, u16 idx)
+{
+       struct libeth_sq_napi_stats ss = { };
+       struct libeth_cq_pp cp = {
+               .dev    = txq->dev,
+               .ss     = &ss,
+       };
+
+       u64_stats_update_begin(&txq->stats_sync);
+       u64_stats_inc(&txq->q_stats.dma_map_errs);
+       u64_stats_update_end(&txq->stats_sync);
+
+       /* clear dma mappings for failed tx_buf map */
+       for (;;) {
+               struct idpf_tx_buf *tx_buf;
+
+               tx_buf = &txq->tx_buf[idx];
+               libeth_tx_complete(tx_buf, &cp);
+               if (tx_buf == first)
+                       break;
+               if (idx == 0)
+                       idx = txq->desc_count;
+               idx--;
+       }
+
+       if (skb_is_gso(skb)) {
+               union idpf_tx_flex_desc *tx_desc;
+
+               /* If we failed a DMA mapping for a TSO packet, we will have
+                * used one additional descriptor for a context
+                * descriptor. Reset that here.
+                */
+               tx_desc = &txq->flex_tx[idx];
+               memset(tx_desc, 0, sizeof(*tx_desc));
+               if (idx == 0)
+                       idx = txq->desc_count;
+               idx--;
+       }
+
+       /* Update tail in case netdev_xmit_more was previously true */
+       idpf_tx_buf_hw_update(txq, idx, false);
+}
+
 /**
  * idpf_tx_singleq_map - Build the Tx base descriptor
  * @tx_q: queue to send buffer on
@@ -219,8 +271,9 @@ static void idpf_tx_singleq_map(struct idpf_tx_queue *tx_q,
        for (frag = &skb_shinfo(skb)->frags[0];; frag++) {
                unsigned int max_data = IDPF_TX_MAX_DESC_DATA_ALIGNED;
 
-               if (dma_mapping_error(tx_q->dev, dma))
-                       return idpf_tx_dma_map_error(tx_q, skb, first, i);
+               if (unlikely(dma_mapping_error(tx_q->dev, dma)))
+                       return idpf_tx_singleq_dma_map_error(tx_q, skb,
+                                                            first, i);
 
                /* record length, and DMA address */
                dma_unmap_len_set(tx_buf, len, size);

diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.c b/drivers/net/ethernet/intel/idpf/idpf_txrx.c
index ee59153508af68e114af4f6f75ae70f2044ba500..527d56bcbbef3fbdc04cb8354afffd806e323f2d 100644 (file)
--- a/drivers/net/ethernet/intel/idpf/idpf_txrx.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.c
@@ -2339,57 +2339,6 @@ unsigned int idpf_tx_desc_count_required(struct idpf_tx_queue *txq,
        return count;
 }
 
-/**
- * idpf_tx_dma_map_error - handle TX DMA map errors
- * @txq: queue to send buffer on
- * @skb: send buffer
- * @first: original first buffer info buffer for packet
- * @idx: starting point on ring to unwind
- */
-void idpf_tx_dma_map_error(struct idpf_tx_queue *txq, struct sk_buff *skb,
-                          struct idpf_tx_buf *first, u16 idx)
-{
-       struct libeth_sq_napi_stats ss = { };
-       struct libeth_cq_pp cp = {
-               .dev    = txq->dev,
-               .ss     = &ss,
-       };
-
-       u64_stats_update_begin(&txq->stats_sync);
-       u64_stats_inc(&txq->q_stats.dma_map_errs);
-       u64_stats_update_end(&txq->stats_sync);
-
-       /* clear dma mappings for failed tx_buf map */
-       for (;;) {
-               struct idpf_tx_buf *tx_buf;
-
-               tx_buf = &txq->tx_buf[idx];
-               libeth_tx_complete(tx_buf, &cp);
-               if (tx_buf == first)
-                       break;
-               if (idx == 0)
-                       idx = txq->desc_count;
-               idx--;
-       }
-
-       if (skb_is_gso(skb)) {
-               union idpf_tx_flex_desc *tx_desc;
-
-               /* If we failed a DMA mapping for a TSO packet, we will have
-                * used one additional descriptor for a context
-                * descriptor. Reset that here.
-                */
-               tx_desc = &txq->flex_tx[idx];
-               memset(tx_desc, 0, sizeof(*tx_desc));
-               if (idx == 0)
-                       idx = txq->desc_count;
-               idx--;
-       }
-
-       /* Update tail in case netdev_xmit_more was previously true */
-       idpf_tx_buf_hw_update(txq, idx, false);
-}
-
 /**
  * idpf_tx_splitq_bump_ntu - adjust NTU and generation
  * @txq: the tx ring to wrap
@@ -2438,6 +2387,37 @@ static bool idpf_tx_get_free_buf_id(struct idpf_sw_queue *refillq,
        return true;
 }
 
+/**
+ * idpf_tx_splitq_pkt_err_unmap - Unmap buffers and bump tail in case of error
+ * @txq: Tx queue to unwind
+ * @params: pointer to splitq params struct
+ * @first: starting buffer for packet to unmap
+ */
+static void idpf_tx_splitq_pkt_err_unmap(struct idpf_tx_queue *txq,
+                                        struct idpf_tx_splitq_params *params,
+                                        struct idpf_tx_buf *first)
+{
+       struct libeth_sq_napi_stats ss = { };
+       struct idpf_tx_buf *tx_buf = first;
+       struct libeth_cq_pp cp = {
+               .dev    = txq->dev,
+               .ss     = &ss,
+       };
+       u32 idx = 0;
+
+       u64_stats_update_begin(&txq->stats_sync);
+       u64_stats_inc(&txq->q_stats.dma_map_errs);
+       u64_stats_update_end(&txq->stats_sync);
+
+       do {
+               libeth_tx_complete(tx_buf, &cp);
+               idpf_tx_clean_buf_ring_bump_ntc(txq, idx, tx_buf);
+       } while (idpf_tx_buf_compl_tag(tx_buf) == params->compl_tag);
+
+       /* Update tail in case netdev_xmit_more was previously true. */
+       idpf_tx_buf_hw_update(txq, params->prev_ntu, false);
+}
+
 /**
  * idpf_tx_splitq_map - Build the Tx flex descriptor
  * @tx_q: queue to send buffer on
@@ -2482,8 +2462,9 @@ static void idpf_tx_splitq_map(struct idpf_tx_queue *tx_q,
        for (frag = &skb_shinfo(skb)->frags[0];; frag++) {
                unsigned int max_data = IDPF_TX_MAX_DESC_DATA_ALIGNED;
 
-               if (dma_mapping_error(tx_q->dev, dma))
-                       return idpf_tx_dma_map_error(tx_q, skb, first, i);
+               if (unlikely(dma_mapping_error(tx_q->dev, dma)))
+                       return idpf_tx_splitq_pkt_err_unmap(tx_q, params,
+                                                           first);
 
                first->nr_frags++;
                idpf_tx_buf_compl_tag(tx_buf) = params->compl_tag;
@@ -2939,7 +2920,9 @@ static bool idpf_tx_splitq_need_re(struct idpf_tx_queue *tx_q)
 static netdev_tx_t idpf_tx_splitq_frame(struct sk_buff *skb,
                                        struct idpf_tx_queue *tx_q)
 {
-       struct idpf_tx_splitq_params tx_params = { };
+       struct idpf_tx_splitq_params tx_params = {
+               .prev_ntu = tx_q->next_to_use,
+       };
        union idpf_flex_tx_ctx_desc *ctx_desc;
        struct idpf_tx_buf *first;
        unsigned int count;

diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.h b/drivers/net/ethernet/intel/idpf/idpf_txrx.h
index c75ca5d3e57cc06d2bd8c69eb3a6442fe537de04..a7632d845a2a2bbed3a42f0aa1f9f40ecfd0b4c0 100644 (file)
--- a/drivers/net/ethernet/intel/idpf/idpf_txrx.h
+++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.h
@@ -196,6 +196,7 @@ struct idpf_tx_offload_params {
  * @compl_tag: Associated tag for completion
  * @td_tag: Descriptor tunneling tag
  * @offload: Offload parameters
+ * @prev_ntu: stored TxQ next_to_use in case of rollback
  */
 struct idpf_tx_splitq_params {
        enum idpf_tx_desc_dtype_value dtype;
@@ -206,6 +207,8 @@ struct idpf_tx_splitq_params {
        };
 
        struct idpf_tx_offload_params offload;
+
+       u16 prev_ntu;
 };
 
 enum idpf_tx_ctx_desc_eipt_offload {
@@ -1042,8 +1045,6 @@ void idpf_tx_buf_hw_update(struct idpf_tx_queue *tx_q, u32 val,
                           bool xmit_more);
 unsigned int idpf_size_to_txd_count(unsigned int size);
 netdev_tx_t idpf_tx_drop_skb(struct idpf_tx_queue *tx_q, struct sk_buff *skb);
-void idpf_tx_dma_map_error(struct idpf_tx_queue *txq, struct sk_buff *skb,
-                          struct idpf_tx_buf *first, u16 ring_idx);
 unsigned int idpf_tx_desc_count_required(struct idpf_tx_queue *txq,
                                         struct sk_buff *skb);
 void idpf_tx_timeout(struct net_device *netdev, unsigned int txqueue);