From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.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 2379E248F7D for ; Thu, 14 Aug 2025 20:09:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755202158; cv=none; b=qoQ7bCcIRdvaDQqrMllp+gGxCHyo95MnrG4tYZkfZaQSn2IaJze0TJ8sZYLntzwDoxQw5UJpZFrs8IVd9BPYaZEfI6CqYJ8hE2Lh3QlhCN/vIQzaoPRab8elF7uqq8iIdzYUd+mJSi16Aw5pMeqsFOSTMETzSVP8/hBtCcuZ3U8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755202158; c=relaxed/simple; bh=fvAGsFxK8Q6F6blwPxo2ye39EhyRt1qY7ZzQ7uTcLDE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=T3hwYmqo4ySeudMZc6+0OfBnOzRawl+xqxM+CPjeOMuXxA646SOO31DWk6Vq4iFGuhacroBI6LKwjHthwZFVjCOuSnwuqMs5oiTFZjxjO48xxjf4uapPIlcsdx/zUJV+not2LyLUDiiXKNL1EJ4rziZY0xTDHOxC8r5H9iu8bOM= 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=VanLBnQn; arc=none smtp.client-ip=209.85.214.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="VanLBnQn" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-244581ce13aso23041335ad.2 for ; Thu, 14 Aug 2025 13:09:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755202156; x=1755806956; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=t+lbZziEhh3LGkLKxCxKqhss+KocSzVWnXytm6X5LtU=; b=VanLBnQnx/axgYyQ8ZrJy+zRQcGqMbATrQuDQy5DQHGq7fYNva8q2JJ1mEJfgf9m5w WvSAvBWswkl2alx7Vh5xNK9rGzJb7gmKT3lUb7sC3UhVFGBbLxjFalZ9fmmk5hwphIJG nnoGEQJNMUgyGFvhpGACflKL0QAuX8sPDcRxPPP+tCHf6wvFyASbf0r9RKtfYEuge5jS 5ORXX7PG7+Pscy8mXASIVd6yN1hUZQucKDfq1+s86jBlqE/xzn7eYE2+jl4xZfbmDrd/ z3I7eag80IaPubZ8lGhN1uQbZQrjH2uFIp5Ed6E9r2Q6QliwtWTztZMHo3ifdgjJn3OO D+MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755202156; x=1755806956; h=content-transfer-encoding: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=t+lbZziEhh3LGkLKxCxKqhss+KocSzVWnXytm6X5LtU=; b=PzvU/C2yUZiLownm1wX8k7yfItqTwafrfg5aagmWYTfYNRpMaaAaUeL2/A8Du8CAOW T29K6CXAZJnz3VPkEEde2neQTZMcyrBVKOh12UV33xhLsS5L9BCFg4nP+cra0qp9/pf4 b+XtaU1jxkIeWxcmPlcWFOmiPmznRIYNsW8gZQyWrPAFSnD95BtgpnUY9qgbbGZD7iaH 6AFrcEtVZfvfzaqlyq6Gi4p2XuDo9IFHH50s9b9eM00EhyRg/aU4FMCrRZLbwfP+bhCi F/UAX9EWwXcAx6NCLrMa0juDtxqnUk6quTxBGCR5x/njL+fr9D1sgMtSVWoNx+G4UJx0 vsLg== X-Forwarded-Encrypted: i=1; AJvYcCWmPdKRafDWvT0AqCimz1Xi9qTVWyFxCYECOeJoz2f77WMfBoOIKlr2D1gSnEVMrA2uJ6DQZou7@vger.kernel.org X-Gm-Message-State: AOJu0YwDMyQqITok9YFd0DTM/55OdflYPTgzq0UddBWXbIn9+imUSRM4 APLzNihDVqQHdfCLWu3Op+aVss5MuvYfTpGGWk+BmXOwzDZrYrP2qDk/SBUdEFZm9xZYFLkVJdI 6CBYoag== X-Google-Smtp-Source: AGHT+IHNfSNaLlVBh8qJO1UdhldaL8UMFcUbGeFSWhTNIR6zr5rZyXQBo099O6LvTp4kIOMl2zLxqruoWs8= X-Received: from pjbtd11.prod.google.com ([2002:a17:90b:544b:b0:31f:2a78:943]) (user=kuniyu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e851:b0:235:ed01:18cd with SMTP id d9443c01a7336-2446a3c448emr3523915ad.44.1755202156412; Thu, 14 Aug 2025 13:09:16 -0700 (PDT) Date: Thu, 14 Aug 2025 20:08:33 +0000 In-Reply-To: <20250814200912.1040628-1-kuniyu@google.com> Precedence: bulk X-Mailing-List: cgroups@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250814200912.1040628-1-kuniyu@google.com> X-Mailer: git-send-email 2.51.0.rc1.163.g2494970778-goog Message-ID: <20250814200912.1040628-2-kuniyu@google.com> Subject: [PATCH v4 net-next 01/10] 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-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 wrap sock_create_kern() for subflow with set_active_memcg() using the parent sk->sk_memcg. Fixes: 3764b0c5651e3 ("mptcp: attach subflow socket to parent cgroup") Suggested-by: Michal Koutn=C3=BD Signed-off-by: Kuniyuki Iwashima --- mm/memcontrol.c | 5 ++++- net/mptcp/subflow.c | 11 +++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 8dd7fbed5a94..450862e7fd7a 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5006,8 +5006,11 @@ void mem_cgroup_sk_alloc(struct sock *sk) if (!in_task()) return; =20 + memcg =3D current->active_memcg; + rcu_read_lock(); - memcg =3D mem_cgroup_from_task(current); + if (likely(!memcg)) + memcg =3D mem_cgroup_from_task(current); if (mem_cgroup_is_root(memcg)) goto out; if (!cgroup_subsys_on_dfl(memory_cgrp_subsys) && !memcg1_tcpmem_active(me= mcg)) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 3f1b62a9fe88..a4809054ea6c 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1717,14 +1717,6 @@ 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); @@ -1757,6 +1749,7 @@ int mptcp_subflow_create_socket(struct sock *sk, unsi= gned short family, { struct mptcp_subflow_context *subflow; struct net *net =3D sock_net(sk); + struct mem_cgroup *memcg; struct socket *sf; int err; =20 @@ -1766,7 +1759,9 @@ int mptcp_subflow_create_socket(struct sock *sk, unsi= gned short family, if (unlikely(!sk->sk_socket)) return -EINVAL; =20 + memcg =3D set_active_memcg(sk->sk_memcg); err =3D sock_create_kern(net, family, SOCK_STREAM, IPPROTO_TCP, &sf); + set_active_memcg(memcg); if (err) return err; =20 --=20 2.51.0.rc1.163.g2494970778-goog