From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 573E630AAD2 for ; Tue, 11 Nov 2025 17:25:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762881911; cv=none; b=NdjpXFO07JEhDwTAqnh3gR43Duvqc5QdXUsFkdIcNU3WOgUtDaWrNN3SdgZgsEmoM7DrNLTZKwEQbLkCNI2jLJleNYKSQW/L8zjigvm6ZS7uAE0okTmTZOSvq9+sOOGxw/RbsL7EA37kzgoYywS8t7enNcTQBIUg7/LDtWn0Mss= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762881911; c=relaxed/simple; bh=r50zJUzdbBubGlh1qOEljQMQ7u6QJoYG21gwIALmWCU=; h=Message-ID:Date:MIME-Version:Subject:To:References:From:Cc: In-Reply-To:Content-Type; b=iTXcrbkbSzFdQ6bSxS/nG4puBOFg5rfDRahGT4LLd5qnaT+HQ5ZbbhER1kEvP9hseLEzcCF0MudLk3EbeQ0WWuIm9MT1K+BHn/W4sHMD0Ns7tFZ2gzze9mGYOyJXhJu7yEgqgUOfhm1TVFsEKKIyPbeyGUY4xuf/qadJKoqDDsE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=i632DiA5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="i632DiA5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14D9DC113D0; Tue, 11 Nov 2025 17:25:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1762881910; bh=r50zJUzdbBubGlh1qOEljQMQ7u6QJoYG21gwIALmWCU=; h=Date:Subject:To:References:From:Cc:In-Reply-To:From; b=i632DiA5OCV8e43qlHBxkJHuxFOuBZhhcCwmxKKEe8cIjFxVvq98q6+mIWuhYVWPt AHImqe4LSvSAzoJq3kqo8GToNotxv5ZgwmEbfgmVJlZTjmNFqfJqME8qap57nOliF/ Uob85+ruFG55WaOQ3fh1xEyy3BJyuCdmIaj/B5TMxGNuaNAd6bvNj4TLI3BwfGl9lz 4oOcDJuwUA1kZdPBYwwBokFelKQ0ye+GFWVeumKr2S8HTEhgl/St/PnxRbcr+KsOQ7 /ZAqufm7LJywBVjlo5zh9Qucq9Yq+Ic2AF7oGWElh31Kvcj/2A4oWefagHkHEPK81k yXCH9K6lne9kg== Message-ID: <61dce5d9-0dac-4c42-af9f-231b537844c4@kernel.org> Date: Tue, 11 Nov 2025 18:25:07 +0100 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta Subject: Re: [PATCH mptcp-net 3/3] mptcp: fix memcg accounting for passive sockets Content-Language: en-GB, fr-BE To: Geliang Tang References: <7d43f35c26a94f22a8e7627f477560ba994efbe7.camel@kernel.org> From: Matthieu Baerts Cc: Paolo Abeni , mptcp@lists.linux.dev Autocrypt: addr=matttbe@kernel.org; keydata= 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 lzVbFe7fduHbABmYz9cefQpO7wDE/Q== Organization: NGI0 Core In-Reply-To: <7d43f35c26a94f22a8e7627f477560ba994efbe7.camel@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hi Geliang, On 11/11/2025 09:37, Geliang Tang wrote: > Hi Paolo, > > Thanks for this fix. > > On Fri, 2025-11-07 at 22:55 +0100, Paolo Abeni wrote: >> The passive sockets never got proper memcg accounting: the msk >> socket is associated with the memcg at accept time, but the >> passive subflows never got it right. >> >> At accept time, traverse the subflows list and associate each of them >> with the msk memcg, and try to do the same at join completion time, >> if >> the msk has been already accepted. >> >> Fixes: cf7da0d66cc1 ("mptcp: Create SUBFLOW socket for incoming >> connections") >> Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/298 >> Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/597 >> Signed-off-by: Paolo Abeni >> --- >>  net/mptcp/protocol.c | 36 ++++++++++++++++++++++++++---------- >>  net/mptcp/protocol.h |  1 + >>  net/mptcp/subflow.c  | 10 ++++++++++ >>  3 files changed, 37 insertions(+), 10 deletions(-) >> >> diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c >> index 34e6bc731085..5e9325c7ea9c 100644 >> --- a/net/mptcp/protocol.c >> +++ b/net/mptcp/protocol.c >> @@ -959,6 +959,8 @@ static bool __mptcp_finish_join(struct mptcp_sock >> *msk, struct sock *ssk) >>   mptcp_subflow_ctx(ssk)->subflow_id = msk->subflow_id++; >>   mptcp_sockopt_sync_locked(msk, ssk); >>   mptcp_stop_tout_timer(sk); >> + __mptcp_inherit_cgrp_data(sk, ssk); >> + __mptcp_inherit_memcg(sk, ssk, GFP_ATOMIC); > > In mptcp_graph_subflows(), these two lines already have the > mem_cgroup_from_sk() check (in the squash-to patch). It's unclear > whether mem_cgroup_from_sk() check needs to be added here too. >From what I understood, no need to check mem_cgroup_from_sk() here: - __mptcp_inherit_cgrp_data() should not depend on that (I think) - __mptcp_inherit_memcg() is doing that via mem_cgroup_sockets_enabled() I *think* the squash-to patch needs some small further modifications, but this series looks good to me. Cheers, Matt -- Sponsored by the NGI0 Core fund.