2023-06-20 09:59:21

by Abel Wu

Subject: [PATCH net-next v2] 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 <[email protected]>
---
net/ipv4/inet_connection_sock.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 65ad4251f6fd..22f7b3aaff3c 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);

--
2.37.3

2023-06-22 06:24:25

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net-next v2] inet: Cleanup on charging memory for newly accepted sockets

Hello:

This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <[email protected]>:

On Tue, 20 Jun 2023 17:27:11 +0800 you wrote:
> If there is no net-memcg associated with the sock, don't bother
> calculating its memory usage for charge.
>
> Signed-off-by: Abel Wu <[email protected]>
> ---
> net/ipv4/inet_connection_sock.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)

Here is the summary with links:
- [net-next,v2] inet: Cleanup on charging memory for newly accepted sockets
https://git.kernel.org/netdev/net-next/c/53bf91641ae1

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html