: Get rid of HW checksum invalidation
Subsystems (3)
[NETFILTER]: Get rid of HW checksum invalidation
Update hardware checksums incrementally to avoid breaking GSO.
Signed-off-by Patrick McHardy <[email protected]>
---
commit d4bf859dbf0158d8ac0dc7d9d88d68c6882233df
tree 901cd99e90a5f1d1390455ab7833021eb73772e2
parent b49dd1802f397fb8d5272a34ba47fe9636fe2411
author Patrick McHardy <[email protected]> Sat, 05 Aug 2006 09:16:22 +0200 committer Patrick McHardy <[email protected]> Sat, 05 Aug 2006 09:16:22 +0200
include/linux/netfilter.h | 6 +++ include/linux/netfilter_ipv4/ip_nat.h | 4 -- include/linux/netfilter_ipv4/ip_nat_core.h | 8 ++-- net/ipv4/netfilter/ip_nat_core.c | 52 +++++++++---------------- net/ipv4/netfilter/ip_nat_helper.c | 59 +++++++++++++++++++--------- net/ipv4/netfilter/ip_nat_proto_gre.c | 5 +- net/ipv4/netfilter/ip_nat_proto_icmp.c | 8 ++-- net/ipv4/netfilter/ip_nat_proto_tcp.c | 7 +-- net/ipv4/netfilter/ip_nat_proto_udp.c | 15 +++++-- net/ipv4/netfilter/ip_nat_standalone.c | 10 +---- net/ipv4/netfilter/ipt_ECN.c | 19 +++------ net/ipv4/netfilter/ipt_REJECT.c | 1 net/ipv4/netfilter/ipt_TCPMSS.c | 39 ++++++++----------- net/netfilter/core.c | 22 ++++++++++ 14 files changed, 138 insertions(+), 117 deletions(-)
include/linux/netfilter.h +6 -0
@@ -282,6 +282,12 @@ extern void nf_invalidate_cache(int pf);Returns true or false. */ extern int skb_make_writable (struct sk_buff **pskb,unsigned int writable_len); +extern u_int16_t nf_csum_update (u_int32_t oldval,u_int32_t newval, +u_int32_t csum); +extern u_int16_t nf_proto_csum_update (struct sk_buff *skb, +u_int32_t oldval,u_int32_t newval, +u_int16_t csum,int pseudohdr); +struct nf_afinfo {unsigned short family; unsigned int (*checksum)(struct sk_buff *skb, unsigned int hook,
include/linux/netfilter_ipv4/ip_nat.h +0 -4
@@ -72,10 +72,6 @@ extern unsigned int ip_nat_setup_info(stextern int ip_nat_used_tuple (const struct ip_conntrack_tuple *tuple,const struct ip_conntrack *ignored_conntrack); -/* Calculate relative checksum. */ -extern u_int16_t ip_nat_cheat_check (u_int32_t oldvalinv, -u_int32_t newval, -u_int16_t oldcheck);#else /* !__KERNEL__: iptables wants this to compile. */ #define ip_nat_multi_range ip_nat_multi_range_compat#endif /*__KERNEL__*/
include/linux/netfilter_ipv4/ip_nat_core.h +4 -4
@@ -11,8 +11,8 @@ extern unsigned int ip_nat_packet(structunsigned int hooknum, struct sk_buff **pskb); -extern int ip_nat_icmp_reply_translation (struct sk_buff **pskb, -struct ip_conntrack *ct, -enum ip_nat_manip_type manip, -enum ip_conntrack_dir dir); +extern int ip_nat_icmp_reply_translation (struct ip_conntrack *ct, +enum ip_conntrack_info ctinfo, +unsigned int hooknum, +struct sk_buff **pskb);#endif /* _IP_NAT_CORE_H */
net/ipv4/netfilter/ip_nat_core.c +20 -32
91 lines not on this page · raw message
net/ipv4/netfilter/ip_nat_helper.c +41 -18
110 lines not on this page · raw message
net/ipv4/netfilter/ip_nat_proto_gre.c +3 -2
@@ -130,9 +130,10 @@ gre_manip_pkt(struct sk_buff **pskb,if (greh->csum) {/* FIXME: Never tested this code... */ *(gre_csum (greh)) = -ip_nat_cheat_check (~*(gre_key (greh)), +nf_proto_csum_update (*pskb, + ~*(gre_key (greh)), tuple->dst.u.gre.key, - *(gre_csum (greh))); + *(gre_csum (greh)),0 ); } *(gre_key (greh)) = tuple->dst.u.gre.key;break ;
net/ipv4/netfilter/ip_nat_proto_icmp.c +4 -4
@@ -66,10 +66,10 @@ icmp_manip_pkt(struct sk_buff **pskb,return 0 ; hdr = (struct icmphdr *)((*pskb)->data + hdroff); - - hdr->checksum =ip_nat_cheat_check (hdr->un.echo.id ^0xFFFF , - tuple->src.u.icmp.id, - hdr->checksum); + hdr->checksum =nf_proto_csum_update (*pskb, + hdr->un.echo.id ^0xFFFF , + tuple->src.u.icmp.id, + hdr->checksum,0 ); hdr->un.echo.id = tuple->src.u.icmp.id;return 1 ; }
net/ipv4/netfilter/ip_nat_proto_tcp.c +3 -4
@@ -129,10 +129,9 @@ tcp_manip_pkt(struct sk_buff **pskb,if (hdrsize <sizeof (*hdr))return 1 ; - hdr->check =ip_nat_cheat_check (~oldip, newip, -ip_nat_cheat_check (oldport ^0xFFFF , - newport, - hdr->check)); + hdr->check =nf_proto_csum_update (*pskb, ~oldip, newip, hdr->check,1 ); + hdr->check =nf_proto_csum_update (*pskb, oldport ^0xFFFF , newport, + hdr->check,0 );return 1 ; }
net/ipv4/netfilter/ip_nat_proto_udp.c +10 -5
@@ -113,11 +113,16 @@ udp_manip_pkt(struct sk_buff **pskb, newport = tuple->dst.u.udp.port; portptr = &hdr->dest; } -if (hdr->check)/* 0 is a special case meaning no checksum */ - hdr->check =ip_nat_cheat_check (~oldip, newip, -ip_nat_cheat_check (*portptr ^0xFFFF , - newport, - hdr->check)); + +if (hdr->check || (*pskb)->ip_summed ==CHECKSUM_PARTIAL ) { + hdr->check =nf_proto_csum_update (*pskb, ~oldip, newip, + hdr->check,1 ); + hdr->check =nf_proto_csum_update (*pskb, + *portptr ^0xFFFF , newport, + hdr->check,0 ); +if (!hdr->check) + hdr->check =-1 ; + } *portptr = newport;return 1 ; }
net/ipv4/netfilter/ip_nat_standalone.c +2 -8
@@ -110,12 +110,6 @@ ip_nat_fn(unsigned int hooknum,IP_NF_ASSERT (!((*pskb)->nh.iph->frag_off &htons (IP_MF |IP_OFFSET ))); -/* If we had a hardware checksum before, it's now invalid */ -if ((*pskb)->ip_summed ==CHECKSUM_PARTIAL || - (*pskb)->ip_summed ==CHECKSUM_COMPLETE ) -if (skb_checksum_help (*pskb)) -return NF_DROP ; - ct =ip_conntrack_get (*pskb, &ctinfo);/* Can't track? It's not due to stress, or conntrack would have dropped it. Hence it's the user's responsibilty to
@@ -146,8 +140,8 @@ ip_nat_fn(unsigned int hooknum,case IP_CT_RELATED :case IP_CT_RELATED +IP_CT_IS_REPLY :if ((*pskb)->nh.iph->protocol ==IPPROTO_ICMP ) { -if (!ip_nat_icmp_reply_translation (pskb, ct, maniptype, -CTINFO2DIR (ctinfo))) +if (!ip_nat_icmp_reply_translation (ct, ctinfo, + hooknum, pskb))return NF_DROP ;else return NF_ACCEPT ;
net/ipv4/netfilter/ipt_ECN.c +6 -13
@@ -52,7 +52,7 @@ static inline int set_ect_tcp(struct sk_buff **pskb, const struct ipt_ECN_info *einfo) { struct tcphdr _tcph, *tcph; -u_int16_t diffs[2 ]; +u_int16_t oldval;/* Not enought header? */ tcph = skb_header_pointer(*pskb, (*pskb)->nh.iph->ihl*4,
@@ -70,23 +70,16 @@ set_ect_tcp(struct sk_buff **pskb, constreturn 0 ; tcph = (void *)(*pskb)->nh.iph + (*pskb)->nh.iph->ihl*4 ; -if (((*pskb)->ip_summed ==CHECKSUM_PARTIAL || - (*pskb)->ip_summed ==CHECKSUM_COMPLETE ) && -skb_checksum_help (*pskb)) -return 0 ; - - diffs[0 ] = ((u_int16_t *)tcph)[6 ]; + oldval = ((u_int16_t *)tcph)[6 ];if (einfo->operation &IPT_ECN_OP_SET_ECE ) tcph->ece = einfo->proto.tcp.ece;if (einfo->operation &IPT_ECN_OP_SET_CWR ) tcph->cwr = einfo->proto.tcp.cwr; - diffs[1 ] = ((u_int16_t *)tcph)[6 ]; - diffs[0 ] = diffs[0 ] ^0xFFFF ; -if ((*pskb)->ip_summed !=CHECKSUM_UNNECESSARY ) - tcph->check =csum_fold (csum_partial ((char *)diffs, -sizeof (diffs), - tcph->check^0xFFFF )); + tcph->check =nf_proto_csum_update ((*pskb), + oldval ^0xFFFF , + ((u_int16_t *)tcph)[6 ], + tcph->check,0 );return 1 ; }
net/ipv4/netfilter/ipt_REJECT.c +1 -0
@@ -185,6 +185,7 @@ static void send_reset(struct sk_buff *o tcph->urg_ptr =0 ;/* Adjust TCP checksum */ + nskb->ip_summed =CHECKSUM_NONE ; tcph->check =0 ; tcph->check = tcp_v4_check(tcph, sizeof(struct tcphdr), nskb->nh.iph->saddr,
net/ipv4/netfilter/ipt_TCPMSS.c +16 -23
@@ -27,14 +27,6 @@ #else #define DEBUGP(format, args...)#endif -static u_int16_t -cheat_check (u_int32_t oldvalinv,u_int32_t newval,u_int16_t oldcheck) -{ -u_int32_t diffs[] = { oldvalinv, newval }; -return csum_fold (csum_partial ((char *)diffs,sizeof (diffs), - oldcheck^0xFFFF )); -} -static inline unsigned int optlen (const u_int8_t *opt,unsigned int offset) {
@@ -62,11 +54,6 @@ ipt_tcpmss_target(struct sk_buff **pskb,if (!skb_make_writable (pskb, (*pskb)->len))return NF_DROP ; -if (((*pskb)->ip_summed ==CHECKSUM_PARTIAL || - (*pskb)->ip_summed ==CHECKSUM_COMPLETE ) && -skb_checksum_help (*pskb)) -return NF_DROP ; - iph = (*pskb)->nh.iph; tcplen = (*pskb)->len - iph->ihl*4 ;
@@ -120,9 +107,10 @@ ipt_tcpmss_target(struct sk_buff **pskb, opt[i+2 ] = (newmss &0xff00 ) >>8 ; opt[i+3 ] = (newmss &0x00ff ); - tcph->check =cheat_check (htons (oldmss)^0xFFFF , -htons (newmss), - tcph->check); + tcph->check =nf_proto_csum_update (*pskb, +htons (oldmss)^0xFFFF , +htons (newmss), + tcph->check,0 );DEBUGP (KERN_INFO "ipt_tcpmss_target: %u.%u.%u.%u:%hu" "->%u.%u.%u.%u:%hu changed TCP MSS option"
@@ -162,8 +150,10 @@ ipt_tcpmss_target(struct sk_buff **pskb, opt = (u_int8_t *)tcph +sizeof (struct tcphdr );memmove (opt +TCPOLEN_MSS , opt, tcplen -sizeof (struct tcphdr )); - tcph->check =cheat_check (htons (tcplen) ^0xFFFF , -htons (tcplen +TCPOLEN_MSS ), tcph->check); + tcph->check =nf_proto_csum_update (*pskb, +htons (tcplen) ^0xFFFF , +htons (tcplen +TCPOLEN_MSS ), + tcph->check,1 ); tcplen +=TCPOLEN_MSS ; opt[0 ] =TCPOPT_MSS ;
@@ -171,16 +161,19 @@ ipt_tcpmss_target(struct sk_buff **pskb, opt[2 ] = (newmss &0xff00 ) >>8 ; opt[3 ] = (newmss &0x00ff ); - tcph->check =cheat_check (~0 , *((u_int32_t *)opt), tcph->check); + tcph->check =nf_proto_csum_update (*pskb, ~0 , *((u_int32_t *)opt), + tcph->check,0 ); oldval = ((u_int16_t *)tcph)[6 ]; tcph->doff +=TCPOLEN_MSS /4 ; - tcph->check =cheat_check (oldval ^0xFFFF , - ((u_int16_t *)tcph)[6 ], tcph->check); + tcph->check =nf_proto_csum_update (*pskb, + oldval ^0xFFFF , + ((u_int16_t *)tcph)[6 ], + tcph->check,0 ); newtotlen =htons (ntohs (iph->tot_len) +TCPOLEN_MSS ); - iph->check =cheat_check (iph->tot_len ^0xFFFF , - newtotlen, iph->check); + iph->check =nf_csum_update (iph->tot_len ^0xFFFF , + newtotlen, iph->check); iph->tot_len = newtotlen; DEBUGP(KERN_INFO "ipt_tcpmss_target: %u.%u.%u.%u:%hu"
net/netfilter/core.c +22 -0
@@ -222,6 +222,28 @@ copy_skb: }EXPORT_SYMBOL (skb_make_writable); +u_int16_t nf_csum_update (u_int32_t oldval,u_int32_t newval,u_int32_t csum) +{ +u_int32_t diff[] = { oldval, newval }; + +return csum_fold (csum_partial ((char *)diff,sizeof (diff), ~csum)); +} +EXPORT_SYMBOL (nf_csum_update); + +u_int16_t nf_proto_csum_update (struct sk_buff *skb, +u_int32_t oldval,u_int32_t newval, +u_int16_t csum,int pseudohdr) +{ +if (skb->ip_summed !=CHECKSUM_PARTIAL ) { + csum =nf_csum_update (oldval, newval, csum); +if (skb->ip_summed ==CHECKSUM_COMPLETE && pseudohdr) + skb->csum =nf_csum_update (oldval, newval, skb->csum); + }else if (pseudohdr) + csum = ~nf_csum_update (oldval, newval, ~csum); + +return csum; +} +EXPORT_SYMBOL (nf_proto_csum_update);/* This does not belong here, but locally generated errors need it if connection tracking in use: without this, connection may not be in hash table, and hence