diff options
author | Paolo Abeni <pabeni@redhat.com> | 2017-07-31 16:52:36 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-07-31 22:01:21 -0700 |
commit | cb891fa6a1d5f52c5f5c07b6f7f4c6d65ea55fc0 (patch) | |
tree | bd5ac01acb50fe8873102d5d3084ee2cc1c73548 /include/linux/ipv6.h | |
parent | ddab82821fa633da768879fc515e76dcb1207151 (diff) | |
download | linux-stable-cb891fa6a1d5f52c5f5c07b6f7f4c6d65ea55fc0.tar.gz linux-stable-cb891fa6a1d5f52c5f5c07b6f7f4c6d65ea55fc0.tar.bz2 linux-stable-cb891fa6a1d5f52c5f5c07b6f7f4c6d65ea55fc0.zip |
udp6: fix jumbogram reception
Since commit 67a51780aebb ("ipv6: udp: leverage scratch area
helpers") udp6_recvmsg() read the skb len from the scratch area,
to avoid a cache miss.
But the UDP6 rx path support RFC 2675 UDPv6 jumbograms, and their
length exceeds the 16 bits available in the scratch area. As a side
effect the length returned by recvmsg() is:
<ingress datagram len> % (1<<16)
This commit addresses the issue allocating one more bit in the
IP6CB flags field and setting it for incoming jumbograms.
Such field is still in the first cacheline, so at recvmsg()
time we can check it and fallback to access skb->len if
required, without a measurable overhead.
Fixes: 67a51780aebb ("ipv6: udp: leverage scratch area helpers")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/ipv6.h')
-rw-r--r-- | include/linux/ipv6.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index e1b442996f81..474d6bbc158c 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -128,6 +128,7 @@ struct inet6_skb_parm { #define IP6SKB_FRAGMENTED 16 #define IP6SKB_HOPBYHOP 32 #define IP6SKB_L3SLAVE 64 +#define IP6SKB_JUMBOGRAM 128 }; #if defined(CONFIG_NET_L3_MASTER_DEV) @@ -152,6 +153,11 @@ static inline int inet6_iif(const struct sk_buff *skb) return l3_slave ? skb->skb_iif : IP6CB(skb)->iif; } +static inline bool inet6_is_jumbogram(const struct sk_buff *skb) +{ + return !!(IP6CB(skb)->flags & IP6SKB_JUMBOGRAM); +} + /* can not be used in TCP layer after tcp_v6_fill_cb */ static inline bool inet6_exact_dif_match(struct net *net, struct sk_buff *skb) { |