From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87A0120EB for ; Wed, 3 Sep 2025 19:02:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756926164; cv=none; b=Z9NNvCJ3V39cK69b8/alL/uiFNMT2ACfJKZz/LM8PWCQCWo5Cv6T+XvAz82UepfR12l0gFzANKqqJhP/iPOGr1x0x+gamA7kFtj8qbN4xAhbMpVesz7UNqugvNvZOdPUzNDRmAG9G+slpZHrPfS6VFLH9v2ALoa96CQsHbSYHaI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756926164; c=relaxed/simple; bh=7D7bMi8SSZYNWcJKyOwJUyeDl/e9zbUO3SKA2T9Bpnk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=s/c8FFOKaoiJa0ScSXpB26koZEPDn+mWVlZyp7tg2yYNyhvltm3xN+QBOoRMZ22VVYybVT0cv6XOr8rTaLx8z9cvLza9Eh8ijuyTYHjAXfQ5YX9pnKXwqgvroJR/MrqXIhDGRVvPfDjd9WfJy5qMA2F19Y0MZwUjCgbK+JMvZzE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--kuniyu.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=opNKHDMG; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--kuniyu.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="opNKHDMG" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-324e41e946eso213854a91.0 for ; Wed, 03 Sep 2025 12:02:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756926163; x=1757530963; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=+NfU6GKTz93dEkYl4pL3zEIP00thpC/peM3VLRO6Xus=; b=opNKHDMGfosc0OWOetjTcStOGcSppgxky2DmFONrUUi78W7pShC9HCkSGgiWMJ1Qlo rSUtrueYlyxfAyZjHdAohxGKaj8F/MVaw8YPcE2Q3cf0IVKFZZ4BaxCfDHXtJ/CsMD5c KjgjmusHthceLLuUgx2k1YyT3fLHvKZL9orhxerwssRmh72hl/P73C29dM6n116Ke7s9 DU/3jSgFl+VSSljyjTd+JbIpPzGHccUErjVejfvJppPz5QCkSxZz89qKX5uEy/v0+gg0 hGzauFaicFZG+1CSRk6RJ0MnJ5FmXYhWduItDcZvzBRRPDm6+AayDwULV3SCOdj6VBuN aXlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756926163; x=1757530963; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+NfU6GKTz93dEkYl4pL3zEIP00thpC/peM3VLRO6Xus=; b=sDY33taM4HOC3QcWmbQo17mUeJ0etQIbsr5Nd9L0gJ7ADE2BPxlrfZtZyZ2z6TOJmF zoKgMpwcpPE0rnK8/44o5CKsyFzwjo0+BqRnMf9K8Q+uyZlohK2bmVS6aNZpZblidHO5 ZwjaFHcrrkCYw7DkpR6+He0sAe7WfjyAZ2uS/BaW0ZX/p2uUJiB47Nkj2lm0ttl4MU7E RRKH2LgYa5XzHwdU6IO3FM+qlWgOL4lsbbT5wbEz6J8PkL/1fHyvLbPkjxnjnLzU4fkz RFvHWbdnIvGCA7OwIK1Wi2isZk7KO9OSz9xeJIukEPIsCbMxMOzp5gPFKx+Ko2D9i9b5 A20w== X-Forwarded-Encrypted: i=1; AJvYcCWGzcBdOxahQjkF+SxhE+AgR6G6SeWmdMlRORi1QcI69CVVxj4sKNdhVlU+x0UDFqNVjQk=@vger.kernel.org X-Gm-Message-State: AOJu0YwI8dQRv8n1mL0jO2mO28wH9dkGQfhb02f7wPxOSOMA8yOTMQDd k4rMla/+OqwL6hEQyJH+RHF5j0zmwxb8GXskGDcJS/nliFjWbD1HAYjg3Wvkk2K3l4kAUhDcBGp LSw9PhA== X-Google-Smtp-Source: AGHT+IGfYahHkjh0geWywJoGTcwXYKTJi4HfLIpSfqfr+0Kw2gtf6nzSUDWzSQJ2vf4ta8HqTcx5uqBo5Pc= X-Received: from pjex8.prod.google.com ([2002:a17:90a:1648:b0:329:6ac4:ea2e]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:38c5:b0:327:e34e:eb16 with SMTP id 98e67ed59e1d1-32815412a34mr19304111a91.1.1756926162896; Wed, 03 Sep 2025 12:02:42 -0700 (PDT) Date: Wed, 3 Sep 2025 19:02:00 +0000 In-Reply-To: <20250903190238.2511885-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250903190238.2511885-1-kuniyu@google.com> X-Mailer: git-send-email 2.51.0.338.gd7d06c2dae-goog Message-ID: <20250903190238.2511885-2-kuniyu@google.com> Subject: [PATCH v5 bpf-next/net 1/5] tcp: Save lock_sock() for memcg in inet_csk_accept(). From: Kuniyuki Iwashima To: Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Martin KaFai Lau Cc: John Fastabend , Stanislav Fomichev , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Neal Cardwell , Willem de Bruijn , Mina Almasry , Kuniyuki Iwashima , Kuniyuki Iwashima , bpf@vger.kernel.org, netdev@vger.kernel.org Content-Type: text/plain; charset="UTF-8" If memcg is enabled, accept() acquires lock_sock() twice for each new TCP/MPTCP socket in inet_csk_accept() and __inet_accept(). Let's move memcg operations from inet_csk_accept() to __inet_accept(). Note that SCTP somehow allocates a new socket by sk_alloc() in sk->sk_prot->accept() and clones fields manually, instead of using sk_clone_lock(). mem_cgroup_sk_alloc() is called for SCTP before __inet_accept(), so I added the protocol check in __inet_accept(), but this can be removed once SCTP uses sk_clone_lock(). Signed-off-by: Kuniyuki Iwashima Reviewed-by: Shakeel Butt --- v3: Don't split if blocks --- net/ipv4/af_inet.c | 23 +++++++++++++++++++++++ net/ipv4/inet_connection_sock.c | 25 ------------------------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 76e38092cd8a..d42757f74c6e 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -753,6 +753,29 @@ EXPORT_SYMBOL(inet_stream_connect); void __inet_accept(struct socket *sock, struct socket *newsock, struct sock *newsk) { + /* TODO: use sk_clone_lock() in SCTP and remove protocol checks */ + if (mem_cgroup_sockets_enabled && + (!IS_ENABLED(CONFIG_IP_SCTP) || + sk_is_tcp(newsk) || sk_is_mptcp(newsk))) { + gfp_t gfp = GFP_KERNEL | __GFP_NOFAIL; + + mem_cgroup_sk_alloc(newsk); + + if (mem_cgroup_from_sk(newsk)) { + int amt; + + /* 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_sk_charge(newsk, amt, gfp); + } + + kmem_cache_charge(newsk, gfp); + } + sock_rps_record_flow(newsk); WARN_ON(!((1 << newsk->sk_state) & (TCPF_ESTABLISHED | TCPF_SYN_RECV | diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 0ef1eacd539d..ed10b959a906 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -708,31 +708,6 @@ struct sock *inet_csk_accept(struct sock *sk, struct proto_accept_arg *arg) release_sock(sk); - if (mem_cgroup_sockets_enabled) { - gfp_t gfp = GFP_KERNEL | __GFP_NOFAIL; - int amt = 0; - - /* atomically get the memory usage, set and charge the - * newsk->sk_memcg. - */ - lock_sock(newsk); - - mem_cgroup_sk_alloc(newsk); - if (mem_cgroup_from_sk(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)); - } - - if (amt) - mem_cgroup_sk_charge(newsk, amt, gfp); - kmem_cache_charge(newsk, gfp); - - release_sock(newsk); - } - if (req) reqsk_put(req); -- 2.51.0.338.gd7d06c2dae-goog