linux-stable.git/net/core/skbuff.c, branch linux-3.6.y

net: fix secpath kmemleak

2012-11-17T21:18:52+00:00

[ Upstream commit 3d861f661006606bf159fd6bd973e83dbf21d0f9 ]

Mike Kazantsev found 3.5 kernels and beyond were leaking memory,
and tracked the faulty commit to a1c7fff7e18f59e ("net:
netdev_alloc_skb() use build_skb()")

While this commit seems fine, it uncovered a bug introduced
in commit bad43ca8325 ("net: introduce skb_try_coalesce()), in function
kfree_skb_partial()"):

If head is stolen, we free the sk_buff,
without removing references on secpath (skb->sp).

So IPsec + IP defrag/reassembly (using skb coalescing), or
TCP coalescing could leak secpath objects.

Fix this bug by calling skb_release_head_state(skb) to properly
release all possible references to linked objects.

Reported-by: Mike Kazantsev 
Signed-off-by: Eric Dumazet 
Bisected-by: Mike Kazantsev 
Tested-by: Mike Kazantsev 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

net: remove skb recycling

2012-10-28T17:56:16+00:00

[ Upstream commits acb600def2110b1310466c0e485c0d26299898ae
  and 66eef59f22275002f621ff9d951886b513d011b3. ]

Over time, skb recycling infrastructure got litle interest and
many bugs. Generic rx path skb allocation is now using page
fragments for efficient GRO / TCP coalescing, and recyling
a tx skb for rx path is not worth the pain.

Last identified bug is that fat skbs can be recycled
and it can endup using high order pages after few iterations.

With help from Maxime Bizon, who pointed out that commit
87151b8689d (net: allow pskb_expand_head() to get maximum tailroom)
introduced this regression for recycled skbs.

Instead of fixing this bug, lets remove skb recycling.

Drivers wanting really hot skbs should use build_skb() anyway,
to allocate/populate sk_buff right before netif_receive_skb()

Signed-off-by: Eric Dumazet 
Cc: Maxime Bizon 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

net/core: fix comment in skb_try_coalesce

2012-09-19T21:29:13+00:00

It should be the skb which is not cloned

Signed-off-by: Li RongQing 
Acked-by: Eric Dumazet 
Signed-off-by: David S. Miller

netvm: allow skb allocation to use PFMEMALLOC reserves

2012-08-01T01:42:46+00:00

Change the skb allocation API to indicate RX usage and use this to fall
back to the PFMEMALLOC reserve when needed.  SKBs allocated from the
reserve are tagged in skb->pfmemalloc.  If an SKB is allocated from the
reserve and the socket is later found to be unrelated to page reclaim, the
packet is dropped so that the memory remains available for page reclaim.
Network protocols are expected to recover from this packet loss.

[a.p.zijlstra@chello.nl: Ideas taken from various patches]
[davem@davemloft.net: Use static branches, coding style corrections]
[sebastian@breakpoint.cc: Avoid unnecessary cast, fix !CONFIG_NET build]
Signed-off-by: Mel Gorman 
Acked-by: David S. Miller 
Cc: Neil Brown 
Cc: Peter Zijlstra 
Cc: Mike Christie 
Cc: Eric B Munson 
Cc: Eric Dumazet 
Cc: Sebastian Andrzej Siewior 
Cc: Mel Gorman 
Cc: Christoph Lameter 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

skbuff: export skb_copy_ubufs

2012-07-22T19:39:33+00:00

Export skb_copy_ubufs so that modules can orphan frags.

Signed-off-by: Michael S. Tsirkin 
Signed-off-by: David S. Miller

skbuff: convert to skb_orphan_frags

2012-07-22T19:39:33+00:00

Reduce code duplication a bit using the new helper.

Signed-off-by: Michael S. Tsirkin 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-07-19T18:17:30+00:00

Conflicts:
	drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

skbuff: Use correct allocation in skb_copy_ubufs

2012-07-18T16:40:54+00:00

Use correct allocation flags during copy of user space fragments
to the kernel. Also "improve" couple of for loops.

Signed-off-by: Krishna Kumar 
Signed-off-by: David S. Miller

net: respect GFP_DMA in __netdev_alloc_skb()

2012-07-16T11:17:49+00:00

Few drivers use GFP_DMA allocations, and netdev_alloc_frag()
doesn't allocate pages in DMA zone.

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

net: Update alloc frag to reduce get/put page usage and recycle pages

2012-07-13T12:48:36+00:00

This patch is meant to help improve performance by reducing the number of
locked operations required to allocate a frag on x86 and other platforms.
This is accomplished by using atomic_set operations on the page count
instead of calling get_page and put_page.  It is based on work originally
provided by Eric Dumazet.

In addition it also helps to reduce memory overhead when using TCP.  This
is done by recycling the page if the only holder of the frame is the
netdev_alloc_frag call itself.  This can occur when skb heads are stolen by
either GRO or TCP and the driver providing the packets is using paged frags
to store all of the data for the packets.

Cc: Eric Dumazet 
Signed-off-by: Alexander Duyck 
Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller