xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: tcp_memcontrol: protect all tcp_memcontrol calls by jump-label

Browse Source 
Move the jump-label from sock_update_memcg() and sock_release_memcg() to
the callsite, and so eliminate those function calls when socket
accounting is not enabled.

This also eliminates the need for dummy functions because the calls will
be optimized away if the Kconfig options are not enabled.

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: David S. Miller <davem@davemloft.net>
Reviewed-by: Vladimir Davydov <vdavydov@virtuozzo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Johannes Weiner
2016-01-14 15:21:05 -08:00
committed by Linus Torvalds
parent 931f3f4beb
commit 3d596f7b90
5 changed files with 33 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv4/tcp_ipv4.c
View File

@@ -1818,7 +1818,9 @@ void tcp_v4_destroy_sock(struct sock *sk)
tcp_saved_syn_free(tp);
sk_sockets_allocated_dec(sk);
sock_release_memcg(sk);
if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
sock_release_memcg(sk);
}
EXPORT_SYMBOL(tcp_v4_destroy_sock);