ixgbe: avoid permanent lock of *_PTP_TX_IN_PROGRESS

The ixgbe driver uses a state bit lock to avoid handling more than one Tx
timestamp request at once. This is required because hardware is limited
to a single set of registers for Tx timestamps.

The state bit lock is not properly cleaned up during
ixgbe_xmit_frame_ring() if the transmit fails such as due to DMA or TSO
failure. In some hardware this results in blocking timestamps until the
service task times out. In other hardware this results in a permanent
lock of the timestamp bit because we never receive an interrupt
indicating the timestamp occurred, since indeed the packet was never
transmitted.

Fix this by checking for DMA and TSO errors in ixgbe_xmit_frame_ring() and
properly cleaning up after ourselves when these occur.

Reported-by: Reported-by: David Mirabito <davidm@metamako.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 812319ab77db9612e91ea19583a6cb21a80cf4d5..5773df2483601e40fa2ce4a2eeafb128545191de 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7875,9 +7875,9 @@ static inline int ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, u16 size)
 #define IXGBE_TXD_CMD (IXGBE_TXD_CMD_EOP | \
                       IXGBE_TXD_CMD_RS)
 
-static void ixgbe_tx_map(struct ixgbe_ring *tx_ring,
-                        struct ixgbe_tx_buffer *first,
-                        const u8 hdr_len)
+static int ixgbe_tx_map(struct ixgbe_ring *tx_ring,
+                       struct ixgbe_tx_buffer *first,
+                       const u8 hdr_len)
 {
        struct sk_buff *skb = first->skb;
        struct ixgbe_tx_buffer *tx_buffer;
@@ -8004,7 +8004,7 @@ static void ixgbe_tx_map(struct ixgbe_ring *tx_ring,
                mmiowb();
        }
 
-       return;
+       return 0;
 dma_error:
        dev_err(tx_ring->dev, "TX DMA map failed\n");
        tx_buffer = &tx_ring->tx_buffer_info[i];
@@ -8034,6 +8034,8 @@ dma_error:
        first->skb = NULL;
 
        tx_ring->next_to_use = i;
+
+       return -1;
 }
 
 static void ixgbe_atr(struct ixgbe_ring *ring,
@@ -8407,13 +8409,21 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
 #ifdef IXGBE_FCOE
 xmit_fcoe:
 #endif /* IXGBE_FCOE */
-       ixgbe_tx_map(tx_ring, first, hdr_len);
+       if (ixgbe_tx_map(tx_ring, first, hdr_len))
+               goto cleanup_tx_timestamp;
 
        return NETDEV_TX_OK;
 
 out_drop:
        dev_kfree_skb_any(first->skb);
        first->skb = NULL;
+cleanup_tx_timestamp:
+       if (unlikely(tx_flags & IXGBE_TX_FLAGS_TSTAMP)) {
+               dev_kfree_skb_any(adapter->ptp_tx_skb);
+               adapter->ptp_tx_skb = NULL;
+               cancel_work_sync(&adapter->ptp_tx_work);
+               clear_bit_unlock(__IXGBE_PTP_TX_IN_PROGRESS, &adapter->state);
+       }
 
        return NETDEV_TX_OK;
 }