net: sock_queue_err_skb() dont mess with sk_forward_alloc
authorEric Dumazet <eric.dumazet@gmail.com>
Tue, 1 Jun 2010 06:44:05 +0000 (23:44 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Feb 2012 19:28:51 +0000 (11:28 -0800)
commita77912b9bce47661279f4f1a5be10b15d40b402d
tree235af253d59caca288b4abb67da1707656b35f53
parent956a79d503998a763dd71847f2f9eb19349c2aba
net: sock_queue_err_skb() dont mess with sk_forward_alloc

commit b1faf5666438090a4dc4fceac8502edc7788b7e3 upstream.

Correct sk_forward_alloc handling for error_queue would need to use a
backlog of frames that softirq handler could not deliver because socket
is owned by user thread. Or extend backlog processing to be able to
process normal and error packets.

Another possibility is to not use mem charge for error queue, this is
what I implemented in this patch.

Note: this reverts commit 29030374
(net: fix sk_forward_alloc corruptions), since we dont need to lock
socket anymore.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: 单卫 <shanwei88@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/net/sock.h
net/core/skbuff.c
net/ipv4/udp.c
net/ipv6/udp.c