mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends
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: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 88078d98d1
)
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
5123ffdad6
commit
6bf32cda46
2 changed files with 16 additions and 3 deletions
|
@ -3135,6 +3135,7 @@ static inline void *skb_push_rcsum(struct sk_buff *skb, unsigned int len)
|
||||||
return skb->data;
|
return skb->data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int pskb_trim_rcsum_slow(struct sk_buff *skb, unsigned int len);
|
||||||
/**
|
/**
|
||||||
* pskb_trim_rcsum - trim received skb and update checksum
|
* pskb_trim_rcsum - trim received skb and update checksum
|
||||||
* @skb: buffer to trim
|
* @skb: buffer to trim
|
||||||
|
@ -3148,9 +3149,7 @@ static inline int pskb_trim_rcsum(struct sk_buff *skb, unsigned int len)
|
||||||
{
|
{
|
||||||
if (likely(len >= skb->len))
|
if (likely(len >= skb->len))
|
||||||
return 0;
|
return 0;
|
||||||
if (skb->ip_summed == CHECKSUM_COMPLETE)
|
return pskb_trim_rcsum_slow(skb, len);
|
||||||
skb->ip_summed = CHECKSUM_NONE;
|
|
||||||
return __pskb_trim(skb, len);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int __skb_trim_rcsum(struct sk_buff *skb, unsigned int len)
|
static inline int __skb_trim_rcsum(struct sk_buff *skb, unsigned int len)
|
||||||
|
|
|
@ -1839,6 +1839,20 @@ int ___pskb_trim(struct sk_buff *skb, unsigned int len)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(___pskb_trim);
|
EXPORT_SYMBOL(___pskb_trim);
|
||||||
|
|
||||||
|
/* 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);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(pskb_trim_rcsum_slow);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* __pskb_pull_tail - advance tail of skb header
|
* __pskb_pull_tail - advance tail of skb header
|
||||||
* @skb: buffer to reallocate
|
* @skb: buffer to reallocate
|
||||||
|
|
Loading…
Reference in a new issue