ipv4: Use 32-bit loads for ID and length in GRO
authorHerbert Xu <herbert@gondor.apana.org.au>
Tue, 26 May 2009 18:50:29 +0000 (18:50 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 May 2009 10:26:02 +0000 (03:26 -0700)
This patch optimises the IPv4 GRO code by using 32-bit loads
(instead of 16-bit ones) on the ID and length checks in the receive
function.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/af_inet.c

index 644cc55353198088e4b99e0396819fd266bda76e..5abee4c9744948230bf0fa50277086a2cf1a8316 100644 (file)
@@ -1248,9 +1248,9 @@ static struct sk_buff **inet_gro_receive(struct sk_buff **head,
        struct iphdr *iph;
        unsigned int hlen;
        unsigned int off;
+       unsigned int id;
        int flush = 1;
        int proto;
-       int id;
 
        off = skb_gro_offset(skb);
        hlen = off + sizeof(*iph);
@@ -1274,9 +1274,9 @@ static struct sk_buff **inet_gro_receive(struct sk_buff **head,
        if (unlikely(ip_fast_csum((u8 *)iph, iph->ihl)))
                goto out_unlock;
 
-       flush = ntohs(iph->tot_len) != skb_gro_len(skb) ||
-               iph->frag_off != htons(IP_DF);
-       id = ntohs(iph->id);
+       id = ntohl(*(u32 *)&iph->id);
+       flush = (u16)((ntohl(*(u32 *)iph) ^ skb_gro_len(skb)) | (id ^ IP_DF));
+       id >>= 16;
 
        for (p = *head; p; p = p->next) {
                struct iphdr *iph2;