linux-toradex.git/include/net/sock.h, branch v2.6.37.2

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

filter: fix sk_filter rcu handling

2010-12-06T17:29:43+00:00

Pavel Emelyanov tried to fix a race between sk_filter_(de|at)tach and
sk_clone() in commit 47e958eac280c263397

Problem is we can have several clones sharing a common sk_filter, and
these clones might want to sk_filter_attach() their own filters at the
same time, and can overwrite old_filter->rcu, corrupting RCU queues.

We can not use filter->rcu without being sure no other thread could do
the same thing.

Switch code to a more conventional ref-counting technique : Do the
atomic decrement immediately and queue one rcu call back when last
reference is released.

Signed-off-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

net: update SOCK_MIN_RCVBUF

2010-09-27T01:53:07+00:00

SOCK_MIN_RCVBUF current value is 256 bytes

It doesnt permit to receive the smallest possible frame, considering
socket sk_rmem_alloc/sk_rcvbuf account skb truesizes. On 64bit arches,
sizeof(struct sk_buff) is 240 bytes. Add the typical 64 bytes of
headroom, and we go over the limit.

With old kernels and 32bit arches, we were under the limit, if netdriver
was doing copybreak.

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-09-10T05:27:33+00:00

Conflicts:
	net/mac80211/main.c

udp: add rehash on connect()

2010-09-09T04:45:01+00:00

commit 30fff923 introduced in linux-2.6.33 (udp: bind() optimisation)
added a secondary hash on UDP, hashed on (local addr, local port).

Problem is that following sequence :

fd = socket(...)
connect(fd, &remote, ...)

not only selects remote end point (address and port), but also sets
local address, while UDP stack stored in secondary hash table the socket
while its local address was INADDR_ANY (or ipv6 equivalent)

Sequence is :
 - autobind() : choose a random local port, insert socket in hash tables
              [while local address is INADDR_ANY]
 - connect() : set remote address and port, change local address to IP
              given by a route lookup.

When an incoming UDP frame comes, if more than 10 sockets are found in
primary hash table, we switch to secondary table, and fail to find
socket because its local address changed.

One solution to this problem is to rehash datagram socket if needed.

We add a new rehash(struct socket *) method in "struct proto", and
implement this method for UDP v4 & v6, using a common helper.

This rehashing only takes care of secondary hash table, since primary
hash (based on local port only) is not changed.

Reported-by: Krzysztof Piotr Oledzki 
Signed-off-by: Eric Dumazet 
Tested-by: Krzysztof Piotr Oledzki 
Signed-off-by: David S. Miller

net: simplify flags for tx timestamping

2010-08-19T07:08:30+00:00

This patch removes the abstraction introduced by the union skb_shared_tx in
the shared skb data.

The access of the different union elements at several places led to some
confusion about accessing the shared tx_flags e.g. in skb_orphan_try().

    http://marc.info/?l=linux-netdev&m=128084897415886&w=2

Signed-off-by: Oliver Hartkopp 
Signed-off-by: David S. Miller

net/sock.h: add missing kernel-doc notation

2010-08-10T07:09:20+00:00

Add missing kernel-doc notation to struct sock:

Warning(include/net/sock.h:324): No description found for parameter 'sk_peer_pid'
Warning(include/net/sock.h:324): No description found for parameter 'sk_peer_cred'
Warning(include/net/sock.h:324): No description found for parameter 'sk_classid'
Warning(include/net/sock.h:324): Excess struct/union/enum/typedef member 'sk_peercred' description in 'sock'

Signed-off-by: Randy Dunlap 
Signed-off-by: David S. Miller

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

2010-07-21T01:25:24+00:00

Conflicts:
	drivers/vhost/net.c
	net/bridge/br_device.c

Fix merge conflict in drivers/vhost/net.c with guidance from
Stephen Rothwell.

Revert the effects of net-2.6 commit 573201f36fd9c7c6d5218cdcd9948cee700b277d
since net-next-2.6 has fixes that make bridge netpoll work properly thus
we don't need it disabled.

Signed-off-by: David S. Miller