diff options
| author |   Abel Wu <wuyun.abel@bytedance.com> | 2023-06-20 17:27:11 +0800 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2023-06-21 17:37:42 -0700 |
| commit | 53bf91641ae19fe51fb24422de6d07565a3536d0 (patch) | |
| tree | 4d0e57f20af9d98ec27e8629fa88105b02d26fe6 /net/ipv4/inet_connection_sock.c | |
| parent | selftests: tc-testing: add one test for flushing explicitly created chain (diff) | |
| download | wireguard-linux-53bf91641ae19fe51fb24422de6d07565a3536d0.tar.xz wireguard-linux-53bf91641ae19fe51fb24422de6d07565a3536d0.zip | |
inet: Cleanup on charging memory for newly accepted sockets
If there is no net-memcg associated with the sock, don't bother
calculating its memory usage for charge.
Signed-off-by: Abel Wu <wuyun.abel@bytedance.com>
Link: https://lore.kernel.org/r/20230620092712.16217-1-wuyun.abel@bytedance.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv4/inet_connection_sock.c')
| -rw-r--r-- | net/ipv4/inet_connection_sock.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 15424dec4584..0cc19cfbb673 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -706,20 +706,23 @@ struct sock *inet_csk_accept(struct sock *sk, int flags, int *err, bool kern) out: release_sock(sk); if (newsk && mem_cgroup_sockets_enabled) { - int amt; + int amt = 0; /* atomically get the memory usage, set and charge the * newsk->sk_memcg. */ lock_sock(newsk); - /* The socket has not been accepted yet, no need to look at - * newsk->sk_wmem_queued. - */ - amt = sk_mem_pages(newsk->sk_forward_alloc + - atomic_read(&newsk->sk_rmem_alloc)); mem_cgroup_sk_alloc(newsk); - if (newsk->sk_memcg && amt) + if (newsk->sk_memcg) { + /* The socket has not been accepted yet, no need + * to look at newsk->sk_wmem_queued. + */ + amt = sk_mem_pages(newsk->sk_forward_alloc + + atomic_read(&newsk->sk_rmem_alloc)); + } + + if (amt) mem_cgroup_charge_skmem(newsk->sk_memcg, amt, GFP_KERNEL | __GFP_NOFAIL); |