From nobody Sun Feb 8 08:21:40 2026 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 4F34E2FE599 for ; Tue, 12 Aug 2025 17:58:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021539; cv=none; b=s1jAxu9USjyUkyuCgo/9JJUk2FSEV0ZZQcLCzcZkEEySAVCC/WCZVtbCAGFJ9lUp8H/ZuQ5/aLikzWxDYJJjmeI78DbDDdE3AuOtycrJO2225e5sgieOHkLrGPrS8B2aOUiB0yX45CkFxYKJtRWp3D+IRinmeFpQMFHvM5qlsNI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021539; c=relaxed/simple; bh=q6y1Mod3BWMdsGSHg0SEmtds3ikTNBJyifvdqgX0uCo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=RkR8cDjkt80e/tGwp73c5M1jB1BY4iTRA4NKzV1bJsS2EajmEe04XK+IGV4NHZA4QGMRZjC/FoXoc3OAVrCRn3P99PTHw85Wz4Bxaxu6tEi8tegd2dARhQKQuqK6y8+mAXJxRnhakfYnZevK7m7n/eTAE+6pHsrjDsr/UHF+Jj0= 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=aOoM7l99; arc=none smtp.client-ip=209.85.216.73 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="aOoM7l99" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-31f030b1cb9so9593484a91.2 for ; Tue, 12 Aug 2025 10:58:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755021536; x=1755626336; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=5967b+D6n+JBP35k0TPK9w7l1JYggqKd+S8TzhqKYXE=; b=aOoM7l99ufXs13RhzBnMZkXpUtCkGS9/m7K3Pv7ntzEwIRaKFlNCuSECDGRo1ZQTgh 6VWAaU5OoX2QcdpKkbuw/g2OGBSqdns9dyU1wUOUaQJITrhupL0NebMmFb8ECLaOFhbm pAoAup9DN7Sh1k8vkNjHy40j/8a4JBjkQckrdoHe1C+EnJf1mCa79vveV5/F+SvEfGPe pV0Vnpv3gL5WiB1QEpZmzx55+g/xkA2GJ6HXiMeWmODu9EQARinW3z36kj9IP9W3NtNy AoXmTGsBoCLJs75P/M3KBs/yzfFDnt+Ln8bvYelPTG3twvQD5uVfOjsuFSdrhtR1RBb8 +DnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755021536; x=1755626336; 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=5967b+D6n+JBP35k0TPK9w7l1JYggqKd+S8TzhqKYXE=; b=FxoHpf8xk95iDk9MGCFhEW4wVELSC3qL2BSoF4zfyiWR43SwffmKRP194qW7wDmbHQ x1gbVMxyg33h2nWMyxETDTGZ9FgYPppI5bmakEhzBkWcEnCVCNlc+cOkN+JAmbzo05kd M+h7liBWxuM4yZZ55it2RwEleJUTpuWWsYrCeGSIFRGq6PPTzks1UK2lZgAIMh6GxILX ea3tRoygdVRI6GKLG0abPq7DChtFSpj8J/4zDTckQr8XLc4tG/ke/ZBLjQc4t6MPMwQ7 xEgidANDrZaETATkcuso0i5axg2AU94nUzqPSGhh1I6Afd++/+gAiGtA60QZu00G37Wx qTEw== X-Forwarded-Encrypted: i=1; AJvYcCXvvBQGlwrtJLXI/8VtPMz6YvUiRtJWndk6W6XNAvEtybMatXPKh63ZssfJebDEzftc6ssypw==@lists.linux.dev X-Gm-Message-State: AOJu0Yxn4MCAeEnDvaVKQb+22dpuy/EnDzGa1+lb2cY7Vn4MReacSodk eAIlf04yIjPU4qQLaNYPhRQtMxZt2vNDn/mUXnFtcEX2PICfPOuHSRArhQRRva90hs9YELCE7Qk LqI0xlw== X-Google-Smtp-Source: AGHT+IEHywGL60FQFSS0J0vulVLgaUAf9Fyk68Q4f3QM+UdkI4p7EfgIk7dpwlIPEPt8UyX87u+Sce3emJ0= X-Received: from pjbqb13.prod.google.com ([2002:a17:90b:280d:b0:31c:160d:e3be]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:de85:b0:31e:94d2:c36f with SMTP id 98e67ed59e1d1-321cf94cc50mr651519a91.8.1755021536592; Tue, 12 Aug 2025 10:58:56 -0700 (PDT) Date: Tue, 12 Aug 2025 17:58:19 +0000 In-Reply-To: <20250812175848.512446-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250812175848.512446-1-kuniyu@google.com> X-Mailer: git-send-email 2.51.0.rc0.205.g4a044479a3-goog Message-ID: <20250812175848.512446-2-kuniyu@google.com> Subject: [PATCH v3 net-next 01/12] mptcp: Fix up subflow's memcg when CONFIG_SOCK_CGROUP_DATA=n. From: Kuniyuki Iwashima To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Neal Cardwell , Paolo Abeni , Willem de Bruijn , Matthieu Baerts , Mat Martineau , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Andrew Morton , "=?UTF-8?q?Michal=20Koutn=C3=BD?=" , Tejun Heo Cc: Simon Horman , Geliang Tang , Muchun Song , Mina Almasry , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org, mptcp@lists.linux.dev, cgroups@vger.kernel.org, linux-mm@kvack.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When sk_alloc() allocates a socket, mem_cgroup_sk_alloc() sets sk->sk_memcg based on the current task. MPTCP subflow socket creation is triggered from userspace or an in-kernel worker. In the latter case, sk->sk_memcg is not what we want. So, we fix it up from the parent socket's sk->sk_memcg in mptcp_attach_cgroup(). Although the code is placed under #ifdef CONFIG_MEMCG, it is buried under #ifdef CONFIG_SOCK_CGROUP_DATA. The two configs are orthogonal. If CONFIG_MEMCG is enabled without CONFIG_SOCK_CGROUP_DATA, the subflow's memory usage is not charged correctly. Let's move the code out of the wrong ifdef guard. Note that sk->sk_memcg is freed in sk_prot_free() and the parent sk holds the refcnt of memcg->css here, so we don't need to use css_tryget(). Fixes: 3764b0c5651e3 ("mptcp: attach subflow socket to parent cgroup") Signed-off-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet Acked-by: Matthieu Baerts (NGI0) --- include/linux/memcontrol.h | 6 ++++++ mm/memcontrol.c | 10 ++++++++++ net/mptcp/subflow.c | 11 +++-------- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 785173aa0739..25921fbec685 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1604,6 +1604,7 @@ extern struct static_key_false memcg_sockets_enabled_= key; #define mem_cgroup_sockets_enabled static_branch_unlikely(&memcg_sockets_e= nabled_key) void mem_cgroup_sk_alloc(struct sock *sk); void mem_cgroup_sk_free(struct sock *sk); +void mem_cgroup_sk_inherit(const struct sock *sk, struct sock *newsk); =20 #if BITS_PER_LONG < 64 static inline void mem_cgroup_set_socket_pressure(struct mem_cgroup *memcg) @@ -1661,6 +1662,11 @@ void reparent_shrinker_deferred(struct mem_cgroup *m= emcg); #define mem_cgroup_sockets_enabled 0 static inline void mem_cgroup_sk_alloc(struct sock *sk) { }; static inline void mem_cgroup_sk_free(struct sock *sk) { }; + +static inline void mem_cgroup_sk_inherit(const struct sock *sk, struct soc= k *newsk) +{ +} + static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *mem= cg) { return false; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 8dd7fbed5a94..08c6e06750ac 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5024,6 +5024,16 @@ void mem_cgroup_sk_free(struct sock *sk) css_put(&sk->sk_memcg->css); } =20 +void mem_cgroup_sk_inherit(const struct sock *sk, struct sock *newsk) +{ + if (sk->sk_memcg =3D=3D newsk->sk_memcg) + return; + + mem_cgroup_sk_free(newsk); + css_get(&sk->sk_memcg->css); + newsk->sk_memcg =3D sk->sk_memcg; +} + /** * mem_cgroup_charge_skmem - charge socket memory * @memcg: memcg to charge diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 3f1b62a9fe88..6fb635a95baf 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1717,19 +1717,14 @@ static void mptcp_attach_cgroup(struct sock *parent= , struct sock *child) /* only the additional subflows created by kworkers have to be modified */ if (cgroup_id(sock_cgroup_ptr(parent_skcd)) !=3D cgroup_id(sock_cgroup_ptr(child_skcd))) { -#ifdef CONFIG_MEMCG - struct mem_cgroup *memcg =3D parent->sk_memcg; - - mem_cgroup_sk_free(child); - if (memcg && css_tryget(&memcg->css)) - child->sk_memcg =3D memcg; -#endif /* CONFIG_MEMCG */ - cgroup_sk_free(child_skcd); *child_skcd =3D *parent_skcd; cgroup_sk_clone(child_skcd); } #endif /* CONFIG_SOCK_CGROUP_DATA */ + + if (mem_cgroup_sockets_enabled && parent->sk_memcg) + mem_cgroup_sk_inherit(parent, child); } =20 static void mptcp_subflow_ops_override(struct sock *ssk) --=20 2.51.0.rc0.205.g4a044479a3-goog From nobody Sun Feb 8 08:21:40 2026 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 D3F8D2FF140 for ; Tue, 12 Aug 2025 17:58:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021541; cv=none; b=l8PdycYFrePZOoySvO5EvtF+h74UQbrcd13wVhiVsP6ATbZuzjGkDL1mTIZiBSqwzjjB+h38OzT6SWGnXEvGShWieVBO8C4rXbJ8Q/D3fTavSbk5kvWZX4tl5bfo+Q2XGDx+eW04ULwtUZRvWljrk9YQhj2k4lECPfwvZjDDRfc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021541; c=relaxed/simple; bh=gUdtY93TVXd8U7THwQpainuRObH4njplELc5maxDEW8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=pl5vVNoLljaUOmoPxCoWeQAydcDoGoSJvNZNzD3TvC3SohT8PLAWMgweO//cCbxgy+838GaRPJiO8ROQm2R0h3yLAXUhP6fOxywq4IrzmRqGNm8WroR+LbDTt4/U6CNMigBvBbb+uKHbPLLWKTxgc9P9Wa05pWnM4yskL+Flrl8= 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=kSelYudz; arc=none smtp.client-ip=209.85.210.202 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="kSelYudz" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-76bf8e79828so10966342b3a.3 for ; Tue, 12 Aug 2025 10:58:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755021538; x=1755626338; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=nBs0EYqfbWl9UFV+H52iOxDMUVB4Qqo6amOw5/a/xOY=; b=kSelYudzuYmGdHgqM/LC57zkX90reQMdbmILUXGpgrFqB/ISCPYeFwb4mMio9dQpOF vCJXMb0Q9SlHQnzuAAkK36JnHLrNZy7raB8s8eDAqNC/ZikX81d+JNjNxfQ4A+8NkYdg Uoa0AH22xBowicrMwP+XWlsAFfXQjrcSkdfiW7LDzPOpBpuqrgpS/8QxyXSqo4A1WDtt kElf9+0myBMPxVV/2B3cI6aTXsBLVCjJ2hpqzGD0kWrzrJFrkCSFbcBYH4jqQYJqqH/G ZaHfqhZgdbX6B2ZrjCYGGH5zpJwxSMIr1gSNQsFiwL2sj6DAibUcUCQfI6CgZdMBBQNI cVtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755021538; x=1755626338; 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=nBs0EYqfbWl9UFV+H52iOxDMUVB4Qqo6amOw5/a/xOY=; b=DtRrIP9p+ZpI7lsmhUZy8YkfGU5Q/FaU6tncg03SdpNNA7LEBSnZaxpD/rF+DdmISG PAoH2CQ8TeMURm80GsS3T9riwTmVB2T7DA1/kbimhd/Qq++nviUNgY7QsBdxjgagYElZ 1m7Cs+6yMnug3/t+Gt5qNDnvivxqq4aYOGNLBkHNaGbpsCGxaXO5vpDt7bP7V5p6ef+X l0mT/tCRngwbaRfDcBoZDYnYz2O1QOumw0y0IHVgadU/CxqN9G+7y0EEER5poT91Qar2 cL0mxPmGF19+p6EDyIYEa0pel74UMVtwoY/KMZul6kiZ0jyPDScuoNYJmYiz0y5+tMWa QXcQ== X-Forwarded-Encrypted: i=1; AJvYcCVEJ1jw93ozWzH+D5fae/mKsA8GfkrxFTe30yUzLGhbLQEwAXjyvdcBMMf7uOLJW6CcW9pWRA==@lists.linux.dev X-Gm-Message-State: AOJu0YyZDNTqVNDNUva1nXEdAIrM+nyp01LQZsBzD5RPmLkJ7EOMMmtO EaQp9YEnxDKDDgjL6QIKBxqbjiMUrZwE5LNvgcYLfJX+uVVDQTOZ9IzJF5ywpElrytHDIVj64cF XDKZjkw== X-Google-Smtp-Source: AGHT+IFYsGjbaobi8vNz9wbDh44fnvU9qpjmhcBJj3ep2W5xNnuwjJPdvlexzH+8pKUpV2yp3JlpFVyM3a8= X-Received: from pfblu20.prod.google.com ([2002:a05:6a00:7494:b0:746:18ec:d11a]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:9985:b0:23d:d612:3dfa with SMTP id adf61e73a8af0-240a8bc1fe5mr267608637.40.1755021538144; Tue, 12 Aug 2025 10:58:58 -0700 (PDT) Date: Tue, 12 Aug 2025 17:58:20 +0000 In-Reply-To: <20250812175848.512446-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250812175848.512446-1-kuniyu@google.com> X-Mailer: git-send-email 2.51.0.rc0.205.g4a044479a3-goog Message-ID: <20250812175848.512446-3-kuniyu@google.com> Subject: [PATCH v3 net-next 02/12] mptcp: Use tcp_under_memory_pressure() in mptcp_epollin_ready(). From: Kuniyuki Iwashima To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Neal Cardwell , Paolo Abeni , Willem de Bruijn , Matthieu Baerts , Mat Martineau , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Andrew Morton , "=?UTF-8?q?Michal=20Koutn=C3=BD?=" , Tejun Heo Cc: Simon Horman , Geliang Tang , Muchun Song , Mina Almasry , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org, mptcp@lists.linux.dev, cgroups@vger.kernel.org, linux-mm@kvack.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some conditions used in mptcp_epollin_ready() are the same as tcp_under_memory_pressure(). We will modify tcp_under_memory_pressure() in the later patch. Let's use tcp_under_memory_pressure() instead. Signed-off-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet Reviewed-by: Matthieu Baerts (NGI0) --- net/mptcp/protocol.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index b15d7fab5c4b..a1787a1344ac 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -788,9 +788,7 @@ static inline bool mptcp_epollin_ready(const struct soc= k *sk) * as it can always coalesce them */ return (data_avail >=3D sk->sk_rcvlowat) || - (mem_cgroup_sockets_enabled && sk->sk_memcg && - mem_cgroup_under_socket_pressure(sk->sk_memcg)) || - READ_ONCE(tcp_memory_pressure); + tcp_under_memory_pressure(sk); } =20 int mptcp_set_rcvlowat(struct sock *sk, int val); --=20 2.51.0.rc0.205.g4a044479a3-goog From nobody Sun Feb 8 08:21:40 2026 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (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 848DD2FF14F for ; Tue, 12 Aug 2025 17:59:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021541; cv=none; b=n1PkYaASBuxOcu91JYSIFPFgE3GbhADKBZyx5TibWE1xAtAgi51zyTjgdTm+K30joITEepeQqKMe7fspOTFosEYkV8VAOO4UZVIuwzpTVpg3y8tZMJGOWqwElRVGtqcvYN+lM8IWiq3evSDW/tYe8KlHJStqcin/RtxedBSY4ww= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021541; c=relaxed/simple; bh=xhnYwO7GL1+CtMhfwDFOhfD57z1pVtgWyVGZ0fjlUoI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=C7A6Vk+q127rqsac7YJ/4lkHX2KXkl4xi/Vb7iHOo0x18xytz74xBNTLGjeQikPz4Vzw8L0rO5IxrLFDLQuqYjiHfOWRIy5MucJtT0sT2GHE8l4zU9lVjyaGjelPgkrWeRLqpxuyeKslFiYEqi+/monVEzEhZDGQG3mzpKQJ7k8= 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=GuvzjAUJ; arc=none smtp.client-ip=209.85.210.201 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="GuvzjAUJ" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-76bcd829ff1so5473253b3a.1 for ; Tue, 12 Aug 2025 10:59:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755021540; x=1755626340; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=B5rCQpTg40XvAN0nRmC8PJTXTHlgnacsK7xSr02TOwk=; b=GuvzjAUJFb1P5twyf/0FT5HN5HN4Kgv385x+NNXuseIgUCXHtRfUG3sJIcOzNQLA5+ dGaDLxKaLza5VtP4y83mb0QQsZbsQP5HsOlSvxi9Nidx41HsXJ3zRxebg4d15gT197fY W1V/KJGxSTc2wG0pryEEvQW9EDaiu4m3Aig8yycLjW9OsYGD4Ji9h+q0sjls3KGFqo3i uiLZzEI2eF8PLyHJR2ltmd+EzmpYXjWSvzv2D1ZH4p0RKK7UYo7m07SpWZVL9DjVoETd GY3rdGVWuWtK0rGBQ1fjD4cFy2tk9vZzGcBeTVJwBCTYjSn8B9B3GmT0DJhqXMw7hayz VbCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755021540; x=1755626340; 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=B5rCQpTg40XvAN0nRmC8PJTXTHlgnacsK7xSr02TOwk=; b=t30HVmRQu7Y0ShguHv4xRcPfqjuxmNjs6nLeDeQ4BYuy38QggeXouGUbqoCXyiOHWQ n/HWv8zblO0u5H7WPcpl93WYSCLT7UqWC18XoXtoQWM98xjxu6betMFQWfHz2qYBDSun Q3mUe19Hvqr+twWpk9eDjWa0dHEUHyxaOc8zuuEya7FyLu4j+fygCkQWfXV0z/ik+b6B Fb9iP6WTMIiw+v00au+QzCHwzvakJugZPqIHv30kKYuwIK7w/GpXGpACdjfPhJM7ukhD KbO1I3dT9nLaGhXOsKi67vm/yJpOXIxz7Q+lbW0SdGXgmoWwnFpae4jYdKEE9c2biyvW a6xg== X-Forwarded-Encrypted: i=1; AJvYcCWi8VTkWKOnWBgSv350ym3aNAfvc+wbqlPGyJiFKOyoEr/Ku+f8C8NokDOtoAhfdM7Svh43Zg==@lists.linux.dev X-Gm-Message-State: AOJu0YwfwBq/TeO/PwuMiihnYfnbgc4fyVAZGOFEygMbiWZA3gFxMGsc pd9Ax3LdPUTgagEiGqoA4yoBtdsRyVgPWAONUa5n8kPkedSA+KEH2p13AZSTjvzMq7AD+50FwLN W57H0cw== X-Google-Smtp-Source: AGHT+IFWOE5iaFIohAGKeh/7bkm49sAtcTJw3E8VuXd5fFWE4AD9T9o/O9JzYSwQSyIb+xne5Odsyex1rCE= X-Received: from plblh11.prod.google.com ([2002:a17:903:290b:b0:240:39eb:1e8c]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:440f:b0:240:127:85f1 with SMTP id d9443c01a7336-2430d0fc548mr1608415ad.18.1755021539728; Tue, 12 Aug 2025 10:58:59 -0700 (PDT) Date: Tue, 12 Aug 2025 17:58:21 +0000 In-Reply-To: <20250812175848.512446-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250812175848.512446-1-kuniyu@google.com> X-Mailer: git-send-email 2.51.0.rc0.205.g4a044479a3-goog Message-ID: <20250812175848.512446-4-kuniyu@google.com> Subject: [PATCH v3 net-next 03/12] tcp: Simplify error path in inet_csk_accept(). From: Kuniyuki Iwashima To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Neal Cardwell , Paolo Abeni , Willem de Bruijn , Matthieu Baerts , Mat Martineau , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Andrew Morton , "=?UTF-8?q?Michal=20Koutn=C3=BD?=" , Tejun Heo Cc: Simon Horman , Geliang Tang , Muchun Song , Mina Almasry , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org, mptcp@lists.linux.dev, cgroups@vger.kernel.org, linux-mm@kvack.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When an error occurs in inet_csk_accept(), what we should do is only call release_sock() and set the errno to arg->err. But the path jumps to another label, which introduces unnecessary initialisation and tests for newsk. Let's simplify the error path and remove the redundant NULL checks for newsk. Signed-off-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet --- net/ipv4/inet_connection_sock.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_soc= k.c index 1e2df51427fe..724bd9ed6cd4 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -706,9 +706,9 @@ struct sock *inet_csk_accept(struct sock *sk, struct pr= oto_accept_arg *arg) spin_unlock_bh(&queue->fastopenq.lock); } =20 -out: release_sock(sk); - if (newsk && mem_cgroup_sockets_enabled) { + + if (mem_cgroup_sockets_enabled) { gfp_t gfp =3D GFP_KERNEL | __GFP_NOFAIL; int amt =3D 0; =20 @@ -732,18 +732,17 @@ struct sock *inet_csk_accept(struct sock *sk, struct = proto_accept_arg *arg) =20 release_sock(newsk); } + if (req) reqsk_put(req); =20 - if (newsk) - inet_init_csk_locks(newsk); - + inet_init_csk_locks(newsk); return newsk; + out_err: - newsk =3D NULL; - req =3D NULL; + release_sock(sk); arg->err =3D error; - goto out; + return NULL; } EXPORT_SYMBOL(inet_csk_accept); =20 --=20 2.51.0.rc0.205.g4a044479a3-goog From nobody Sun Feb 8 08:21:40 2026 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (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 399432FF165 for ; Tue, 12 Aug 2025 17:59:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021543; cv=none; b=R4chdehmyP3xfD08rToDL2ywC4j4iTqMNflm8UR4a+mGSLCtmwcbeiz8Q+uvRtMIR+P06F4ujiJaomEkaI/RQLunp0q2Y63U5mit67b/z+6J6m8AK9/j0Qrv5hxS0qaxWGZkvjGRpn2QvNPOMggSV2NAUE6n1/Lvj4opGv/Dg1o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021543; c=relaxed/simple; bh=SLf5TpKyjI/drORtpadj8vr2WiPeiiJ9tj+Tj+3jSoI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=k0koEtQMmv2Dc/KGyfzOGEdoTxH4jw+hMpaHpmw3qF8DMvIwJboJmndG0/juvbRvO5Yy2/kgdL2SKemkYR4fbz7yhymnjKsfWBSBa0kBKdJpYRghTUSNI+VmO5Suvhmcv6kO1jJx4fkaJ6CFjHL27n6T14kDu3Jymo+k9L9/X9U= 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=ZbcpFF4G; arc=none smtp.client-ip=209.85.210.201 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="ZbcpFF4G" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-76bf7375f8dso5187168b3a.3 for ; Tue, 12 Aug 2025 10:59:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755021541; x=1755626341; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Uc3v5O63MgSThFhi2UQQb6roBFqZjuJWPv2BdHmfVp4=; b=ZbcpFF4GHHC9p+XTLyR/weDJe4r+K7EE+EF02Ufz1IgOVqG9U66jY4fbGakmxLrQle MIng0YIyR2W3j/fw9f3hXZVmQ97/k8rV+DRf4Z2uFWAU7iCGXv7Ql97ckuzXf+DpnYCI 4VEa/kdczYBQK8jIqzvVdaJRiPet/3sQgHWGRufzPGaZGYA00CfM6zRCDCZos+a0myMP TuGnw+2nv0mw8TeeowEGr4SfyKPLIle3qqJmt43n9ntEIlCTwKVX3DKQ4b15Q7gk93uA xnQT5UzqPC7KVkuhPBVatGk9Ug8D1rSkcUT+MzorH6M4uAX2ufj5pDAXh6qlb1wLW/rq EOAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755021541; x=1755626341; 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=Uc3v5O63MgSThFhi2UQQb6roBFqZjuJWPv2BdHmfVp4=; b=oCR/+G85vKMLbQGnEsA5+dgRO8OCtug4vy34Vp+XwOLygblrh0vv75LK0BTKTc/X/D ktnta5/Z7/lYZIXl02zpBZdvf7Nj/YXSJ1cailLycGIjcSTgQl5NE8OfoTqHPVxfR+Tg +astMo6odKdLD1feAzLoTfG0qGKwf1HF6KPpfVjeJPFTDkwfAp0pH+G0VySsBSrjg/rf EuhLAtcH4IM1Oh1zCr033XFHX+mQpRgjRYxLQ/tfeSNxOXibCO1A69P/yK/C/rl8Y7FS Hk5sYNoAv9dO4ENqlTVsBG8cbDK+zJwEItNnTaNfyN8EIg9BpQhG0wNWcbSjahvEBc1P ZhSg== X-Forwarded-Encrypted: i=1; AJvYcCUHdjQ6ReVGgAP9+a5fAMegpp57nn6EwwzcCFeglIaqdCIxnwT7cOF/KxQ8ftHH3esQCNUTRQ==@lists.linux.dev X-Gm-Message-State: AOJu0Yx5cuMP+VnE3BCfomAVUOLBbY4Jw26uAmsQ4957LHgOf4nkWTfY Wp+AsFBbsunrBFELnVz0vzcJqC7kgPKWEpBOzUOYAS8WWY/x8Wn2NfmFa/5Li08Kg9d2SBLgj9E yGNm3oA== X-Google-Smtp-Source: AGHT+IHNkeTr1IXEx4pv8zbKdsHdKo0sVR+9B+i4vxPeQfrBSyN50QT97gh1gKgnaZexsZ6oSyAsjRSzwYM= X-Received: from pfbko17.prod.google.com ([2002:a05:6a00:4611:b0:749:1e51:d39a]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:12c2:b0:230:69f1:620a with SMTP id adf61e73a8af0-240a8ba6504mr218627637.42.1755021541287; Tue, 12 Aug 2025 10:59:01 -0700 (PDT) Date: Tue, 12 Aug 2025 17:58:22 +0000 In-Reply-To: <20250812175848.512446-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250812175848.512446-1-kuniyu@google.com> X-Mailer: git-send-email 2.51.0.rc0.205.g4a044479a3-goog Message-ID: <20250812175848.512446-5-kuniyu@google.com> Subject: [PATCH v3 net-next 04/12] net: Call trace_sock_exceed_buf_limit() for memcg failure with SK_MEM_RECV. From: Kuniyuki Iwashima To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Neal Cardwell , Paolo Abeni , Willem de Bruijn , Matthieu Baerts , Mat Martineau , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Andrew Morton , "=?UTF-8?q?Michal=20Koutn=C3=BD?=" , Tejun Heo Cc: Simon Horman , Geliang Tang , Muchun Song , Mina Almasry , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org, mptcp@lists.linux.dev, cgroups@vger.kernel.org, linux-mm@kvack.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Initially, trace_sock_exceed_buf_limit() was invoked when __sk_mem_raise_allocated() failed due to the memcg limit or the global limit. However, commit d6f19938eb031 ("net: expose sk wmem in sock_exceed_buf_limit tracepoint") somehow suppressed the event only when memcg failed to charge for SK_MEM_RECV, although the memcg failure for SK_MEM_SEND still triggers the event. Let's restore the event for SK_MEM_RECV. Signed-off-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet --- net/core/sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index 7c26ec8dce63..380bc1aa6982 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3354,8 +3354,7 @@ int __sk_mem_raise_allocated(struct sock *sk, int siz= e, int amt, int kind) } } =20 - if (kind =3D=3D SK_MEM_SEND || (kind =3D=3D SK_MEM_RECV && charged)) - trace_sock_exceed_buf_limit(sk, prot, allocated, kind); + trace_sock_exceed_buf_limit(sk, prot, allocated, kind); =20 sk_memory_allocated_sub(sk, amt); =20 --=20 2.51.0.rc0.205.g4a044479a3-goog From nobody Sun Feb 8 08:21:40 2026 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (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 932222FE569 for ; Tue, 12 Aug 2025 17:59:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021544; cv=none; b=Dh7/xloeI8D9ORI7soquJAAyiLVnzh0Dgdzf2R1P0dSmyGDe9HWnCbekalEjjLfkd2cRY+vtgbGH1a7NXKQaleCit1Z3duPuMAS19UxweUL542lMoMcessuAz43fGJxIC3vPCvD7/pU7ai+9grGqcH4xKfw22SzMi7HWmrHluHc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021544; c=relaxed/simple; bh=Ax2UdSGe76cjX/U8fn+wOjQ7zXwBXHN69rzEWx84VMc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=J/G+yCoSWBwQ04KdqVUgMi2FJm6GJsydv1KltrwQO6FE6H0yN7JVm6BJVy7TYGQbl7TJ7nkKALEyTdZyUNt0A4ssVXOv4hVsEpxfpCbs0yzjxipfM6PlULxSIqc095feQ5HxTaXQD2J/o9KRZEns9dabUur3yF/gJH6cLyf0oEE= 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=EmiJhH42; arc=none smtp.client-ip=209.85.210.201 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="EmiJhH42" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-76be85bfc0aso4544888b3a.0 for ; Tue, 12 Aug 2025 10:59:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755021543; x=1755626343; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=UE7+fyIYJB9pTP5Kh5RXBJc7LN9wQtEkFd8ieoqRGBc=; b=EmiJhH42rqZ6I+49VPy6Kk0n34NOrzZFEGGqZCeUuInySwzygdgM15OgVd5neRGyEL /2uqQmyN/LIDNq95DWhYJF6/AB/XhwoxAsr/4jQmn8ANmG8yYUHY9+DQGJTuwHVmnUdr ZSOs4Z7YoaLcvItpby1Q8UsjdpEMihgr+XCebpSxN3LvTRkB53MIntxGvYRCkcWjwVYC 5mK05UFzw9eGsq22NG7WWJjifI9y9iGY5a36R+It06psaq22Y67lQdAKSRMUIRIPpYQH GzD59wiLDsb1hBIgdHGY5Tjpo48FJQn3TXuUfTvI2+5x2AH3uOCN2D69Bs61UMC5irIp o5gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755021543; x=1755626343; 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=UE7+fyIYJB9pTP5Kh5RXBJc7LN9wQtEkFd8ieoqRGBc=; b=n7FjbJz7CV7HjLZ+CBcbgVScUdtYf3MliI6129VfX6G9ftMx5h9C64zgPqM2CqTqAg 1o5lstNW9zgetoYZTkqDgH/3pDOlxIN330ovn8mU0KkXBORouTjzhQMzye9H8oB0wsgd AqmrM4AhxkUvwaSFfVDXJcd2E7yN10geNKR9InDQi7VF/YwPuobJ2x3H+WqGow54xT9r erzSpFgXG3F2zTp2qtGphujR46f+jNptfInO7hmLWJ2C39X/nLbdWxtKt6HUkxMvRSKt PDyBmXWlVgSJoK/7KEX+NRRM9ah4EyscTPjLnikNxRzP9li86jCMQtxUtXsLwq3OJMvy oMRA== X-Forwarded-Encrypted: i=1; AJvYcCUb4++r/LBG2lpN7Pm7Ud9elZPG+keoroZJiLJXXlsYxB+uA1Fyknc3G7H8DiXQ+K3f+BQV9g==@lists.linux.dev X-Gm-Message-State: AOJu0Yz1Oss+iavSF7Cp4k39y+GY4u2ae11RW3WZ74s3MUR7jkSrae6k zk3p7Q1i8MctZb3yNwwPC/OT5sOy+zJGheEMPf6lVB0Ow4B7qWdMY9DBJbeeny9sF+d4LJSS1e6 G9b2ybg== X-Google-Smtp-Source: AGHT+IFtBSrb2xrrpV4Km05LIJWdOq8vUPj5EVaB8QdNd7zmXRO48lhifltEO3FaesYyLeoc/sVTWfW8tqA= X-Received: from pfmm1.prod.google.com ([2002:a05:6a00:2481:b0:768:7cb5:740a]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1910:b0:742:a82b:abeb with SMTP id d2e1a72fcca58-76e20c9bc63mr181842b3a.2.1755021542861; Tue, 12 Aug 2025 10:59:02 -0700 (PDT) Date: Tue, 12 Aug 2025 17:58:23 +0000 In-Reply-To: <20250812175848.512446-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250812175848.512446-1-kuniyu@google.com> X-Mailer: git-send-email 2.51.0.rc0.205.g4a044479a3-goog Message-ID: <20250812175848.512446-6-kuniyu@google.com> Subject: [PATCH v3 net-next 05/12] net: Clean up __sk_mem_raise_allocated(). From: Kuniyuki Iwashima To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Neal Cardwell , Paolo Abeni , Willem de Bruijn , Matthieu Baerts , Mat Martineau , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Andrew Morton , "=?UTF-8?q?Michal=20Koutn=C3=BD?=" , Tejun Heo Cc: Simon Horman , Geliang Tang , Muchun Song , Mina Almasry , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org, mptcp@lists.linux.dev, cgroups@vger.kernel.org, linux-mm@kvack.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In __sk_mem_raise_allocated(), charged is initialised as true due to the weird condition removed in the previous patch. It makes the variable unreliable by itself, so we have to check another variable, memcg, in advance. Also, we will factorise the common check below for memcg later. if (mem_cgroup_sockets_enabled && sk->sk_memcg) As a prep, let's initialise charged as false and memcg as NULL. Signed-off-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet --- net/core/sock.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index 380bc1aa6982..000940ecf360 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3263,15 +3263,16 @@ EXPORT_SYMBOL(sk_wait_data); */ int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind) { - struct mem_cgroup *memcg =3D mem_cgroup_sockets_enabled ? sk->sk_memcg : = NULL; struct proto *prot =3D sk->sk_prot; - bool charged =3D true; + struct mem_cgroup *memcg =3D NULL; + bool charged =3D false; long allocated; =20 sk_memory_allocated_add(sk, amt); allocated =3D sk_memory_allocated(sk); =20 - if (memcg) { + if (mem_cgroup_sockets_enabled && sk->sk_memcg) { + memcg =3D sk->sk_memcg; charged =3D mem_cgroup_charge_skmem(memcg, amt, gfp_memcg_charge()); if (!charged) goto suppress_allocation; @@ -3358,7 +3359,7 @@ int __sk_mem_raise_allocated(struct sock *sk, int siz= e, int amt, int kind) =20 sk_memory_allocated_sub(sk, amt); =20 - if (memcg && charged) + if (charged) mem_cgroup_uncharge_skmem(memcg, amt); =20 return 0; --=20 2.51.0.rc0.205.g4a044479a3-goog From nobody Sun Feb 8 08:21:40 2026 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 254142FE569 for ; Tue, 12 Aug 2025 17:59:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021546; cv=none; b=C6DtrGmekDBkdNwPCetHSHgt6VejgY4c+CVAihJprUGzxCnnq24J95L8wDfVfLPDzM/nXLLHlGEY9b8Vn0jNShhNsornO037/ns1kVTvHQYcx11p78uAhSVrasIx6Pji0ZOPnC2EmtXGzyo8HYugKFSyZmdVwpHAeGbsVD1iP8I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021546; c=relaxed/simple; bh=DpTvGUJvesR0RNAUmuU/kx03NdxonaF+OWOIs2c8qNc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Y0wsdHT/0KzqXYDTUKrC4fz4+33Y/KYNmMUeeqXqkplrRZ9z4aX1AfOXhoKeG31Wl6cZT1eAAvcwccNV3mUjfQQksI+IgFvY7n8Bi8oTpDzyQIF8NNYZGGRI//6otClNArPHmK31si+ffXOf2J4W+3g6VKtE+WDMWAFWDFaxqBI= 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=NlOJJond; arc=none smtp.client-ip=209.85.210.202 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="NlOJJond" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-76bc9259f63so5722982b3a.3 for ; Tue, 12 Aug 2025 10:59:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755021545; x=1755626345; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=tnEkA+52sI8esqmC0cNEqYlTXuIo2cbdOxRfbJLXess=; b=NlOJJondHdzCcTZVi4VdAInST44qfDveHDx18XPpTADMV9Z4NsUbUXDscOnulyQQu5 J0df69ikmiupTZem7QXdF+Mtp1rmlI8+GIHcld2frv4q3lzJqKstHli3mm+tqbvs4Amo oRSA2ie+B1jE+988zcE4xhNic4uBMQ383jOKB5O0i1Bk05ZOMf8SQGHNoPrvETyftK+C wg5ZKJBi6aVAKdIc3lgNEO+aoW6Ky6bQmsY9cM8nrmLs/7DXWwcrcCNat5eUqX1b1INV qko7Fu4TwdjFIdFf4E/Zro0P90I0M9vB4U4b3CFhDzVwKJ4Sq/orCLEaT3r7bmlvvFRp GpeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755021545; x=1755626345; 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=tnEkA+52sI8esqmC0cNEqYlTXuIo2cbdOxRfbJLXess=; b=c9mRBaOuOcrPOLXxbW6UVCYQuKYZFnshg8U2XWAnumD588A/9ztn4H7R/fnujMBffg w4B3r3cLaV7Pd6FdmtjcQl3mjlhupSLRSijwqFb/JmJsspXd4QtkO7qoDWSlYNRKO+n+ T/qJmGB2jrxMzfOudKhiu2kGTNQvbCy0mKbpISAwExKYX78hW3Bco4P0+7/Ms3mp1nsv Um0cIaa8/E6twrceuYmSTwGlVfPZt29is2aHCB5fCP1VXvqs/Va/KvNDdmzBn9BFZljg LcL8bB0ZY8GGvtzibumpKn5EPNsAJa00l88jBTdWIFBFX8bm5VOgLG5Mf3Nd5wRVYXt2 sivQ== X-Forwarded-Encrypted: i=1; AJvYcCVSKt0Ing+y+OmEfVI+85iD8OUmgf26ri2rLOCXUL/PGJd0QuhXU+EU8G9kmMWyiZYk1xDjAA==@lists.linux.dev X-Gm-Message-State: AOJu0Yz86aq5gSngIqvTXoCRXLD9NQ7nbhF77UpKtgUvVSLqNvOF/uLq 3xX1TSEtZVYT/lpVHaRd21ZZI31dsH4JkCaBDECuAiz5sdKojdQZxGDoPUYVTTHGCoSI9ii+rC9 TOOjlKw== X-Google-Smtp-Source: AGHT+IGoBWtNHQB4gmu0I/l/gxdqVZ0w9YFTpuFgmmNNhALMQosyvo+/jCxMWRY+Nn4mDpLorfHvQa7+8R0= X-Received: from pfoo14.prod.google.com ([2002:a05:6a00:1a0e:b0:76b:74b4:ed62]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:885:b0:73d:fa54:afb9 with SMTP id d2e1a72fcca58-76e20cca950mr205362b3a.7.1755021544485; Tue, 12 Aug 2025 10:59:04 -0700 (PDT) Date: Tue, 12 Aug 2025 17:58:24 +0000 In-Reply-To: <20250812175848.512446-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250812175848.512446-1-kuniyu@google.com> X-Mailer: git-send-email 2.51.0.rc0.205.g4a044479a3-goog Message-ID: <20250812175848.512446-7-kuniyu@google.com> Subject: [PATCH v3 net-next 06/12] net-memcg: Introduce mem_cgroup_from_sk(). From: Kuniyuki Iwashima To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Neal Cardwell , Paolo Abeni , Willem de Bruijn , Matthieu Baerts , Mat Martineau , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Andrew Morton , "=?UTF-8?q?Michal=20Koutn=C3=BD?=" , Tejun Heo Cc: Simon Horman , Geliang Tang , Muchun Song , Mina Almasry , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org, mptcp@lists.linux.dev, cgroups@vger.kernel.org, linux-mm@kvack.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We will store a flag in the lowest bit of sk->sk_memcg. Then, directly dereferencing sk->sk_memcg will be illegal, and we do not want to allow touching the raw sk->sk_memcg in many places. Let's introduce mem_cgroup_from_sk(). Other places accessing the raw sk->sk_memcg will be converted later. Note that we cannot define the helper as an inline function in memcontrol.h as we cannot access any fields of struct sock there due to circular dependency, so it is placed in sock.h. Signed-off-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet Acked-by: Roman Gushchin --- include/net/sock.h | 12 ++++++++++++ mm/memcontrol.c | 14 +++++++++----- net/ipv4/inet_connection_sock.c | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index c8a4b283df6f..811f95ea8d00 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2594,6 +2594,18 @@ static inline gfp_t gfp_memcg_charge(void) return in_softirq() ? GFP_ATOMIC : GFP_KERNEL; } =20 +#ifdef CONFIG_MEMCG +static inline struct mem_cgroup *mem_cgroup_from_sk(const struct sock *sk) +{ + return sk->sk_memcg; +} +#else +static inline struct mem_cgroup *mem_cgroup_from_sk(const struct sock *sk) +{ + return NULL; +} +#endif + static inline long sock_rcvtimeo(const struct sock *sk, bool noblock) { return noblock ? 0 : READ_ONCE(sk->sk_rcvtimeo); diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 08c6e06750ac..2db7df32fd7c 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5020,18 +5020,22 @@ void mem_cgroup_sk_alloc(struct sock *sk) =20 void mem_cgroup_sk_free(struct sock *sk) { - if (sk->sk_memcg) - css_put(&sk->sk_memcg->css); + struct mem_cgroup *memcg =3D mem_cgroup_from_sk(sk); + + if (memcg) + css_put(&memcg->css); } =20 void mem_cgroup_sk_inherit(const struct sock *sk, struct sock *newsk) { - if (sk->sk_memcg =3D=3D newsk->sk_memcg) + struct mem_cgroup *memcg =3D mem_cgroup_from_sk(sk); + + if (memcg =3D=3D mem_cgroup_from_sk(newsk)) return; =20 mem_cgroup_sk_free(newsk); - css_get(&sk->sk_memcg->css); - newsk->sk_memcg =3D sk->sk_memcg; + css_get(&memcg->css); + newsk->sk_memcg =3D memcg; } =20 /** diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_soc= k.c index 724bd9ed6cd4..93569bbe00f4 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -718,7 +718,7 @@ struct sock *inet_csk_accept(struct sock *sk, struct pr= oto_accept_arg *arg) lock_sock(newsk); =20 mem_cgroup_sk_alloc(newsk); - if (newsk->sk_memcg) { + if (mem_cgroup_from_sk(newsk)) { /* The socket has not been accepted yet, no need * to look at newsk->sk_wmem_queued. */ --=20 2.51.0.rc0.205.g4a044479a3-goog From nobody Sun Feb 8 08:21:40 2026 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 EDAA82FFDE0 for ; Tue, 12 Aug 2025 17:59:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021548; cv=none; b=HqpH8apNc5CFI2gAcQPRq/Xz363Mpt2l0mWExcnT3E0RLRpyEwGO9ABWaChpBPYy6nlKexHyBw4mRbr5dKXShvi+6u1LJOz77PRXdzHs7r1FW1tJE6S7/S+nL+bFc48Uz75WZU/zGjOVhFzas6zla1/xzVw/+vy2KdBtmYJxgFQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021548; c=relaxed/simple; bh=KZsxQ9Vejvjn3ihqtI+VvNwL3Rw10GiDSiQrIYh5KLk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=WcQGD4wlKufBxZRMpdnx6jS9N6pgZYmyxdPmtI/9JQSuaKQr34084dKFY7OpCJTSLxEexmvs8CBKOpwoToQEcuwt1yCQ3BSfUCgk9tR8pzT/xiDLNHGt8CJ/jkxK6Ck6GWrenNIfGsxAeCWx6bWWGJkU3fDsHfNUTlXPAizSCoE= 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=LlR0morO; arc=none smtp.client-ip=209.85.210.202 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="LlR0morO" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-76bc511e226so5676285b3a.3 for ; Tue, 12 Aug 2025 10:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755021546; x=1755626346; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=lmzqnAc1jsyellKSOYCRzvGhauBIubxeUGW9qtoYYWI=; b=LlR0morO4sZKYmE7vF9lIgIRM75IdYYxN5HAj+OYaDPAN68wOpHQOKazOq30eLf5Y4 JfSWHH+cpAUtbGQs9ABv9PATC7AS7EbROF4K7crS/l6I199TuYZJTabadsZWFAMYEfmR AN9yq1VU2HmyDMGL4tkZIiMyZmyVyxa7QenkegirTJjwYsZZdl/D6RufUcDqAI10BC5m VE4RJkwSsARVMsMJ4ElRyazEyYLiwH+ah4IAoYFj1fYvwH+0f1dj09a7bLrdmcxPH/d/ sY1lMdrCaHHbb/HIkcLyy2poIQSvMqgifiEKCnnRCuuxbk1qkpogFRQyrzpfoXWn4sUR nY1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755021546; x=1755626346; 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=lmzqnAc1jsyellKSOYCRzvGhauBIubxeUGW9qtoYYWI=; b=WTcnqTFM1ijhjZ0ecB68zPDpIYNdZa8oOPKYcFJc5mTuw22pn3Pi50U6/i1J6j07sF Qruv4ZAlPgBke0NUf6BlFl+gnBybbvEs4IsPllexMe3OfO1FjIiSSfBL2EylU2rUhdsj mMj+5ey/lIwxt0hSgh1YXfZVkIqm4h1IfB2BheKcOyULpnJA7fGUqZUvzmH3To2qSPFE UqeLPbmzngOIyZ9gaa2lxc+3kCDvlv+KaIG4KLp6d7XbiqkK/dh/gGG/AilfDxbV+hZu UtPH/PqCFMRMJ18mKmWU8wbzonQntnuQSCF9hPt//vnsVNwBAfoHSa2jlCD4fxRvMIuq HBlg== X-Forwarded-Encrypted: i=1; AJvYcCXV8r5LRrkiFxxjSKgDq0HmvBqXXFAS0TUUm1CzvsADX44m61olH3nzZAoIUtqE6d1KUcJ2zw==@lists.linux.dev X-Gm-Message-State: AOJu0YyQarXkpL9EOlfn96jDX/FUFQGzjhqoC7V0HkyY09AGKj8XA7XN T70NHmYOnc8IJw3unlN/6j6HqwKbSeqCRXnJwGwWUXlcyejCEKgLeBebEtnXgPGaLwYvyLiTAji 12akVRA== X-Google-Smtp-Source: AGHT+IGdZk7MwPY5BeI43bceFVbz9bcwzyVjG/myi4TvBkOWcTUGeu9X1TXG1+jvSNdfiHL0s8PKRPjYYcg= X-Received: from pfbcn7.prod.google.com ([2002:a05:6a00:3407:b0:739:8cd6:c16c]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:887:b0:76b:f9f0:bef2 with SMTP id d2e1a72fcca58-76e20fb0e4emr135908b3a.14.1755021546076; Tue, 12 Aug 2025 10:59:06 -0700 (PDT) Date: Tue, 12 Aug 2025 17:58:25 +0000 In-Reply-To: <20250812175848.512446-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250812175848.512446-1-kuniyu@google.com> X-Mailer: git-send-email 2.51.0.rc0.205.g4a044479a3-goog Message-ID: <20250812175848.512446-8-kuniyu@google.com> Subject: [PATCH v3 net-next 07/12] net-memcg: Introduce mem_cgroup_sk_enabled(). From: Kuniyuki Iwashima To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Neal Cardwell , Paolo Abeni , Willem de Bruijn , Matthieu Baerts , Mat Martineau , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Andrew Morton , "=?UTF-8?q?Michal=20Koutn=C3=BD?=" , Tejun Heo Cc: Simon Horman , Geliang Tang , Muchun Song , Mina Almasry , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org, mptcp@lists.linux.dev, cgroups@vger.kernel.org, linux-mm@kvack.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The socket memcg feature is enabled by a static key and only works for non-root cgroup. We check both conditions in many places. Let's factorise it as a helper function. Signed-off-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet Acked-by: Roman Gushchin --- include/net/proto_memory.h | 2 +- include/net/sock.h | 10 ++++++++++ include/net/tcp.h | 2 +- net/core/sock.c | 6 +++--- net/ipv4/tcp_output.c | 2 +- net/mptcp/subflow.c | 2 +- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/include/net/proto_memory.h b/include/net/proto_memory.h index a6ab2f4f5e28..859e63de81c4 100644 --- a/include/net/proto_memory.h +++ b/include/net/proto_memory.h @@ -31,7 +31,7 @@ static inline bool sk_under_memory_pressure(const struct = sock *sk) if (!sk->sk_prot->memory_pressure) return false; =20 - if (mem_cgroup_sockets_enabled && sk->sk_memcg && + if (mem_cgroup_sk_enabled(sk) && mem_cgroup_under_socket_pressure(sk->sk_memcg)) return true; =20 diff --git a/include/net/sock.h b/include/net/sock.h index 811f95ea8d00..3efdf680401d 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2599,11 +2599,21 @@ static inline struct mem_cgroup *mem_cgroup_from_sk= (const struct sock *sk) { return sk->sk_memcg; } + +static inline bool mem_cgroup_sk_enabled(const struct sock *sk) +{ + return mem_cgroup_sockets_enabled && mem_cgroup_from_sk(sk); +} #else static inline struct mem_cgroup *mem_cgroup_from_sk(const struct sock *sk) { return NULL; } + +static inline bool mem_cgroup_sk_enabled(const struct sock *sk) +{ + return false; +} #endif =20 static inline long sock_rcvtimeo(const struct sock *sk, bool noblock) diff --git a/include/net/tcp.h b/include/net/tcp.h index 526a26e7a150..9f01b6be6444 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -275,7 +275,7 @@ extern unsigned long tcp_memory_pressure; /* optimized version of sk_under_memory_pressure() for TCP sockets */ static inline bool tcp_under_memory_pressure(const struct sock *sk) { - if (mem_cgroup_sockets_enabled && sk->sk_memcg && + if (mem_cgroup_sk_enabled(sk) && mem_cgroup_under_socket_pressure(sk->sk_memcg)) return true; =20 diff --git a/net/core/sock.c b/net/core/sock.c index 000940ecf360..ab658fe23e1e 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1032,7 +1032,7 @@ static int sock_reserve_memory(struct sock *sk, int b= ytes) bool charged; int pages; =20 - if (!mem_cgroup_sockets_enabled || !sk->sk_memcg || !sk_has_account(sk)) + if (!mem_cgroup_sk_enabled(sk) || !sk_has_account(sk)) return -EOPNOTSUPP; =20 if (!bytes) @@ -3271,7 +3271,7 @@ int __sk_mem_raise_allocated(struct sock *sk, int siz= e, int amt, int kind) sk_memory_allocated_add(sk, amt); allocated =3D sk_memory_allocated(sk); =20 - if (mem_cgroup_sockets_enabled && sk->sk_memcg) { + if (mem_cgroup_sk_enabled(sk)) { memcg =3D sk->sk_memcg; charged =3D mem_cgroup_charge_skmem(memcg, amt, gfp_memcg_charge()); if (!charged) @@ -3398,7 +3398,7 @@ void __sk_mem_reduce_allocated(struct sock *sk, int a= mount) { sk_memory_allocated_sub(sk, amount); =20 - if (mem_cgroup_sockets_enabled && sk->sk_memcg) + if (mem_cgroup_sk_enabled(sk)) mem_cgroup_uncharge_skmem(sk->sk_memcg, amount); =20 if (sk_under_global_memory_pressure(sk) && diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index caf11920a878..37fb320e6f70 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -3578,7 +3578,7 @@ void sk_forced_mem_schedule(struct sock *sk, int size) sk_forward_alloc_add(sk, amt << PAGE_SHIFT); sk_memory_allocated_add(sk, amt); =20 - if (mem_cgroup_sockets_enabled && sk->sk_memcg) + if (mem_cgroup_sk_enabled(sk)) mem_cgroup_charge_skmem(sk->sk_memcg, amt, gfp_memcg_charge() | __GFP_NOFAIL); } diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 6fb635a95baf..4874147e0b17 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1723,7 +1723,7 @@ static void mptcp_attach_cgroup(struct sock *parent, = struct sock *child) } #endif /* CONFIG_SOCK_CGROUP_DATA */ =20 - if (mem_cgroup_sockets_enabled && parent->sk_memcg) + if (mem_cgroup_sk_enabled(parent)) mem_cgroup_sk_inherit(parent, child); } =20 --=20 2.51.0.rc0.205.g4a044479a3-goog From nobody Sun Feb 8 08:21:40 2026 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (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 664C42FFDED for ; Tue, 12 Aug 2025 17:59:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021550; cv=none; b=af0P18A9IgLFV+GwuQl2P8xtqIR4uJvvoY3ZQ4Mdi06E2wQ44It3t0Mpj2lSwdvSoR+NJNAZ1ea75cxTGBtOiForcxO6F97XkYm8IRz3PaCUkvD+uVRFX+oDQh5b81031L2pwwVczcdrGxad6MkNknhyhhYpAoXhhVrUg+kVBBw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021550; c=relaxed/simple; bh=9YjmMO4m/H5/OavDM8PkxfWcC+aXy4TjGXIzGxjoV7A=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=agYthsjgi/wVqUi6EbK7Rf+zI90jxdBFCe9HnLJ5HJuygzuUHm+Wi/UBNf0yfZu5TVDwfKPrATzfZ/QMitewR6EOWJDaA1MIutc6n0fVAADjYWPKQcHEB84gtKwy1xXMgDn0pVGDsR3Wh6spjB4k9JWfHDWqCnkxNGkWibs9mSo= 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=ODLNsPWg; arc=none smtp.client-ip=209.85.210.201 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="ODLNsPWg" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-75ab147e0a3so11746797b3a.3 for ; Tue, 12 Aug 2025 10:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755021548; x=1755626348; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=SDZvQnGZVydzNfrMcaRsTt38V2PhbthdXRjE/tVTQMY=; b=ODLNsPWgqAT4fKDdSd+oegtlGTJtXeDEdBbELHdSdsWvlrFg4z9DrdduJIs2uGi2e0 A+pOD6q0+JfY2mINqzzQpg0DEkhFRHjxvwfYHzuRneoz+LChIu/RzXL6cqswiKJ/grXZ cXB1PiIO3DeAVOExgqr85hS5qrIBnrHdAhwZnt5/LvWHLU0NWJ2AC5EbM0AHAcX2YrTT 5DFWsMc4begcm+Zk+6wjDO7oZrStC+zrzGPVyNCJlnW9xfpmo7wl10+nNNkyFf7iCNI7 aMy60KWACtV8nsDGgyrum0Sj+4Pj+vudxD6dRu8WS7YweMDecVgf5dNl18RHL+u0zDzd yMwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755021548; x=1755626348; 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=SDZvQnGZVydzNfrMcaRsTt38V2PhbthdXRjE/tVTQMY=; b=MrZiKGErIrQewn4ZXB2CGXxWaW2YUiVLeJ41l2zU/Y8dJjt9fU3eplOo0jTgxtaQTH 5bxPpPPCKbiH5ONG/98w2J7PI0fqzu2FAJv/7WC7U8JUqDVHAHRJ0u41Pjxvg33MEwH6 AjZ3nDXtkLzGXpQrUvBYcfaz4fYInJrrDXtjN+6F/jlOZbEzAgi+WnFW6/qHXu5TSmt+ pICqYQ8TWyD6w4qAZ1U4TvRf7+/nH0rtbFDWKu3N2LrqXQsZzWxfZGNobYGKGCFuLfJ/ W/4bPLrLwR2tz1fqyLjKaod87lh0NKCbz/AwYGz+Nn70NFe/en0/lXyjP4UQFxF29GG6 iolA== X-Forwarded-Encrypted: i=1; AJvYcCUbSJ4QLtr+J2DISxifE6KWJesDsG4clQH/jy6UUiLs0Gr7k7Zz9CXJ0JGyg5GenZAPABWS4g==@lists.linux.dev X-Gm-Message-State: AOJu0Yy8ROLRVjU4BSLxNjZzegUumg+K9Z5w3qc0Mtc3cRPWcIQsIH+f KtLMs9mKsD0rFOpQCp+bcwK+5NHswSAgbRgJC/hfAobCpQnWDLwjS4JtALiUKhDEztPWYWFJBqn /+cFtXA== X-Google-Smtp-Source: AGHT+IFn1xb1XsW3+iyKZmwfn+yKngA2QHtbjTYPgvZVH+wir3cF1vej6qQjtTIA+51A1YmNi6bxeEKS5P0= X-Received: from pfbhr18-n2.prod.google.com ([2002:a05:6a00:6b92:20b0:748:fa5b:4163]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1142:b0:76b:caa2:5bd8 with SMTP id d2e1a72fcca58-76e20f9de63mr127689b3a.13.1755021547780; Tue, 12 Aug 2025 10:59:07 -0700 (PDT) Date: Tue, 12 Aug 2025 17:58:26 +0000 In-Reply-To: <20250812175848.512446-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250812175848.512446-1-kuniyu@google.com> X-Mailer: git-send-email 2.51.0.rc0.205.g4a044479a3-goog Message-ID: <20250812175848.512446-9-kuniyu@google.com> Subject: [PATCH v3 net-next 08/12] net-memcg: Pass struct sock to mem_cgroup_sk_(un)?charge(). From: Kuniyuki Iwashima To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Neal Cardwell , Paolo Abeni , Willem de Bruijn , Matthieu Baerts , Mat Martineau , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Andrew Morton , "=?UTF-8?q?Michal=20Koutn=C3=BD?=" , Tejun Heo Cc: Simon Horman , Geliang Tang , Muchun Song , Mina Almasry , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org, mptcp@lists.linux.dev, cgroups@vger.kernel.org, linux-mm@kvack.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We will store a flag in the lowest bit of sk->sk_memcg. Then, we cannot pass the raw pointer to mem_cgroup_charge_skmem() and mem_cgroup_uncharge_skmem(). Let's pass struct sock to the functions. While at it, they are renamed to match other functions starting with mem_cgroup_sk_. Signed-off-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet Acked-by: Roman Gushchin --- include/linux/memcontrol.h | 29 ++++++++++++++++++++++++----- mm/memcontrol.c | 18 +++++++++++------- net/core/sock.c | 24 +++++++++++------------- net/ipv4/inet_connection_sock.c | 2 +- net/ipv4/tcp_output.c | 3 +-- 5 files changed, 48 insertions(+), 28 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 25921fbec685..0837d3de3a68 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1596,15 +1596,16 @@ static inline void mem_cgroup_flush_foreign(struct = bdi_writeback *wb) #endif /* CONFIG_CGROUP_WRITEBACK */ =20 struct sock; -bool mem_cgroup_charge_skmem(struct mem_cgroup *memcg, unsigned int nr_pag= es, - gfp_t gfp_mask); -void mem_cgroup_uncharge_skmem(struct mem_cgroup *memcg, unsigned int nr_p= ages); #ifdef CONFIG_MEMCG extern struct static_key_false memcg_sockets_enabled_key; #define mem_cgroup_sockets_enabled static_branch_unlikely(&memcg_sockets_e= nabled_key) + void mem_cgroup_sk_alloc(struct sock *sk); void mem_cgroup_sk_free(struct sock *sk); void mem_cgroup_sk_inherit(const struct sock *sk, struct sock *newsk); +bool mem_cgroup_sk_charge(const struct sock *sk, unsigned int nr_pages, + gfp_t gfp_mask); +void mem_cgroup_sk_uncharge(const struct sock *sk, unsigned int nr_pages); =20 #if BITS_PER_LONG < 64 static inline void mem_cgroup_set_socket_pressure(struct mem_cgroup *memcg) @@ -1660,13 +1661,31 @@ void set_shrinker_bit(struct mem_cgroup *memcg, int= nid, int shrinker_id); void reparent_shrinker_deferred(struct mem_cgroup *memcg); #else #define mem_cgroup_sockets_enabled 0 -static inline void mem_cgroup_sk_alloc(struct sock *sk) { }; -static inline void mem_cgroup_sk_free(struct sock *sk) { }; + +static inline void mem_cgroup_sk_alloc(struct sock *sk) +{ +} + +static inline void mem_cgroup_sk_free(struct sock *sk) +{ +} =20 static inline void mem_cgroup_sk_inherit(const struct sock *sk, struct soc= k *newsk) { } =20 +static inline bool mem_cgroup_sk_charge(const struct sock *sk, + unsigned int nr_pages, + gfp_t gfp_mask) +{ + return false; +} + +static inline void mem_cgroup_sk_uncharge(const struct sock *sk, + unsigned int nr_pages) +{ +} + static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *mem= cg) { return false; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 2db7df32fd7c..d32b7a547f42 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5039,17 +5039,19 @@ void mem_cgroup_sk_inherit(const struct sock *sk, s= truct sock *newsk) } =20 /** - * mem_cgroup_charge_skmem - charge socket memory - * @memcg: memcg to charge + * mem_cgroup_sk_charge - charge socket memory + * @sk: socket in memcg to charge * @nr_pages: number of pages to charge * @gfp_mask: reclaim mode * * Charges @nr_pages to @memcg. Returns %true if the charge fit within * @memcg's configured limit, %false if it doesn't. */ -bool mem_cgroup_charge_skmem(struct mem_cgroup *memcg, unsigned int nr_pag= es, - gfp_t gfp_mask) +bool mem_cgroup_sk_charge(const struct sock *sk, unsigned int nr_pages, + gfp_t gfp_mask) { + struct mem_cgroup *memcg =3D mem_cgroup_from_sk(sk); + if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) return memcg1_charge_skmem(memcg, nr_pages, gfp_mask); =20 @@ -5062,12 +5064,14 @@ bool mem_cgroup_charge_skmem(struct mem_cgroup *mem= cg, unsigned int nr_pages, } =20 /** - * mem_cgroup_uncharge_skmem - uncharge socket memory - * @memcg: memcg to uncharge + * mem_cgroup_sk_uncharge - uncharge socket memory + * @sk: socket in memcg to uncharge * @nr_pages: number of pages to uncharge */ -void mem_cgroup_uncharge_skmem(struct mem_cgroup *memcg, unsigned int nr_p= ages) +void mem_cgroup_sk_uncharge(const struct sock *sk, unsigned int nr_pages) { + struct mem_cgroup *memcg =3D mem_cgroup_from_sk(sk); + if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) { memcg1_uncharge_skmem(memcg, nr_pages); return; diff --git a/net/core/sock.c b/net/core/sock.c index ab658fe23e1e..5537ca263858 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1041,8 +1041,8 @@ static int sock_reserve_memory(struct sock *sk, int b= ytes) pages =3D sk_mem_pages(bytes); =20 /* pre-charge to memcg */ - charged =3D mem_cgroup_charge_skmem(sk->sk_memcg, pages, - GFP_KERNEL | __GFP_RETRY_MAYFAIL); + charged =3D mem_cgroup_sk_charge(sk, pages, + GFP_KERNEL | __GFP_RETRY_MAYFAIL); if (!charged) return -ENOMEM; =20 @@ -1054,7 +1054,7 @@ static int sock_reserve_memory(struct sock *sk, int b= ytes) */ if (allocated > sk_prot_mem_limits(sk, 1)) { sk_memory_allocated_sub(sk, pages); - mem_cgroup_uncharge_skmem(sk->sk_memcg, pages); + mem_cgroup_sk_uncharge(sk, pages); return -ENOMEM; } sk_forward_alloc_add(sk, pages << PAGE_SHIFT); @@ -3263,17 +3263,16 @@ EXPORT_SYMBOL(sk_wait_data); */ int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind) { + bool memcg_enabled =3D false, charged =3D false; struct proto *prot =3D sk->sk_prot; - struct mem_cgroup *memcg =3D NULL; - bool charged =3D false; long allocated; =20 sk_memory_allocated_add(sk, amt); allocated =3D sk_memory_allocated(sk); =20 if (mem_cgroup_sk_enabled(sk)) { - memcg =3D sk->sk_memcg; - charged =3D mem_cgroup_charge_skmem(memcg, amt, gfp_memcg_charge()); + memcg_enabled =3D true; + charged =3D mem_cgroup_sk_charge(sk, amt, gfp_memcg_charge()); if (!charged) goto suppress_allocation; } @@ -3347,10 +3346,9 @@ int __sk_mem_raise_allocated(struct sock *sk, int si= ze, int amt, int kind) */ if (sk->sk_wmem_queued + size >=3D sk->sk_sndbuf) { /* Force charge with __GFP_NOFAIL */ - if (memcg && !charged) { - mem_cgroup_charge_skmem(memcg, amt, - gfp_memcg_charge() | __GFP_NOFAIL); - } + if (memcg_enabled && !charged) + mem_cgroup_sk_charge(sk, amt, + gfp_memcg_charge() | __GFP_NOFAIL); return 1; } } @@ -3360,7 +3358,7 @@ int __sk_mem_raise_allocated(struct sock *sk, int siz= e, int amt, int kind) sk_memory_allocated_sub(sk, amt); =20 if (charged) - mem_cgroup_uncharge_skmem(memcg, amt); + mem_cgroup_sk_uncharge(sk, amt); =20 return 0; } @@ -3399,7 +3397,7 @@ void __sk_mem_reduce_allocated(struct sock *sk, int a= mount) sk_memory_allocated_sub(sk, amount); =20 if (mem_cgroup_sk_enabled(sk)) - mem_cgroup_uncharge_skmem(sk->sk_memcg, amount); + mem_cgroup_sk_uncharge(sk, amount); =20 if (sk_under_global_memory_pressure(sk) && (sk_memory_allocated(sk) < sk_prot_mem_limits(sk, 0))) diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_soc= k.c index 93569bbe00f4..0ef1eacd539d 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -727,7 +727,7 @@ struct sock *inet_csk_accept(struct sock *sk, struct pr= oto_accept_arg *arg) } =20 if (amt) - mem_cgroup_charge_skmem(newsk->sk_memcg, amt, gfp); + mem_cgroup_sk_charge(newsk, amt, gfp); kmem_cache_charge(newsk, gfp); =20 release_sock(newsk); diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 37fb320e6f70..dfbac0876d96 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -3579,8 +3579,7 @@ void sk_forced_mem_schedule(struct sock *sk, int size) sk_memory_allocated_add(sk, amt); =20 if (mem_cgroup_sk_enabled(sk)) - mem_cgroup_charge_skmem(sk->sk_memcg, amt, - gfp_memcg_charge() | __GFP_NOFAIL); + mem_cgroup_sk_charge(sk, amt, gfp_memcg_charge() | __GFP_NOFAIL); } =20 /* Send a FIN. The caller locks the socket for us. --=20 2.51.0.rc0.205.g4a044479a3-goog From nobody Sun Feb 8 08:21:40 2026 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 E5E9E2FFDF9 for ; Tue, 12 Aug 2025 17:59:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021551; cv=none; b=NZzGLAffILDHFMjMcq0jD/f4Kg39E/UzbgeBSXcIOyvqWHsNK55ZDvLfzmotcZ3VPAjv13z/FZvxmTIimf4+LfW8NRPCjZyDcuf/ru/L/GXlvtK0qHcyJ4Xf8n/mihwxsnQsP9oENAVr1X7OjKD5Ll4w+/KxX6R1sCnuauuXPLU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021551; c=relaxed/simple; bh=jOslt91PW8Uwrsjd44KeyK+AgmwIveniaUCIRfb5Yxo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Nohq9dX0Q3yNpsWvxwlQ7EjbpI2RKxAqQA3CfO9ocOvATgMbFRSO+G9ArcyJH45JEm8wW0uwJeL1crrCq+XfT3qllPSoAwP1HDWm6y1D59Xi0OefBKK/fdswYhutRtbHbtkmXpvnY+kXFJX7eU2qcpb7TcSO7swgvlMW4dzxfJg= 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=H5FAjc9o; arc=none smtp.client-ip=209.85.216.73 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="H5FAjc9o" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-31f4d0f60caso5606587a91.1 for ; Tue, 12 Aug 2025 10:59:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755021549; x=1755626349; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=PAQKiMCakkqwV95b2b8VWBJpRa3xearNZGx30z89mh4=; b=H5FAjc9ow459rw8OesqJf1rk2gZnAT8h7yxXcu61w679t7ACwe3gfsaeqF2B0qJ2om N6LjGkozty0ABOZf9PvjPHniBmuj+yUeP/rnqEisPp/aiFc1rBNmH+1MZQ/P1MevuRqG 7GVippCZ7BWsnPGyyF1b6NVkPav3lz9UQAGYSb3FC5tKCmTxT78XrhVKDxImOqLM/Ph+ 0L3mAHp2YJojrpVylHiwJ4khHAyLRiCzjhR5N2rfrVsZTqmtNFrSuFFrDOW8p2ipqbL3 qvtEpHPH3sIMpy2mnTyS0Z8jSOVFrIP97GtYG88n7mnVAEDn1KY26+P2I84H9OPhZVGW ElXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755021549; x=1755626349; 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=PAQKiMCakkqwV95b2b8VWBJpRa3xearNZGx30z89mh4=; b=n9ZhU5Pl43AHGCtDv/PwK63jUY7j/PYuBmjPFujrWnuHWAfujDs2G32BuYViQacVsg cIx8C76KFHR1o/QKnZfZarCVcWak9iJCWmdSrI1iIZBbMkP5RHaJfYfua2V8hpgs0mSV Givk8hDMCzo0IoxQWJxJhaq5bUkAKOTB+UV7gzoD38UGOIFNgG6+XvlpZeJE6JZh+mD/ S2ym1TCWq/sMQVzfIVro0rJ5B1nDwDHgKpv4nZuLVqnEaGhPzm3dpnA/cP66URonzpsh HfumLs+ESJIWcL7VqZGIqx5En18n/Ov93W8WovjGZaVIqJeJXd46bcywQmMwvOT4RFm/ qj4Q== X-Forwarded-Encrypted: i=1; AJvYcCUbtGlkqOUJvjTqlNcNE0Ss+QaUtx2AFL9zGTfxqpoMe9//jmTRlTzgj++hud51mCSFwZniqw==@lists.linux.dev X-Gm-Message-State: AOJu0YyzdSLd4+1O5ehpPU3n2oblVgNDz876q6NQyDLyVy5Z1UOD3UVh toKdNuZRNSASJSZE6M4yjhJSXXtj4rFv7WzezktvlHHGpKyNY8Y5oZ3Vqrl21RnIObbqPA8DG2p Zr+nrKw== X-Google-Smtp-Source: AGHT+IFO4uc9EvAV7okCx9zQHxmIApDMA+yhfz+lGyPq4mF4kWTkx5Mc08aiDs0AG+bvf5xkZqRyMQpe5fQ= X-Received: from pjbqi10.prod.google.com ([2002:a17:90b:274a:b0:311:c5d3:c7d0]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:dd8f:b0:311:eb85:96df with SMTP id 98e67ed59e1d1-321cf97d624mr650175a91.17.1755021549334; Tue, 12 Aug 2025 10:59:09 -0700 (PDT) Date: Tue, 12 Aug 2025 17:58:27 +0000 In-Reply-To: <20250812175848.512446-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250812175848.512446-1-kuniyu@google.com> X-Mailer: git-send-email 2.51.0.rc0.205.g4a044479a3-goog Message-ID: <20250812175848.512446-10-kuniyu@google.com> Subject: [PATCH v3 net-next 09/12] net-memcg: Pass struct sock to mem_cgroup_sk_under_memory_pressure(). From: Kuniyuki Iwashima To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Neal Cardwell , Paolo Abeni , Willem de Bruijn , Matthieu Baerts , Mat Martineau , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Andrew Morton , "=?UTF-8?q?Michal=20Koutn=C3=BD?=" , Tejun Heo Cc: Simon Horman , Geliang Tang , Muchun Song , Mina Almasry , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org, mptcp@lists.linux.dev, cgroups@vger.kernel.org, linux-mm@kvack.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We will store a flag in the lowest bit of sk->sk_memcg. Then, we cannot pass the raw pointer to mem_cgroup_under_socket_pressure(). Let's pass struct sock to it and rename the function to match other functions starting with mem_cgroup_sk_. Note that the helper is moved to sock.h to use mem_cgroup_from_sk(). Signed-off-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet Acked-by: Roman Gushchin --- include/linux/memcontrol.h | 18 ------------------ include/net/proto_memory.h | 2 +- include/net/sock.h | 22 ++++++++++++++++++++++ include/net/tcp.h | 2 +- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 0837d3de3a68..fb27e3d2fdac 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1642,19 +1642,6 @@ static inline u64 mem_cgroup_get_socket_pressure(str= uct mem_cgroup *memcg) } #endif =20 -static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *mem= cg) -{ -#ifdef CONFIG_MEMCG_V1 - if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) - return !!memcg->tcpmem_pressure; -#endif /* CONFIG_MEMCG_V1 */ - do { - if (time_before64(get_jiffies_64(), mem_cgroup_get_socket_pressure(memcg= ))) - return true; - } while ((memcg =3D parent_mem_cgroup(memcg))); - return false; -} - int alloc_shrinker_info(struct mem_cgroup *memcg); void free_shrinker_info(struct mem_cgroup *memcg); void set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id); @@ -1686,11 +1673,6 @@ static inline void mem_cgroup_sk_uncharge(const stru= ct sock *sk, { } =20 -static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *mem= cg) -{ - return false; -} - static inline void set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id) { diff --git a/include/net/proto_memory.h b/include/net/proto_memory.h index 859e63de81c4..8e91a8fa31b5 100644 --- a/include/net/proto_memory.h +++ b/include/net/proto_memory.h @@ -32,7 +32,7 @@ static inline bool sk_under_memory_pressure(const struct = sock *sk) return false; =20 if (mem_cgroup_sk_enabled(sk) && - mem_cgroup_under_socket_pressure(sk->sk_memcg)) + mem_cgroup_sk_under_memory_pressure(sk)) return true; =20 return !!READ_ONCE(*sk->sk_prot->memory_pressure); diff --git a/include/net/sock.h b/include/net/sock.h index 3efdf680401d..3bc4d566f7d0 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2604,6 +2604,23 @@ static inline bool mem_cgroup_sk_enabled(const struc= t sock *sk) { return mem_cgroup_sockets_enabled && mem_cgroup_from_sk(sk); } + +static inline bool mem_cgroup_sk_under_memory_pressure(const struct sock *= sk) +{ + struct mem_cgroup *memcg =3D mem_cgroup_from_sk(sk); + +#ifdef CONFIG_MEMCG_V1 + if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) + return !!memcg->tcpmem_pressure; +#endif /* CONFIG_MEMCG_V1 */ + + do { + if (time_before64(get_jiffies_64(), mem_cgroup_get_socket_pressure(memcg= ))) + return true; + } while ((memcg =3D parent_mem_cgroup(memcg))); + + return false; +} #else static inline struct mem_cgroup *mem_cgroup_from_sk(const struct sock *sk) { @@ -2614,6 +2631,11 @@ static inline bool mem_cgroup_sk_enabled(const struc= t sock *sk) { return false; } + +static inline bool mem_cgroup_sk_under_memory_pressure(const struct sock *= sk) +{ + return false; +} #endif =20 static inline long sock_rcvtimeo(const struct sock *sk, bool noblock) diff --git a/include/net/tcp.h b/include/net/tcp.h index 9f01b6be6444..2936b8175950 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -276,7 +276,7 @@ extern unsigned long tcp_memory_pressure; static inline bool tcp_under_memory_pressure(const struct sock *sk) { if (mem_cgroup_sk_enabled(sk) && - mem_cgroup_under_socket_pressure(sk->sk_memcg)) + mem_cgroup_sk_under_memory_pressure(sk)) return true; =20 return READ_ONCE(tcp_memory_pressure); --=20 2.51.0.rc0.205.g4a044479a3-goog From nobody Sun Feb 8 08:21:40 2026 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 60EFD302CC8 for ; Tue, 12 Aug 2025 17:59:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021552; cv=none; b=VQCrtk5oLuHKATSl2fQ1uUztsKK5KNObMGJh/qYTCWu8N25kO34JHFktt8RIkvukq1Pq3NkCdhE0z/hwYpMNZWWL1O2QkG05ngbIlg/zmp5Q1V5ul50QcQ8h0r1+r4+g4KldVzHSkH5UcatffPc3bReNWoh0xiEzjhJeuWETpT8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021552; c=relaxed/simple; bh=6MrgQrtYS9YcOgA8JGsGDbYNAfgLSAk+AgWzk7gDK6w=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=q1qOeSRZFzPGMndqlb1o+KmrwCKKwMhEMxOaPfBKxZmj97KPsH9YCtPuBHvsVMoPJgUU75nM5oVLk5izjKpHh5j8q6EdSLe+/h32ZQCVvX8HHfI6qRykLCbOOEUWIExV62jn3bQYuegzLt671gQ7ZeYF6ONT80LFi7WwMHKK2Js= 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=ah8YblW9; arc=none smtp.client-ip=209.85.210.202 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="ah8YblW9" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-76bca6c73f3so10707526b3a.1 for ; Tue, 12 Aug 2025 10:59:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755021551; x=1755626351; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=1KhRu3fyzeIM1cEVseI3UE0mtgEXOJWM2aq0opP5CZE=; b=ah8YblW9ONO/2DOyzI7ftrvE1CbDI/upObipJipbyRTAzE4bRfB2Tanj/WAmwi6s+E 7oYeoQapXb7FdmwL7BwNntz9f3AXxEHXnPR+5BPFiDR8LbNAuqmi7RbW2Cj9T7WLYj4f RVJobpiA9nFsBRDyZ6wco1s/diWC1WO/YjWucQFNgrR5NtIoqw/rg+8lhsEF2lseCwwu ZlvJ42cQ6rsxVLVa6PiXFS/dBAOnBpsxU+KZPHVhUbg9WUPxy5QCCPyFvQwtR25zzZTm FyLyXxuDNjmAP63dtP/2nVAxqNql65ykEMUDtF48ZDNgCd2It/puGZS6FkyL9Hv1InOu ySRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755021551; x=1755626351; 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=1KhRu3fyzeIM1cEVseI3UE0mtgEXOJWM2aq0opP5CZE=; b=G+fNm6KgwLAe8ON3arXOZdiPgTNEz+r0VG3G6YP/bHCwWvDnBgn947KuJaAkSdq6A+ IhtG1z6nP+iKY++HHkaLl8Upo5ydPwuJtLqK3zJBmM8Yc2E4ruCmkHAgp+mBmQtbdDEv U1Dcqg1TP6ztiC9bqBaz9obRsIwt0Sq5zEMb6qKoYsYkxREMMkDMDAa+8Y/taA2rLp1m 5EMQxXGXlyqplQkQq/dWt7UvzqI/ptNIH2eVZYj1Ovd4Zq8ap3NBH+kiplpBcp6jFprq pxGt7+VejHOh/OsaIcdPPQl+YMrvvSSV15WPFk5M1ZxBQz3R0/2fi8JWX0btIyhVIXno qOXQ== X-Forwarded-Encrypted: i=1; AJvYcCXKfrWpsg+UhLWPxwe+hIXLQ6gFwmVV5HK0Y/6AfN4FiTgsXpLnfWDQ2fA+BujuKyeJ0/vcAg==@lists.linux.dev X-Gm-Message-State: AOJu0YxSl5RtoTudfXTVgSLbICQBWPgOP7Mqv/gC+5wDWaBonsjlgk9F WUun3bdVrGT46RPMGvtcP7yyhQOeQefs46un9n1fvpfOfTCkLZygMI/3AqdLZRiprPeOdiDuQew JalWqow== X-Google-Smtp-Source: AGHT+IF63iH6Z4gy1nQZqVIq3G/a8abCEtoljmxhNBcGHE63GfGOSxTYCt4U1CIor9EBnSEyEuEehfcKfyo= X-Received: from pfblu26.prod.google.com ([2002:a05:6a00:749a:b0:76b:ca57:9538]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:66d6:b0:746:24c9:c92e with SMTP id d2e1a72fcca58-76e20e2515emr199538b3a.8.1755021550862; Tue, 12 Aug 2025 10:59:10 -0700 (PDT) Date: Tue, 12 Aug 2025 17:58:28 +0000 In-Reply-To: <20250812175848.512446-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250812175848.512446-1-kuniyu@google.com> X-Mailer: git-send-email 2.51.0.rc0.205.g4a044479a3-goog Message-ID: <20250812175848.512446-11-kuniyu@google.com> Subject: [PATCH v3 net-next 10/12] net: Define sk_memcg under CONFIG_MEMCG. From: Kuniyuki Iwashima To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Neal Cardwell , Paolo Abeni , Willem de Bruijn , Matthieu Baerts , Mat Martineau , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Andrew Morton , "=?UTF-8?q?Michal=20Koutn=C3=BD?=" , Tejun Heo Cc: Simon Horman , Geliang Tang , Muchun Song , Mina Almasry , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org, mptcp@lists.linux.dev, cgroups@vger.kernel.org, linux-mm@kvack.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Except for sk_clone_lock(), all accesses to sk->sk_memcg is done under CONFIG_MEMCG. As a bonus, let's define sk->sk_memcg under CONFIG_MEMCG. Signed-off-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet --- include/net/sock.h | 2 ++ net/core/sock.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/include/net/sock.h b/include/net/sock.h index 3bc4d566f7d0..1c49ea13af4a 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -443,7 +443,9 @@ struct sock { __cacheline_group_begin(sock_read_rxtx); int sk_err; struct socket *sk_socket; +#ifdef CONFIG_MEMCG struct mem_cgroup *sk_memcg; +#endif #ifdef CONFIG_XFRM struct xfrm_policy __rcu *sk_policy[2]; #endif diff --git a/net/core/sock.c b/net/core/sock.c index 5537ca263858..ab6953d295df 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2512,8 +2512,10 @@ struct sock *sk_clone_lock(const struct sock *sk, co= nst gfp_t priority) =20 sock_reset_flag(newsk, SOCK_DONE); =20 +#ifdef CONFIG_MEMCG /* sk->sk_memcg will be populated at accept() time */ newsk->sk_memcg =3D NULL; +#endif =20 cgroup_sk_clone(&newsk->sk_cgrp_data); =20 @@ -4452,7 +4454,9 @@ static int __init sock_struct_check(void) =20 CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rxtx, sk_err); CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rxtx, sk_socket); +#ifdef CONFIG_MEMCG CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_read_rxtx, sk_memcg); +#endif =20 CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_rxtx, sk_lock); CACHELINE_ASSERT_GROUP_MEMBER(struct sock, sock_write_rxtx, sk_reserved_m= em); --=20 2.51.0.rc0.205.g4a044479a3-goog From nobody Sun Feb 8 08:21:40 2026 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 44C35307ACE for ; Tue, 12 Aug 2025 17:59:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021554; cv=none; b=KWPiNr0lwjydOXVnopLENRdouvAT7+vWh0b75p43Rfn1EcTIWWuHAsVkmb2NWZ0nPko4YOWJ76toFAjUAR52KJkJ1O0XtkXQRx1cYXBhxsXZzH2jr2uzg/JxMJr13adpEjuE5+fEPcol6IZhi1YceH9uL0DFhJyrrPQ9moMEApA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021554; c=relaxed/simple; bh=AzdjAyuAeTtLY2TPo5CDqjmI3gwoVZT9bLy7bQdg2ww=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MVhi7hG8ml1Nb/2S6ppx4+lfOAQ88aopLI6dwC2LdefG2s4gfwcJDNpoLGKlbSGxujd5oTCTCAEbmL2uM2P5k5MVqlftx6yzW3dgRB5XxeOo6JQmOCpi1YJgtrMBoulNZBp5ICXAcVIyXpzN/TobjdzBnNxQrRpPWsNTB40Ub0Y= 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=k1dgM883; arc=none smtp.client-ip=209.85.210.202 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="k1dgM883" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-76bcf2cac36so5410939b3a.0 for ; Tue, 12 Aug 2025 10:59:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755021553; x=1755626353; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ovBhq/8jpHlM6xqUqyu+IoeRpzyccIKyfTNMwGT0Gbo=; b=k1dgM883oUAUAFQiunDQCr8LuztKbtNuz++4TD8CXihJ+a4Fc5gp1vhPvsQM5iyBb+ e9m3hQReBoZoNWbf361UtbbPXRn2b1faWVA/c0xqIXucz8aJdsdNssbHpaVti5C+ejSq M9cSRpusdXWYrXGd7q6KPuC6XEDpsRSq6UA++86MP5Z5BCBHRyF2GdttiKSXAC07QSZE oTRcympGozkz8DRSxGk3ZfwskuJxUOBnUSwZgp4iQmzGyFzqsid0VIpC7p3DGbx9KI+Y cKaRJ7bON/5JFeLEZOx9mnMZ5R+h/Fe84oDgZONVeXusghrDf9KOp5VBPC0tKNOtOXik kKxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755021553; x=1755626353; 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=ovBhq/8jpHlM6xqUqyu+IoeRpzyccIKyfTNMwGT0Gbo=; b=VvMolHkNeRwh+OyV+ftMMCk6NghT1ZSRCIS3i1HKvY2zIMKGBTJyjiVqZetu8LMDGW CszRSeVuAUbYrZ4GLFzsPQCu/CQpmru/tgHBTPtOxzwVpTDTZoj3SALr8zkjszGs0GKN lECOhok5yxQuyjMGPHTxUWuN3Nl0NNRSWjagoFSKD3QSIfuEsbxr9TAe8a6rooxx0eay fKjLyIFqf/W0wBOJ22JABRbnRWEXtonLCvp5xti8tOnTW9cE79B3BGvAQNXlKbu+kwdy yk1DAOaM7ZjKpnbXS0DpYWjwwa6eTsAd6YgH2KJMOwp5NK2E/+UdG4fJUdBouSSDljLp Ls9w== X-Forwarded-Encrypted: i=1; AJvYcCWNi1jTSnSlhiOAjoJSoiEbElncBYVAGV6Ivr2/qWCirOn9WoLrIREL027WxCHaX5bAEnvEqg==@lists.linux.dev X-Gm-Message-State: AOJu0YxxHOynwLxMinBsGLhI3jscn3B/CCDtvyVZ5Q3f8u1OO7SIyMD1 z2KXKnbYkLYHcODEWmwkQ9O07Z4dO2/anKkKiZ1wEuT6hiYzuYBkRMhrCrmB0+J+aP7dG5veKQl iThrFdg== X-Google-Smtp-Source: AGHT+IE5Mz+dp6VV6fNyX45tpzOfL0y24+xxBoFkDHbdJqD0bFXipR3WVQOWKJpZtMRbGnc0JSgega5q8zY= X-Received: from pfmm3.prod.google.com ([2002:a05:6a00:2483:b0:76b:d2d1:119c]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:a8e:b0:76b:e561:9e1b with SMTP id d2e1a72fcca58-76e20c9a3efmr172719b3a.1.1755021552359; Tue, 12 Aug 2025 10:59:12 -0700 (PDT) Date: Tue, 12 Aug 2025 17:58:29 +0000 In-Reply-To: <20250812175848.512446-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250812175848.512446-1-kuniyu@google.com> X-Mailer: git-send-email 2.51.0.rc0.205.g4a044479a3-goog Message-ID: <20250812175848.512446-12-kuniyu@google.com> Subject: [PATCH v3 net-next 11/12] net-memcg: Store MEMCG_SOCK_ISOLATED in sk->sk_memcg. From: Kuniyuki Iwashima To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Neal Cardwell , Paolo Abeni , Willem de Bruijn , Matthieu Baerts , Mat Martineau , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Andrew Morton , "=?UTF-8?q?Michal=20Koutn=C3=BD?=" , Tejun Heo Cc: Simon Horman , Geliang Tang , Muchun Song , Mina Almasry , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org, mptcp@lists.linux.dev, cgroups@vger.kernel.org, linux-mm@kvack.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We will decouple sockets from the global protocol memory accounting if the cgroup's memory.max is not "max" (PAGE_COUNTER_MAX). memory.max can change at any time, so we must snapshot the state for each socket to ensure consistency. Given sk->sk_memcg can be accessed in the fast path, it would be preferable to place the flag field in the same cache line as sk->sk_memcg. However, struct sock does not have such a 1-byte hole. Let's store the flag in the lowest bit of sk->sk_memcg and add a helper to check the bit. In the next patch, if mem_cgroup_sk_isolated() returns true, the socket will not be charged to sk->sk_prot->memory_allocated. Signed-off-by: Kuniyuki Iwashima --- v2: * Set MEMCG_SOCK_ISOLATED based on memory.max instead of a dedicated knob --- include/net/sock.h | 23 ++++++++++++++++++++++- mm/memcontrol.c | 14 ++++++++++++-- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index 1c49ea13af4a..29ba5fdaafd6 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2597,9 +2597,18 @@ static inline gfp_t gfp_memcg_charge(void) } =20 #ifdef CONFIG_MEMCG + +#define MEMCG_SOCK_ISOLATED 1UL +#define MEMCG_SOCK_FLAG_MASK MEMCG_SOCK_ISOLATED +#define MEMCG_SOCK_PTR_MASK ~(MEMCG_SOCK_FLAG_MASK) + static inline struct mem_cgroup *mem_cgroup_from_sk(const struct sock *sk) { - return sk->sk_memcg; + unsigned long val =3D (unsigned long)sk->sk_memcg; + + val &=3D MEMCG_SOCK_PTR_MASK; + + return (struct mem_cgroup *)val; } =20 static inline bool mem_cgroup_sk_enabled(const struct sock *sk) @@ -2607,6 +2616,13 @@ static inline bool mem_cgroup_sk_enabled(const struc= t sock *sk) return mem_cgroup_sockets_enabled && mem_cgroup_from_sk(sk); } =20 +static inline bool mem_cgroup_sk_isolated(const struct sock *sk) +{ + struct mem_cgroup *memcg =3D sk->sk_memcg; + + return (unsigned long)memcg & MEMCG_SOCK_ISOLATED; +} + static inline bool mem_cgroup_sk_under_memory_pressure(const struct sock *= sk) { struct mem_cgroup *memcg =3D mem_cgroup_from_sk(sk); @@ -2634,6 +2650,11 @@ static inline bool mem_cgroup_sk_enabled(const struc= t sock *sk) return false; } =20 +static inline bool mem_cgroup_sk_isolated(const struct sock *sk) +{ + return false; +} + static inline bool mem_cgroup_sk_under_memory_pressure(const struct sock *= sk) { return false; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index d32b7a547f42..cb5b8a9d21db 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4995,6 +4995,16 @@ void mem_cgroup_migrate(struct folio *old, struct fo= lio *new) DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key); EXPORT_SYMBOL(memcg_sockets_enabled_key); =20 +static void mem_cgroup_sk_set(struct sock *sk, const struct mem_cgroup *me= mcg) +{ + unsigned long val =3D (unsigned long)memcg; + + if (READ_ONCE(memcg->memory.max) !=3D PAGE_COUNTER_MAX) + val |=3D MEMCG_SOCK_ISOLATED; + + sk->sk_memcg =3D (struct mem_cgroup *)val; +} + void mem_cgroup_sk_alloc(struct sock *sk) { struct mem_cgroup *memcg; @@ -5013,7 +5023,7 @@ void mem_cgroup_sk_alloc(struct sock *sk) if (!cgroup_subsys_on_dfl(memory_cgrp_subsys) && !memcg1_tcpmem_active(me= mcg)) goto out; if (css_tryget(&memcg->css)) - sk->sk_memcg =3D memcg; + mem_cgroup_sk_set(sk, memcg); out: rcu_read_unlock(); } @@ -5035,7 +5045,7 @@ void mem_cgroup_sk_inherit(const struct sock *sk, str= uct sock *newsk) =20 mem_cgroup_sk_free(newsk); css_get(&memcg->css); - newsk->sk_memcg =3D memcg; + mem_cgroup_sk_set(newsk, memcg); } =20 /** --=20 2.51.0.rc0.205.g4a044479a3-goog From nobody Sun Feb 8 08:21:40 2026 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 B7DEC2FE584 for ; Tue, 12 Aug 2025 17:59:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021556; cv=none; b=dA2bPX4yc9b0CLFOeqY2/+UElGtf3nwnmXh0Orkg6XSjf4l3fyfRmonQPb8c9LUBr/erYdw/PXdxWmiucxtRqrgP9PrS8DHLJMd+DEt4LNGpDXbwvxW5eSpZLf+Jww7ATH33XFqazwQRSLPIdklI0PQ8uFXUSirOTShHUWY26YE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755021556; c=relaxed/simple; bh=ZsDUXB/yvo8uZXixpqGuqcq1s3slWdJ/IT4m8a/kwAY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=j1mOaq1xZUUxuJOqxtp77jojGfuVS2DVxHI1Rge5kAy5F4T2aJDsfc2uTS65XwW5eOpGAmMZgoL1piVM8M6Jdfugh3gziuxrliuOmjSKNJ1pphrboEkddDxR3ZMJj1KJspzVoA5/Ed+XONwgHOghuPf2Ok3/uJrD62pttnqM8Dw= 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=A1KgQioU; arc=none smtp.client-ip=209.85.216.73 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="A1KgQioU" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-31eb41391f3so5676014a91.0 for ; Tue, 12 Aug 2025 10:59:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755021554; x=1755626354; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=12VsIRpu33AswUdPPRoU3ogIBZKRgH8+iMLaTz6mZnM=; b=A1KgQioU8rFu5neaE9bLMBH+E2tuWzIeT74iuNiuxAYSwSsb7qpqUXYQNUEf0IjBqE Sb2tYe+Dzu9K59347NrOqA/uiB242mueV0k7c4moNJjsD4SQbhpXuUDEOMjrCbzokAs4 JfbblQodpVVUtDHhb9yB+DDl8blkIxBe+ZbKl+XLG2p82IO5t6LSrYj0hR6ufmKtpaK/ ORAXfdqayHKHV9aeWkkNheDF/Yyji4qq7MBD9pOYc7maJgzlVMfGLgOtnU7ucSA+JfCn /FAotEi+RmHVDveRtt0QHmv78tesYifNojFTQATAfyMJJzdJ00yMB31KLVAgqSj9S/Ko ay+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755021554; x=1755626354; 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=12VsIRpu33AswUdPPRoU3ogIBZKRgH8+iMLaTz6mZnM=; b=W31tw7AkHp6vAkbcxh/qtN7a+ndxhD58iGs7QUPT7r85CT36p7yeL1CbXTiEL43IVW MXhdd6wOUrVFcKZubiZkmTdOYa759QJTrOaVRIA6HsEzcVgWQDIyf9ONXanLX9vX9FoD gU644Qi4PNz0uJF31StUbY1sZHbwxYOioztFC07ABVJFYfdAeODZ26FARj8SMSZBRDFZ dqTNx/G6S56E2xWX7voUpJiXvOUYvninhtMBkYKMpXqQ4ax3UHkCrzuAq50gRWvlp1GC gwjeUm1T9vQiEbC0NcDjLSOpFhGkuUBqw79tUUNazmYLxjzgsrhjkYN2mSo/weVHG1Aa NMdA== X-Forwarded-Encrypted: i=1; AJvYcCW+5fO8OMwCP+waDDYK2JJ3h1s8j2hbOpsQGD3eyQRJL2ftxnd1sQhD7BQ4bFeIQl489i4Uqg==@lists.linux.dev X-Gm-Message-State: AOJu0Yxndo3FvKeJkCWYNI9iVeJmPasU8nunh3ZwCCqYUQ5rmjdPMmeg ifd/1icNfBwnHCiAQMHstd+xlva5DhtroetkPNTPtLMONy9+ybNyuhT+2K0NnSbE5eJfpq3l3a2 j6f6t/g== X-Google-Smtp-Source: AGHT+IEyIJ3QxWoWnwCUmlvpvFc2sz3YPkZ2Y+XguPdyYnKCZK2UJq098iKz0gqOrCQQVUwpkBAfznuiPeg= X-Received: from pjbsx8.prod.google.com ([2002:a17:90b:2cc8:b0:312:187d:382d]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:3a10:b0:321:38e0:d591 with SMTP id 98e67ed59e1d1-321cf976681mr917108a91.17.1755021554281; Tue, 12 Aug 2025 10:59:14 -0700 (PDT) Date: Tue, 12 Aug 2025 17:58:30 +0000 In-Reply-To: <20250812175848.512446-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250812175848.512446-1-kuniyu@google.com> X-Mailer: git-send-email 2.51.0.rc0.205.g4a044479a3-goog Message-ID: <20250812175848.512446-13-kuniyu@google.com> Subject: [PATCH v3 net-next 12/12] net-memcg: Decouple controlled memcg from global protocol memory accounting. From: Kuniyuki Iwashima To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Neal Cardwell , Paolo Abeni , Willem de Bruijn , Matthieu Baerts , Mat Martineau , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Andrew Morton , "=?UTF-8?q?Michal=20Koutn=C3=BD?=" , Tejun Heo Cc: Simon Horman , Geliang Tang , Muchun Song , Mina Almasry , Kuniyuki Iwashima , Kuniyuki Iwashima , netdev@vger.kernel.org, mptcp@lists.linux.dev, cgroups@vger.kernel.org, linux-mm@kvack.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some protocols (e.g., TCP, UDP) implement memory accounting for socket buffers and charge memory to per-protocol global counters pointed to by sk->sk_proto->memory_allocated. When running under a non-root cgroup, this memory is also charged to the memcg as "sock" in memory.stat. Even when a memcg controls memory usage, sockets of such protocols are still subject to global limits (e.g., /proc/sys/net/ipv4/tcp_mem). This makes it difficult to accurately estimate and configure appropriate global limits, especially in multi-tenant environments. If all workloads were guaranteed to be controlled under memcg, the issue could be worked around by setting tcp_mem[0~2] to UINT_MAX. In reality, this assumption does not always hold, and processes that belong to the root cgroup or opt out of memcg can consume memory up to the global limit, becoming a noisy neighbour. Let's decouple memcg from the global per-protocol memory accounting if it has a finite memory.max (!=3D "max"). We still keep charging memory to memcg and protocol duplicately if memcg has "max" in memory.max because TCP allows only 10% of physical memory by default. This simplifies memcg configuration while keeping the global limits within a reasonable range. If mem_cgroup_sk_isolated(sk) returns true, the per-protocol memory accounting is skipped. In inet_csk_accept(), we need to reclaim counts that are already charged for child sockets because we do not allocate sk->sk_memcg until accept(). Note that trace_sock_exceed_buf_limit() will always show 0 as accounted for the isolated sockets, but this can be obtained via memory.stat. Tested with a script that creates local socket pairs and send()s a bunch of data without recv()ing. Setup: # mkdir /sys/fs/cgroup/test # echo $$ >> /sys/fs/cgroup/test/cgroup.procs # sysctl -q net.ipv4.tcp_mem=3D"1000 1000 1000" Without setting memory.max: # prlimit -n=3D524288:524288 bash -c "python3 pressure.py" & # cat /sys/fs/cgroup/test/memory.stat | grep sock sock 22642688 # ss -tn | head -n 5 State Recv-Q Send-Q Local Address:Port Peer Address:Port ESTAB 2000 0 127.0.0.1:34479 127.0.0.1:53188 ESTAB 2000 0 127.0.0.1:34479 127.0.0.1:49972 ESTAB 2000 0 127.0.0.1:34479 127.0.0.1:53868 ESTAB 2000 0 127.0.0.1:34479 127.0.0.1:53554 # nstat | grep Pressure || echo no pressure TcpExtTCPMemoryPressures 1 0.0 With memory.max: # echo $((64 * 1024 ** 3)) > /sys/fs/cgroup/test/memory.max # prlimit -n=3D524288:524288 bash -c "python3 pressure.py" & # cat /sys/fs/cgroup/test/memory.stat | grep sock sock 2757468160 # ss -tn | head -n 5 State Recv-Q Send-Q Local Address:Port Peer Address:Port ESTAB 111000 0 127.0.0.1:36019 127.0.0.1:49026 ESTAB 110000 0 127.0.0.1:36019 127.0.0.1:45630 ESTAB 110000 0 127.0.0.1:36019 127.0.0.1:44870 ESTAB 111000 0 127.0.0.1:36019 127.0.0.1:45274 # nstat | grep Pressure || echo no pressure no pressure Signed-off-by: Kuniyuki Iwashima --- v3: * Fix build failure for kTLS v2: * Add sk_should_enter_memory_pressure() for tcp_enter_memory_pressure() calls not in core * Update example in changelog --- include/net/proto_memory.h | 15 ++++++-- include/net/tcp.h | 10 ++++-- net/core/sock.c | 64 ++++++++++++++++++++++----------- net/ipv4/inet_connection_sock.c | 18 ++++++++-- net/ipv4/tcp.c | 3 +- net/ipv4/tcp_output.c | 10 ++++-- net/mptcp/protocol.c | 4 ++- net/tls/tls_device.c | 4 ++- 8 files changed, 94 insertions(+), 34 deletions(-) diff --git a/include/net/proto_memory.h b/include/net/proto_memory.h index 8e91a8fa31b5..8e8432b13515 100644 --- a/include/net/proto_memory.h +++ b/include/net/proto_memory.h @@ -31,13 +31,22 @@ static inline bool sk_under_memory_pressure(const struc= t sock *sk) if (!sk->sk_prot->memory_pressure) return false; =20 - if (mem_cgroup_sk_enabled(sk) && - mem_cgroup_sk_under_memory_pressure(sk)) - return true; + if (mem_cgroup_sk_enabled(sk)) { + if (mem_cgroup_sk_under_memory_pressure(sk)) + return true; + + if (mem_cgroup_sk_isolated(sk)) + return false; + } =20 return !!READ_ONCE(*sk->sk_prot->memory_pressure); } =20 +static inline bool sk_should_enter_memory_pressure(struct sock *sk) +{ + return !mem_cgroup_sk_enabled(sk) || !mem_cgroup_sk_isolated(sk); +} + static inline long proto_memory_allocated(const struct proto *prot) { diff --git a/include/net/tcp.h b/include/net/tcp.h index 2936b8175950..0191a4585bba 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -275,9 +275,13 @@ extern unsigned long tcp_memory_pressure; /* optimized version of sk_under_memory_pressure() for TCP sockets */ static inline bool tcp_under_memory_pressure(const struct sock *sk) { - if (mem_cgroup_sk_enabled(sk) && - mem_cgroup_sk_under_memory_pressure(sk)) - return true; + if (mem_cgroup_sk_enabled(sk)) { + if (mem_cgroup_sk_under_memory_pressure(sk)) + return true; + + if (mem_cgroup_sk_isolated(sk)) + return false; + } =20 return READ_ONCE(tcp_memory_pressure); } diff --git a/net/core/sock.c b/net/core/sock.c index ab6953d295df..755540215570 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1046,17 +1046,21 @@ static int sock_reserve_memory(struct sock *sk, int= bytes) if (!charged) return -ENOMEM; =20 - /* pre-charge to forward_alloc */ - sk_memory_allocated_add(sk, pages); - allocated =3D sk_memory_allocated(sk); - /* If the system goes into memory pressure with this - * precharge, give up and return error. - */ - if (allocated > sk_prot_mem_limits(sk, 1)) { - sk_memory_allocated_sub(sk, pages); - mem_cgroup_sk_uncharge(sk, pages); - return -ENOMEM; + if (!mem_cgroup_sk_isolated(sk)) { + /* pre-charge to forward_alloc */ + sk_memory_allocated_add(sk, pages); + allocated =3D sk_memory_allocated(sk); + + /* If the system goes into memory pressure with this + * precharge, give up and return error. + */ + if (allocated > sk_prot_mem_limits(sk, 1)) { + sk_memory_allocated_sub(sk, pages); + mem_cgroup_sk_uncharge(sk, pages); + return -ENOMEM; + } } + sk_forward_alloc_add(sk, pages << PAGE_SHIFT); =20 WRITE_ONCE(sk->sk_reserved_mem, @@ -3153,8 +3157,11 @@ bool sk_page_frag_refill(struct sock *sk, struct pag= e_frag *pfrag) if (likely(skb_page_frag_refill(32U, pfrag, sk->sk_allocation))) return true; =20 - sk_enter_memory_pressure(sk); + if (sk_should_enter_memory_pressure(sk)) + sk_enter_memory_pressure(sk); + sk_stream_moderate_sndbuf(sk); + return false; } EXPORT_SYMBOL(sk_page_frag_refill); @@ -3267,18 +3274,30 @@ int __sk_mem_raise_allocated(struct sock *sk, int s= ize, int amt, int kind) { bool memcg_enabled =3D false, charged =3D false; struct proto *prot =3D sk->sk_prot; - long allocated; - - sk_memory_allocated_add(sk, amt); - allocated =3D sk_memory_allocated(sk); + long allocated =3D 0; =20 if (mem_cgroup_sk_enabled(sk)) { + bool isolated =3D mem_cgroup_sk_isolated(sk); + memcg_enabled =3D true; charged =3D mem_cgroup_sk_charge(sk, amt, gfp_memcg_charge()); - if (!charged) + + if (isolated && charged) + return 1; + + if (!charged) { + if (!isolated) { + sk_memory_allocated_add(sk, amt); + allocated =3D sk_memory_allocated(sk); + } + goto suppress_allocation; + } } =20 + sk_memory_allocated_add(sk, amt); + allocated =3D sk_memory_allocated(sk); + /* Under limit. */ if (allocated <=3D sk_prot_mem_limits(sk, 0)) { sk_leave_memory_pressure(sk); @@ -3357,7 +3376,8 @@ int __sk_mem_raise_allocated(struct sock *sk, int siz= e, int amt, int kind) =20 trace_sock_exceed_buf_limit(sk, prot, allocated, kind); =20 - sk_memory_allocated_sub(sk, amt); + if (allocated) + sk_memory_allocated_sub(sk, amt); =20 if (charged) mem_cgroup_sk_uncharge(sk, amt); @@ -3396,11 +3416,15 @@ EXPORT_SYMBOL(__sk_mem_schedule); */ void __sk_mem_reduce_allocated(struct sock *sk, int amount) { - sk_memory_allocated_sub(sk, amount); - - if (mem_cgroup_sk_enabled(sk)) + if (mem_cgroup_sk_enabled(sk)) { mem_cgroup_sk_uncharge(sk, amount); =20 + if (mem_cgroup_sk_isolated(sk)) + return; + } + + sk_memory_allocated_sub(sk, amount); + if (sk_under_global_memory_pressure(sk) && (sk_memory_allocated(sk) < sk_prot_mem_limits(sk, 0))) sk_leave_memory_pressure(sk); diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_soc= k.c index 0ef1eacd539d..9d56085f7f54 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -22,6 +22,7 @@ #include #include #include +#include =20 #if IS_ENABLED(CONFIG_IPV6) /* match_sk*_wildcard =3D=3D true: IPV6_ADDR_ANY equals to any IPv6 addre= sses @@ -710,7 +711,6 @@ struct sock *inet_csk_accept(struct sock *sk, struct pr= oto_accept_arg *arg) =20 if (mem_cgroup_sockets_enabled) { gfp_t gfp =3D GFP_KERNEL | __GFP_NOFAIL; - int amt =3D 0; =20 /* atomically get the memory usage, set and charge the * newsk->sk_memcg. @@ -719,15 +719,27 @@ struct sock *inet_csk_accept(struct sock *sk, struct = proto_accept_arg *arg) =20 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 =3D sk_mem_pages(newsk->sk_forward_alloc + atomic_read(&newsk->sk_rmem_alloc)); + if (amt) { + /* This amt is already charged globally to + * sk_prot->memory_allocated due to lack of + * sk_memcg until accept(), thus we need to + * reclaim it here if newsk is isolated. + */ + if (mem_cgroup_sk_isolated(newsk)) + sk_memory_allocated_sub(newsk, amt); + + mem_cgroup_sk_charge(newsk, amt, gfp); + } + } =20 - if (amt) - mem_cgroup_sk_charge(newsk, amt, gfp); kmem_cache_charge(newsk, gfp); =20 release_sock(newsk); diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 71a956fbfc55..dcbd49e2f8af 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -908,7 +908,8 @@ struct sk_buff *tcp_stream_alloc_skb(struct sock *sk, g= fp_t gfp, } __kfree_skb(skb); } else { - sk->sk_prot->enter_memory_pressure(sk); + if (sk_should_enter_memory_pressure(sk)) + tcp_enter_memory_pressure(sk); sk_stream_moderate_sndbuf(sk); } return NULL; diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index dfbac0876d96..f7aa86661219 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -3574,12 +3574,18 @@ void sk_forced_mem_schedule(struct sock *sk, int si= ze) delta =3D size - sk->sk_forward_alloc; if (delta <=3D 0) return; + amt =3D sk_mem_pages(delta); sk_forward_alloc_add(sk, amt << PAGE_SHIFT); - sk_memory_allocated_add(sk, amt); =20 - if (mem_cgroup_sk_enabled(sk)) + if (mem_cgroup_sk_enabled(sk)) { mem_cgroup_sk_charge(sk, amt, gfp_memcg_charge() | __GFP_NOFAIL); + + if (mem_cgroup_sk_isolated(sk)) + return; + } + + sk_memory_allocated_add(sk, amt); } =20 /* Send a FIN. The caller locks the socket for us. diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 9a287b75c1b3..1a4089b05a16 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #if IS_ENABLED(CONFIG_MPTCP_IPV6) #include @@ -1016,8 +1017,9 @@ static void mptcp_enter_memory_pressure(struct sock *= sk) mptcp_for_each_subflow(msk, subflow) { struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); =20 - if (first) + if (first && sk_should_enter_memory_pressure(sk)) tcp_enter_memory_pressure(ssk); + sk_stream_moderate_sndbuf(ssk); =20 first =3D false; diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index f672a62a9a52..6696ef837116 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -371,7 +372,8 @@ static int tls_do_allocation(struct sock *sk, if (!offload_ctx->open_record) { if (unlikely(!skb_page_frag_refill(prepend_size, pfrag, sk->sk_allocation))) { - READ_ONCE(sk->sk_prot)->enter_memory_pressure(sk); + if (sk_should_enter_memory_pressure(sk)) + READ_ONCE(sk->sk_prot)->enter_memory_pressure(sk); sk_stream_moderate_sndbuf(sk); return -ENOMEM; } --=20 2.51.0.rc0.205.g4a044479a3-goog