linux.git/net/ipv4/ip_output.c, branch v2.6.36

ip: fix truesize mismatch in ip fragmentation

2010-09-21T22:05:50+00:00

Special care should be taken when slow path is hit in ip_fragment() :

When walking through frags, we transfert truesize ownership from skb to
frags. Then if we hit a slow_path condition, we must undo this or risk
uncharging frags->truesize twice, and in the end, having negative socket
sk_wmem_alloc counter, or even freeing socket sooner than expected.

Many thanks to Nick Bowler, who provided a very clean bug report and
test program.

Thanks to Jarek for reviewing my first patch and providing a V2

While Nick bisection pointed to commit 2b85a34e911 (net: No more
expensive sock_hold()/sock_put() on each tx), underlying bug is older
(2.6.12-rc5)

A side effect is to extend work done in commit b2722b1c3a893e
(ip_fragment: also adjust skb->truesize for packets not owned by a
socket) to ipv6 as well.

Reported-and-bisected-by: Nick Bowler 
Tested-by: Nick Bowler 
Signed-off-by: Eric Dumazet 
CC: Jarek Poplawski 
CC: Patrick McHardy 
Signed-off-by: David S. Miller

ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice

2010-08-03T00:25:07+00:00

6c79bf0f2440fd250c8fce8d9b82fcf03d4e8350 subtracts PPPOE_SES_HLEN from mtu at
the front of ip_fragment(). So the later subtraction should be removed. The
MTU of 802.1q is also 1500, so MTU should not be changed.

Signed-off-by: Changli Gao 
Signed-off-by: Bart De Schuymer 
----
 net/ipv4/ip_output.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
Signed-off-by: Bart De Schuymer 
Signed-off-by: David S. Miller

net/ipv4: EXPORT_SYMBOL cleanups

2010-07-12T19:57:54+00:00

CodingStyle cleanups

EXPORT_SYMBOL should immediately follow the symbol declaration.

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

net/ipv4/ip_output.c: Removal of unused variable in ip_fragment()

2010-07-07T22:44:59+00:00

Removal of unused integer variable in ip_fragment().

Signed-off-by: George Kadianakis 
Signed-off-by: David S. Miller

ipv4: use skb_dst_copy() in ip_copy_metadata()

2010-07-06T01:50:56+00:00

Avoid touching dst refcount in ip_fragment().

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-06-24T01:26:27+00:00

Conflicts:
	net/ipv4/ip_output.c

udp: Fix bogus UFO packet generation

2010-06-21T20:57:34+00:00

It has been reported that the new UFO software fallback path
fails under certain conditions with NFS.  I tracked the problem
down to the generation of UFO packets that are smaller than the
MTU.  The software fallback path simply discards these packets.

This patch fixes the problem by not generating such packets on
the UFO path.

Signed-off-by: Herbert Xu 
Reviewed-by: Michael S. Tsirkin 
Signed-off-by: David S. Miller

net-next: remove useless union keyword

2010-06-11T06:31:35+00:00

remove useless union keyword in rtable, rt6_info and dn_route.

Since there is only one member in a union, the union keyword isn't useful.

Signed-off-by: Changli Gao 
Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

net: No dst refcounting in ip_queue_xmit()

2010-05-18T00:18:52+00:00

TCP outgoing packets can avoid two atomic ops, and dirtying
of previously higly contended cache line using new refdst
infrastructure.

Note 1: loopback device excluded because of !IFF_XMIT_DST_RELEASE
Note 2: UDP packets dsts are built before ip_queue_xmit().

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

Merge branch 'master' of /repos/git/net-next-2.6

2010-05-10T16:39:28+00:00

Conflicts:
	net/bridge/br_device.c
	net/bridge/br_forward.c

Signed-off-by: Patrick McHardy