Commit 3d3be433 authored Sep 01, 2010 by Eric Dumazet Committed by David S. Miller Sep 01, 2010

gro: fix different skb headrooms

Packets entering GRO might have different headrooms, even for a given
flow (because of implementation details in drivers, like copybreak).
We cant force drivers to deliver packets with a fixed headroom.

1) fix skb_segment()

skb_segment() makes the false assumption headrooms of fragments are same
than the head. When CHECKSUM_PARTIAL is used, this can give csum_start
errors, and crash later in skb_copy_and_csum_dev()

2) allocate a minimal skb for head of frag_list

skb_gro_receive() uses netdev_alloc_skb(headroom + skb_gro_offset(p)) to
allocate a fresh skb. This adds NET_SKB_PAD to a padding already
provided by netdevice, depending on various things, like copybreak.

Use alloc_skb() to allocate an exact padding, to reduce cache line
needs:
NET_SKB_PAD + NET_IP_ALIGN

bugzilla : https://bugzilla.kernel.org/show_bug.cgi?id=16626



Many thanks to Plamen Petrov, testing many debugging patches !
With help of Jarek Poplawski.

Reported-by: Plamen Petrov <pvp-lsts@fs.uni-ruse.bg>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 87f94b4e

net/core/skbuff.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -2573,6 +2573,10 @@ struct sk_buff skb_segment(struct sk_buff skb, int features)
		__copy_skb_header(nskb, skb);
		nskb->mac_len = skb->mac_len;

		/* nskb and skb might have different headroom */
		if (nskb->ip_summed == CHECKSUM_PARTIAL)
		nskb->csum_start += skb_headroom(nskb) - headroom;

		skb_reset_mac_header(nskb);
		skb_set_network_header(nskb, skb->mac_len);
		nskb->transport_header = (nskb->network_header +
		@@ -2702,8 +2706,8 @@ int skb_gro_receive(struct sk_buff *head, struct sk_buff skb)
		} else if (skb_gro_len(p) != pinfo->gso_size)
		return -E2BIG;

		headroom = skb_headroom(p);
		nskb = netdev_alloc_skb(p->dev, headroom + skb_gro_offset(p));
		headroom = NET_SKB_PAD + NET_IP_ALIGN;
		nskb = alloc_skb(headroom + skb_gro_offset(p), GFP_ATOMIC);
		if (unlikely(!nskb))
		return -ENOMEM;

Admin message