net: stmmac: fix oops when split header is enabled

For GMAC4, when split header is enabled, in some rare cases, the
hardware does not fill buf2 of the first descriptor with payload.
Thus we cannot assume buf2 is always fully filled if it is not
the last descriptor. Otherwise, the length of buf2 of the second
descriptor will be calculated wrong and cause an oops:

Unable to handle kernel paging request at virtual address ffff00019246bfc0
...
x2 : 0000000000000040 x1 : ffff00019246bfc0 x0 : ffff00009246c000
Call trace:
 dcache_inval_poc+0x28/0x58 (P)
 dma_direct_sync_single_for_cpu+0x38/0x6c
 __dma_sync_single_for_cpu+0x34/0x6c
 stmmac_napi_poll_rx+0x8f0/0xb60
 __napi_poll.constprop.0+0x30/0x144
 net_rx_action+0x160/0x274
 handle_softirqs+0x1b8/0x1fc
...

To fix this, the PL bit-field in RDES3 register is used for all
descriptors, whether it is the last descriptor or not.

Fixes: ec222003bd94 ("net: stmmac: Prepare to add Split Header support")
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Jie Zhang <jie.zhang@analog.com>
Link: https://patch.msgid.link/20260209225037.589130-1-jie.zhang@analog.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index c63099a77cc0c4e298b00a9d403ae31d60236d78..82375d34ad57d62d3632169546b4787c47850dee 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -5040,13 +5040,27 @@ static unsigned int stmmac_rx_buf2_len(struct stmmac_priv *priv,
        if (!priv->sph_active)
                return 0;
 
-       /* Not last descriptor */
-       if (status & rx_not_ls)
+       /* For GMAC4, when split header is enabled, in some rare cases, the
+        * hardware does not fill buf2 of the first descriptor with payload.
+        * Thus we cannot assume buf2 is always fully filled if it is not
+        * the last descriptor. Otherwise, the length of buf2 of the second
+        * descriptor will be calculated wrong and cause an oops.
+        *
+        * If this is the last descriptor, 'plen' is the length of the
+        * received packet that was transferred to system memory.
+        * Otherwise, it is the accumulated number of bytes that have been
+        * transferred for the current packet.
+        *
+        * Thus 'plen - len' always gives the correct length of buf2.
+        */
+
+       /* Not GMAC4 and not last descriptor */
+       if (priv->plat->core_type != DWMAC_CORE_GMAC4 && (status & rx_not_ls))
                return priv->dma_conf.dma_buf_sz;
 
+       /* GMAC4 or last descriptor */
        plen = stmmac_get_rx_frame_len(priv, p, coe);
 
-       /* Last descriptor */
        return plen - len;
 }