xsk: defer software checksum until the skb is complete

When XDP_UMEM_TX_SW_CSUM is used with multi-buffer TX, xsk_skb_metadata()
calls skb_checksum_help() while only the first descriptor has been added to
the skb. The checksum therefore covers just the first fragment, and
skb_checksum_help() sets ip_summed to CHECKSUM_NONE, so the remaining
fragments are never included in the checksum.

Move the software checksum calculation to the point where the last
descriptor has been added to the skb.

On a checksum failure the packet is now dropped instead of being returned
to the application for a retry. This path is not reachable with the
existing metadata validation, but the behavior change is intentional.

Fixes: 11614723af ("xsk: Add option to calculate TX checksum in SW")
Cc: [email protected]
Reviewed-by: Maciej Fijalkowski <[email protected]>
Acked-by: Stanislav Fomichev <[email protected]>
Reviewed-by: Jason Xing <[email protected]>
Signed-off-by: Rongzheng Wang <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Paolo Abeni <[email protected]>
This commit is contained in:
Rongzheng Wang
2026-11-10 12:07:00 +01:00
committed by Paolo Abeni
parent b71c101bbb
commit f2eddafbfc
+15 -8
View File
@@ -1012,14 +1012,6 @@ static int xsk_skb_metadata(struct sk_buff *skb, void *buffer,
skb->csum_start = hr + csum_start;
skb->csum_offset = csum_offset;
skb->ip_summed = CHECKSUM_PARTIAL;
if (unlikely(pool->tx_sw_csum)) {
int err;
err = skb_checksum_help(skb);
if (err)
return err;
}
}
if (flags & XDP_TXMD_FLAGS_LAUNCH_TIME)
@@ -1031,6 +1023,15 @@ static int xsk_skb_metadata(struct sk_buff *skb, void *buffer,
return 0;
}
static int xsk_skb_sw_csum(struct sk_buff *skb, struct xsk_buff_pool *pool)
{
if (unlikely(pool->tx_sw_csum &&
skb->ip_summed == CHECKSUM_PARTIAL))
return skb_checksum_help(skb);
return 0;
}
static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs,
struct xdp_desc *desc)
{
@@ -1278,6 +1279,12 @@ static int __xsk_generic_xmit(struct sock *sk)
continue;
}
err = xsk_skb_sw_csum(skb, xs->pool);
if (unlikely(err)) {
xsk_drop_skb(skb);
goto out;
}
err = __dev_direct_xmit(skb, xs->queue_id);
if (err == NETDEV_TX_BUSY) {
/* Tell user-space to retry the send */