mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
net: stmmac: honour Rx checksum errors in the AF_XDP zero-copy path
Commitee0aace5f8("net: stmmac: Correctly handle Rx checksum offload errors") taught stmmac_rx() to honour the csum_none status, but stmmac_dispatch_skb_zc() still ignores it and sets CHECKSUM_UNNECESSARY for every IP frame whenever the checksum offload engine (CoE) is enabled. Since commitfe40427976("net: stmmac: dwmac4: stop hardware from dropping checksum-error packets") dwmac4 delivers such frames instead of dropping them, so this path receives them. Mark the skb CHECKSUM_NONE when csum_none is set, as stmmac_rx() does. Fixes:bba2556efa("net: stmmac: Enable RX via AF_XDP zero-copy") Cc: <[email protected]> Signed-off-by: Christian Schmidbauer <[email protected]> Reviewed-by: Maxime Chevallier <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
This commit is contained in:
committed by
Paolo Abeni
parent
952d16c5ee
commit
fcfc52fcf8
@@ -5563,7 +5563,7 @@ static struct sk_buff *stmmac_construct_skb_zc(struct stmmac_channel *ch,
|
||||
|
||||
static void stmmac_dispatch_skb_zc(struct stmmac_priv *priv, u32 queue,
|
||||
struct dma_desc *p, struct dma_desc *np,
|
||||
struct xdp_buff *xdp)
|
||||
struct xdp_buff *xdp, int status)
|
||||
{
|
||||
struct stmmac_rxq_stats *rxq_stats = &priv->xstats.rxq_stats[queue];
|
||||
struct stmmac_channel *ch = &priv->channel[queue];
|
||||
@@ -5591,7 +5591,8 @@ static void stmmac_dispatch_skb_zc(struct stmmac_priv *priv, u32 queue,
|
||||
|
||||
skb->protocol = eth_type_trans(skb, priv->dev);
|
||||
|
||||
if (unlikely(!coe) || !stmmac_has_ip_ethertype(skb))
|
||||
if (unlikely(!coe) || !stmmac_has_ip_ethertype(skb) ||
|
||||
(status & csum_none))
|
||||
skb_checksum_none_assert(skb);
|
||||
else
|
||||
skb->ip_summed = CHECKSUM_UNNECESSARY;
|
||||
@@ -5805,7 +5806,8 @@ read_again:
|
||||
|
||||
switch (res) {
|
||||
case STMMAC_XDP_PASS:
|
||||
stmmac_dispatch_skb_zc(priv, queue, p, np, buf->xdp);
|
||||
stmmac_dispatch_skb_zc(priv, queue, p, np, buf->xdp,
|
||||
status);
|
||||
xsk_buff_free(buf->xdp);
|
||||
break;
|
||||
case STMMAC_XDP_CONSUMED:
|
||||
|
||||
Reference in New Issue
Block a user