Commit 7fab8b2f authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman

net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends

commit 88078d98d1bb085d72af8437707279e203524fa5 upstream.

After working on IP defragmentation lately, I found that some large
packets defeat CHECKSUM_COMPLETE optimization because of NIC adding
zero paddings on the last (small) fragment.

While removing the padding with pskb_trim_rcsum(), we set skb->ip_summed
to CHECKSUM_NONE, forcing a full csum validation, even if all prior
fragments had CHECKSUM_COMPLETE set.

We can instead compute the checksum of the part we are trimming,
usually smaller than the part we keep.
Signed-off-by: default avatarEric Dumazet <>
Signed-off-by: default avatarDavid S. Miller <>
Signed-off-by: default avatarBen Hutchings <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 5f2d68b6
......@@ -2796,6 +2796,7 @@ static inline unsigned char *skb_push_rcsum(struct sk_buff *skb,
return skb->data;
int pskb_trim_rcsum_slow(struct sk_buff *skb, unsigned int len);
* pskb_trim_rcsum - trim received skb and update checksum
* @skb: buffer to trim
......@@ -2810,9 +2811,7 @@ static inline int pskb_trim_rcsum(struct sk_buff *skb, unsigned int len)
if (likely(len >= skb->len))
return 0;
if (skb->ip_summed == CHECKSUM_COMPLETE)
skb->ip_summed = CHECKSUM_NONE;
return __pskb_trim(skb, len);
return pskb_trim_rcsum_slow(skb, len);
#define rb_to_skb(rb) rb_entry_safe(rb, struct sk_buff, rbnode)
......@@ -1502,6 +1502,20 @@ done:
/* Note : use pskb_trim_rcsum() instead of calling this directly
int pskb_trim_rcsum_slow(struct sk_buff *skb, unsigned int len)
if (skb->ip_summed == CHECKSUM_COMPLETE) {
int delta = skb->len - len;
skb->csum = csum_sub(skb->csum,
skb_checksum(skb, len, delta, 0));
return __pskb_trim(skb, len);
* __pskb_pull_tail - advance tail of skb header
* @skb: buffer to reallocate
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment