linux-stable.git/net/core/sock.c, branch v3.3

netprio_cgroup: fix wrong memory access when NETPRIO_CGROUP=m

2012-02-10T20:08:57+00:00

When the netprio_cgroup module is not loaded, net_prio_subsys_id
is -1, and so sock_update_prioidx() accesses cgroup_subsys array
with negative index subsys[-1].

Make the code resembles cls_cgroup code, which is bug free.

Origionally-authored-by: Li Zefan 
Signed-off-by: Li Zefan 
Signed-off-by: Neil Horman 
CC: "David S. Miller" 
Signed-off-by: David S. Miller

net: introduce res_counter_charge_nofail() for socket allocations

2012-01-22T20:08:46+00:00

There is a case in __sk_mem_schedule(), where an allocation
is beyond the maximum, but yet we are allowed to proceed.
It happens under the following condition:

	sk->sk_wmem_queued + size >= sk->sk_sndbuf

The network code won't revert the allocation in this case,
meaning that at some point later it'll try to do it. Since
this is never communicated to the underlying res_counter
code, there is an inbalance in res_counter uncharge operation.

I see two ways of fixing this:

1) storing the information about those allocations somewhere
   in memcg, and then deducting from that first, before
   we start draining the res_counter,
2) providing a slightly different allocation function for
   the res_counter, that matches the original behavior of
   the network code more closely.

I decided to go for #2 here, believing it to be more elegant,
since #1 would require us to do basically that, but in a more
obscure way.

Signed-off-by: Glauber Costa 
Cc: KAMEZAWA Hiroyuki 
Cc: Johannes Weiner 
Cc: Michal Hocko 
CC: Tejun Heo 
CC: Li Zefan 
CC: Laurent Chavey 
Acked-by: Tejun Heo 
Signed-off-by: David S. Miller

net: Fix build with INET disabled.

2012-01-09T21:44:23+00:00

> net/core/sock.c: In function 'sk_update_clone':
> net/core/sock.c:1278:3: error: implicit declaration of function 'sock_update_memcg'

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

net: sk_update_clone is only used in net/core/sock.c

2012-01-09T07:44:26+00:00

so move it there.  Fixes build errors when CONFIG_INET is not defined:

In file included from include/linux/tcp.h:211:0,
                 from include/linux/ipv6.h:221,
                 from include/net/ipv6.h:16,
                 from include/linux/sunrpc/clnt.h:26,
                 from include/linux/nfs_fs.h:50,
                 from init/do_mounts.c:20:
include/net/sock.h: In function 'sk_update_clone':
include/net/sock.h:1109:3: error: implicit declaration of function 'sock_update_memcg' [-Werror=implicit-function-declaration]

Signed-off-by: Stephen Rothwell 
Signed-off-by: David S. Miller

net: fix sock_clone reference mismatch with tcp memcontrol

2012-01-07T18:16:34+00:00

Sockets can also be created through sock_clone. Because it copies
all data in the sock structure, it also copies the memcg-related pointer,
and all should be fine. However, since we now use reference counts in
socket creation, we are left with some sockets that have no reference
counts. It matters when we destroy them, since it leads to a mismatch.

Signed-off-by: Glauber Costa 
CC: David S. Miller 
CC: Greg Thelen 
CC: Hiroyouki Kamezawa 
CC: Laurent Chavey 
Signed-off-by: David S. Miller

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

2011-12-23T22:13:56+00:00

Conflicts:
	net/bluetooth/l2cap_core.c

Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.

Signed-off-by: David S. Miller

net: relax rcvbuf limits

2011-12-23T07:15:14+00:00

skb->truesize might be big even for a small packet.

Its even bigger after commit 87fb4b7b533 (net: more accurate skb
truesize) and big MTU.

We should allow queueing at least one packet per receiver, even with a
low RCVBUF setting.

Reported-by: Michal Simek 
Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

net: fix sleeping while atomic problem in sock mem_cgroup.

2011-12-16T20:35:17+00:00

We can't scan the proto_list to initialize sock cgroups, as it
holds a rwlock, and we also want to keep the code generic enough to
avoid calling the initialization functions of protocols directly,

Convert proto_list_lock into a mutex, so we can sleep and do the
necessary allocations. This lock is seldom taken, so there shouldn't
be any performance penalties associated with that

Signed-off-by: Glauber Costa 
CC: Hiroyouki Kamezawa 
CC: David S. Miller 
CC: Eric Dumazet 
CC: Stephen Rothwell 
CC: Randy Dunlap 
Signed-off-by: David S. Miller

tcp memory pressure controls

2011-12-13T00:04:10+00:00

This patch introduces memory pressure controls for the tcp
protocol. It uses the generic socket memory pressure code
introduced in earlier patches, and fills in the
necessary data in cg_proto struct.

Signed-off-by: Glauber Costa 
Reviewed-by: KAMEZAWA Hiroyuki 
CC: Eric W. Biederman 
Signed-off-by: David S. Miller

socket: initial cgroup code.

2011-12-13T00:04:10+00:00

The goal of this work is to move the memory pressure tcp
controls to a cgroup, instead of just relying on global
conditions.

To avoid excessive overhead in the network fast paths,
the code that accounts allocated memory to a cgroup is
hidden inside a static_branch(). This branch is patched out
until the first non-root cgroup is created. So when nobody
is using cgroups, even if it is mounted, no significant performance
penalty should be seen.

This patch handles the generic part of the code, and has nothing
tcp-specific.

Signed-off-by: Glauber Costa 
Reviewed-by: KAMEZAWA Hiroyuki 
CC: Kirill A. Shutemov 
CC: David S. Miller 
CC: Eric W. Biederman 
CC: Eric Dumazet 
Signed-off-by: David S. Miller