Skip to content

Commit

Permalink
net: optimise inet_proto_csum_replace4()
Browse files Browse the repository at this point in the history
csum_partial() is a generic function which is not optimised for small fixed
length calculations, and its use requires to store "from" and "to" values in
memory while we already have them available in registers. This also has impact,
especially on RISC processors. In the same spirit as the change done by
Eric Dumazet on csum_replace2(), this patch rewrites inet_proto_csum_replace4()
taking into account RFC1624.

I spotted during a NATted tcp transfert that csum_partial() is one of top 5
consuming functions (around 8%), and the second user of csum_partial() is
inet_proto_csum_replace4().

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
LEROY Christophe authored and David S. Miller committed Sep 26, 2014
1 parent 4565af0 commit 58e3cac
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions net/core/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -306,16 +306,14 @@ EXPORT_SYMBOL(in6_pton);
void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb,
__be32 from, __be32 to, int pseudohdr)
{
__be32 diff[] = { ~from, to };
if (skb->ip_summed != CHECKSUM_PARTIAL) {
*sum = csum_fold(csum_partial(diff, sizeof(diff),
~csum_unfold(*sum)));
*sum = csum_fold(csum_add(csum_sub(~csum_unfold(*sum), from),
to));
if (skb->ip_summed == CHECKSUM_COMPLETE && pseudohdr)
skb->csum = ~csum_partial(diff, sizeof(diff),
~skb->csum);
skb->csum = ~csum_add(csum_sub(~(skb->csum), from), to);
} else if (pseudohdr)
*sum = ~csum_fold(csum_partial(diff, sizeof(diff),
csum_unfold(*sum)));
*sum = ~csum_fold(csum_add(csum_sub(csum_unfold(*sum), from),
to));
}
EXPORT_SYMBOL(inet_proto_csum_replace4);

Expand Down

0 comments on commit 58e3cac

Please sign in to comment.