diff options
author | Tom Herbert <therbert@google.com> | 2014-08-28 00:26:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-29 23:41:11 -0400 |
commit | 662880f4420340aad4f9a62a349c6c9d4faa1a5d (patch) | |
tree | d62876eeef140de3256a22f0632571dc00c9745c /net | |
parent | 77cffe23c1f88835f6bd7b47bfa0c060c2969828 (diff) |
net: Allow GRO to use and set levels of checksum unnecessary
Allow GRO path to "consume" checksums provided in CHECKSUM_UNNECESSARY
and to report new checksums verfied for use in fallback to normal
path.
Change GRO checksum path to track csum_level using a csum_cnt field
in NAPI_GRO_CB. On GRO initialization, if ip_summed is
CHECKSUM_UNNECESSARY set NAPI_GRO_CB(skb)->csum_cnt to
skb->csum_level + 1. For each checksum verified, decrement
NAPI_GRO_CB(skb)->csum_cnt while its greater than zero. If a checksum
is verfied and NAPI_GRO_CB(skb)->csum_cnt == 0, we have verified a
deeper checksum than originally indicated in skbuf so increment
csum_level (or initialize to CHECKSUM_UNNECESSARY if ip_summed is
CHECKSUM_NONE or CHECKSUM_COMPLETE).
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/dev.c | 24 | ||||
-rw-r--r-- | net/ipv4/gre_offload.c | 7 | ||||
-rw-r--r-- | net/ipv4/udp_offload.c | 5 |
3 files changed, 21 insertions, 15 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 26d296c2447c..a6077ef56345 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -3962,13 +3962,6 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff | |||
3962 | 3962 | ||
3963 | gro_list_prepare(napi, skb); | 3963 | gro_list_prepare(napi, skb); |
3964 | 3964 | ||
3965 | if (skb->ip_summed == CHECKSUM_COMPLETE) { | ||
3966 | NAPI_GRO_CB(skb)->csum = skb->csum; | ||
3967 | NAPI_GRO_CB(skb)->csum_valid = 1; | ||
3968 | } else { | ||
3969 | NAPI_GRO_CB(skb)->csum_valid = 0; | ||
3970 | } | ||
3971 | |||
3972 | rcu_read_lock(); | 3965 | rcu_read_lock(); |
3973 | list_for_each_entry_rcu(ptype, head, list) { | 3966 | list_for_each_entry_rcu(ptype, head, list) { |
3974 | if (ptype->type != type || !ptype->callbacks.gro_receive) | 3967 | if (ptype->type != type || !ptype->callbacks.gro_receive) |
@@ -3980,7 +3973,22 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff | |||
3980 | NAPI_GRO_CB(skb)->flush = 0; | 3973 | NAPI_GRO_CB(skb)->flush = 0; |
3981 | NAPI_GRO_CB(skb)->free = 0; | 3974 | NAPI_GRO_CB(skb)->free = 0; |
3982 | NAPI_GRO_CB(skb)->udp_mark = 0; | 3975 | NAPI_GRO_CB(skb)->udp_mark = 0; |
3983 | NAPI_GRO_CB(skb)->encapsulation = 0; | 3976 | |
3977 | /* Setup for GRO checksum validation */ | ||
3978 | switch (skb->ip_summed) { | ||
3979 | case CHECKSUM_COMPLETE: | ||
3980 | NAPI_GRO_CB(skb)->csum = skb->csum; | ||
3981 | NAPI_GRO_CB(skb)->csum_valid = 1; | ||
3982 | NAPI_GRO_CB(skb)->csum_cnt = 0; | ||
3983 | break; | ||
3984 | case CHECKSUM_UNNECESSARY: | ||
3985 | NAPI_GRO_CB(skb)->csum_cnt = skb->csum_level + 1; | ||
3986 | NAPI_GRO_CB(skb)->csum_valid = 0; | ||
3987 | break; | ||
3988 | default: | ||
3989 | NAPI_GRO_CB(skb)->csum_cnt = 0; | ||
3990 | NAPI_GRO_CB(skb)->csum_valid = 0; | ||
3991 | } | ||
3984 | 3992 | ||
3985 | pp = ptype->callbacks.gro_receive(&napi->gro_list, skb); | 3993 | pp = ptype->callbacks.gro_receive(&napi->gro_list, skb); |
3986 | break; | 3994 | break; |
diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c index d1bd16937d93..a4d7965fb880 100644 --- a/net/ipv4/gre_offload.c +++ b/net/ipv4/gre_offload.c | |||
@@ -172,12 +172,9 @@ static struct sk_buff **gre_gro_receive(struct sk_buff **head, | |||
172 | } | 172 | } |
173 | 173 | ||
174 | /* Don't bother verifying checksum if we're going to flush anyway. */ | 174 | /* Don't bother verifying checksum if we're going to flush anyway. */ |
175 | if (greh->flags & GRE_CSUM) { | 175 | if ((greh->flags & GRE_CSUM) && !NAPI_GRO_CB(skb)->flush && |
176 | if (!NAPI_GRO_CB(skb)->flush && | 176 | skb_gro_checksum_simple_validate(skb)) |
177 | skb_gro_checksum_simple_validate(skb)) | ||
178 | goto out_unlock; | 177 | goto out_unlock; |
179 | NAPI_GRO_CB(skb)->encapsulation++; | ||
180 | } | ||
181 | 178 | ||
182 | flush = 0; | 179 | flush = 0; |
183 | 180 | ||
diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index 8ed460e3753c..a6adff98382a 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c | |||
@@ -238,12 +238,13 @@ struct sk_buff **udp_gro_receive(struct sk_buff **head, struct sk_buff *skb, | |||
238 | int flush = 1; | 238 | int flush = 1; |
239 | 239 | ||
240 | if (NAPI_GRO_CB(skb)->udp_mark || | 240 | if (NAPI_GRO_CB(skb)->udp_mark || |
241 | (!skb->encapsulation && !NAPI_GRO_CB(skb)->csum_valid)) | 241 | (skb->ip_summed != CHECKSUM_PARTIAL && |
242 | NAPI_GRO_CB(skb)->csum_cnt == 0 && | ||
243 | !NAPI_GRO_CB(skb)->csum_valid)) | ||
242 | goto out; | 244 | goto out; |
243 | 245 | ||
244 | /* mark that this skb passed once through the udp gro layer */ | 246 | /* mark that this skb passed once through the udp gro layer */ |
245 | NAPI_GRO_CB(skb)->udp_mark = 1; | 247 | NAPI_GRO_CB(skb)->udp_mark = 1; |
246 | NAPI_GRO_CB(skb)->encapsulation++; | ||
247 | 248 | ||
248 | rcu_read_lock(); | 249 | rcu_read_lock(); |
249 | uo_priv = rcu_dereference(udp_offload_base); | 250 | uo_priv = rcu_dereference(udp_offload_base); |