linux.git/net/core/sock.c, branch v2.6.37

net: fix nulls list corruptions in sk_prot_alloc

2010-12-16T22:26:56+00:00

Special care is taken inside sk_port_alloc to avoid overwriting
skc_node/skc_nulls_node. We should also avoid overwriting
skc_bind_node/skc_portaddr_node.

The patch fixes the following crash:

 BUG: unable to handle kernel paging request at fffffffffffffff0
 IP: [] udp4_lib_lookup2+0xad/0x370
 [] __udp4_lib_lookup+0x282/0x360
 [] __udp4_lib_rcv+0x31e/0x700
 [] ? ip_local_deliver_finish+0x65/0x190
 [] ? ip_local_deliver+0x88/0xa0
 [] udp_rcv+0x15/0x20
 [] ip_local_deliver_finish+0x65/0x190
 [] ip_local_deliver+0x88/0xa0
 [] ip_rcv_finish+0x32d/0x6f0
 [] ? netif_receive_skb+0x99c/0x11c0
 [] ip_rcv+0x2bb/0x350
 [] netif_receive_skb+0x99c/0x11c0

Signed-off-by: Leonard Crestez 
Signed-off-by: Octavian Purdila 
Acked-by: Eric Dumazet 
Signed-off-by: David S. Miller

net: avoid limits overflow

2010-11-10T20:12:00+00:00

Robin Holt tried to boot a 16TB machine and found some limits were
reached : sysctl_tcp_mem[2], sysctl_udp_mem[2]

We can switch infrastructure to use long "instead" of "int", now
atomic_long_t primitives are available for free.

Signed-off-by: Eric Dumazet 
Reported-by: Robin Holt 
Reviewed-by: Robin Holt 
Signed-off-by: Andrew Morton 
Signed-off-by: David S. Miller

net: add __rcu annotation to sk_filter

2010-10-25T21:18:28+00:00

Add __rcu annotation to :
        (struct sock)->sk_filter

And use appropriate rcu primitives to reduce sparse warnings if
CONFIG_SPARSE_RCU_POINTER=y

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

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

2010-10-23T18:47:02+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1699 commits)
  bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.
  vlan: Calling vlan_hwaccel_do_receive() is always valid.
  tproxy: use the interface primary IP address as a default value for --on-ip
  tproxy: added IPv6 support to the socket match
  cxgb3: function namespace cleanup
  tproxy: added IPv6 support to the TPROXY target
  tproxy: added IPv6 socket lookup function to nf_tproxy_core
  be2net: Changes to use only priority codes allowed by f/w
  tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled
  tproxy: added tproxy sockopt interface in the IPV6 layer
  tproxy: added udp6_lib_lookup function
  tproxy: added const specifiers to udp lookup functions
  tproxy: split off ipv6 defragmentation to a separate module
  l2tp: small cleanup
  nf_nat: restrict ICMP translation for embedded header
  can: mcp251x: fix generation of error frames
  can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set
  can-raw: add msg_flags to distinguish local traffic
  9p: client code cleanup
  rds: make local functions/variables static
  ...

Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and
drivers/net/wireless/ath/ath9k/debug.c as per David

net: suppress RCU lockdep false positive in sock_update_classid

2010-10-07T17:02:28+00:00

> ===================================================
> [ INFO: suspicious rcu_dereference_check() usage. ]
> ---------------------------------------------------
> include/linux/cgroup.h:542 invoked rcu_dereference_check() without protection!
>
> other info that might help us debug this:
>
>
> rcu_scheduler_active = 1, debug_locks = 0
> 1 lock held by swapper/1:
>  #0:  (net_mutex){+.+.+.}, at: []
> register_pernet_subsys+0x1f/0x47
>
> stack backtrace:
> Pid: 1, comm: swapper Not tainted 2.6.35.4-28.fc14.x86_64 #1
> Call Trace:
>  [] lockdep_rcu_dereference+0xaa/0xb3
>  [] sock_update_classid+0x7c/0xa2
>  [] sk_alloc+0x6b/0x77
>  [] __netlink_create+0x37/0xab
>  [] ? rtnetlink_rcv+0x0/0x2d
>  [] netlink_kernel_create+0x74/0x19d
>  [] ? __mutex_lock_common+0x339/0x35b
>  [] rtnetlink_net_init+0x2e/0x48
>  [] ops_init+0xe9/0xff
>  [] register_pernet_operations+0xab/0x130
>  [] register_pernet_subsys+0x2e/0x47
>  [] rtnetlink_init+0x53/0x102
>  [] netlink_proto_init+0x126/0x143
>  [] ? netlink_proto_init+0x0/0x143
>  [] do_one_initcall+0x72/0x186
>  [] kernel_init+0x23b/0x2c9
>  [] kernel_thread_helper+0x4/0x10
>  [] ? restore_args+0x0/0x30
>  [] ? kernel_init+0x0/0x2c9
>  [] ? kernel_thread_helper+0x0/0x10

The sock_update_classid() function calls task_cls_classid(current),
but the calling task cannot go away, so there is no danger of
the associated structures disappearing.  Insert an RCU read-side
critical section to suppress the false positive.

Reported-by: Subrata Modak 
Signed-off-by: Paul E. McKenney

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

2010-09-27T08:03:03+00:00

Conflicts:
	drivers/net/qlcnic/qlcnic_init.c
	net/ipv4/ip_output.c

net: fix a lockdep splat

2010-09-25T05:26:10+00:00

We have for each socket :

One spinlock (sk_slock.slock)
One rwlock (sk_callback_lock)

Possible scenarios are :

(A) (this is used in net/sunrpc/xprtsock.c)
read_lock(&sk->sk_callback_lock) (without blocking BH)

spin_lock(&sk->sk_slock.slock);
...
read_lock(&sk->sk_callback_lock);
...

(B)
write_lock_bh(&sk->sk_callback_lock)
stuff
write_unlock_bh(&sk->sk_callback_lock)

(C)
spin_lock_bh(&sk->sk_slock)
...
write_lock_bh(&sk->sk_callback_lock)
stuff
write_unlock_bh(&sk->sk_callback_lock)
spin_unlock_bh(&sk->sk_slock)

This (C) case conflicts with (A) :

CPU1 [A]                         CPU2 [C]
read_lock(callback_lock)
                             spin_lock_bh(slock)

                                 

We have one problematic (C) use case in inet_csk_listen_stop() :

local_bh_disable();
bh_lock_sock(child); // spin_lock_bh(&sk->sk_slock)
WARN_ON(sock_owned_by_user(child));
...
sock_orphan(child); // write_lock_bh(&sk->sk_callback_lock)

lockdep is not happy with this, as reported by Tetsuo Handa

It seems only way to deal with this is to use read_lock_bh(callbacklock)
everywhere.

Thanks to Jarek for pointing a bug in my first attempt and suggesting
this solution.

Reported-by: Tetsuo Handa 
Tested-by: Tetsuo Handa 
Signed-off-by: Eric Dumazet 
CC: Jarek Poplawski 
Tested-by: Eric Dumazet 
Signed-off-by: David S. Miller

net/core: add lock context change annotations in net/core/sock.c

2010-09-09T22:02:39+00:00

__lock_sock() and __release_sock() releases and regrabs lock but
were missing proper annotations. Add it. This removes following
warning from sparse. (Currently __lock_sock() does not emit any
warning about it but I think it is better to add also.)

 net/core/sock.c:1580:17: warning: context imbalance in '__release_sock' - unexpected unlock

Signed-off-by: Namhyung Kim 
Signed-off-by: David S. Miller

net: this_cpu_xxx conversions

2010-07-19T22:12:51+00:00

Use modern this_cpu_xxx() api, saving few bytes on x86

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

net: sock_free() optimizations

2010-07-13T03:21:46+00:00

Avoid two extra instructions in sock_free(), to reload
skb->truesize and skb->sk

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