sfc: Pad packets to 33 bytes to prevent TX packet parser lockup

The packet parser used in the TX data path for locating checksum
fields can lose synchronisation with the TX queue manager when
handling packets that look like IPv4 but are too short (17-32 bytes).
Work around this by padding to 33 bytes.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c
index b1e1907790731070eca9d03db66b7d6c7d8280ac..d6681edb7014d799e92ab3978abe2e38c6fd664a 100644 (file)
--- a/drivers/net/sfc/tx.c
+++ b/drivers/net/sfc/tx.c
@@ -162,6 +162,14 @@ static int efx_enqueue_skb(struct efx_tx_queue *tx_queue,
        /* Get size of the initial fragment */
        len = skb_headlen(skb);
 
+       /* Pad if necessary */
+       if (EFX_WORKAROUND_15592(efx) && skb->len <= 32) {
+               EFX_BUG_ON_PARANOID(skb->data_len);
+               len = 32 + 1;
+               if (skb_pad(skb, len - skb->len))
+                       return NETDEV_TX_OK;
+       }
+
        fill_level = tx_queue->insert_count - tx_queue->old_read_count;
        q_space = efx->type->txd_ring_mask - 1 - fill_level;
 

diff --git a/drivers/net/sfc/workarounds.h b/drivers/net/sfc/workarounds.h
index 78de68f4a95b47a1c1712615db98cb5965dcb955..c821c15445a0f3f9f8b3a93d0c894ab14a352d96 100644 (file)
--- a/drivers/net/sfc/workarounds.h
+++ b/drivers/net/sfc/workarounds.h
@@ -36,6 +36,8 @@
 #define EFX_WORKAROUND_11482 EFX_WORKAROUND_ALWAYS
 /* Flush events can take a very long time to appear */
 #define EFX_WORKAROUND_11557 EFX_WORKAROUND_ALWAYS
+/* Truncated IPv4 packets can confuse the TX packet parser */
+#define EFX_WORKAROUND_15592 EFX_WORKAROUND_ALWAYS
 
 /* Spurious parity errors in TSORT buffers */
 #define EFX_WORKAROUND_5129 EFX_WORKAROUND_FALCON_A