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 52DE325A2DE for ; Mon, 14 Apr 2025 08:56:36 +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=1744620997; cv=none; b=o8NLq18DbNpXphhhtFFYN7HbkrR7pgCU2nrByFEHrpMGplZ2GqWubgWjCnTTi55+li64ZDXbhpfVu14kiFNcTypx7UMDDt6BLhbNZkbR8T38fd+zGpYEsZX5IOSpuJmUZKg/p2kbloQStFquZVLEgu9r522szZgYOcgAYjRxzbU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744620997; c=relaxed/simple; bh=CRRBYWM4NJnppTLtoqlGNX1MPkYTRE95L48O+0wL9wE=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Kwu2r6Asl5NStlvs8Li4bG6wwtQapUmrJ0SmZWVvzvz444ge0obUbZnScuMzhWyIviOktnw3k/4PwHoSo0N23uS8zltkpulhC0UiVulHAxtnmOVVUE7zV20bHVShdQgvIflzH9oHJHMyt+XnaXRm1+twy2LMWpwmayYldYvVCSI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Q0f/MFB6; 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="Q0f/MFB6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2EE7DC4CEE2; Mon, 14 Apr 2025 08:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744620996; bh=CRRBYWM4NJnppTLtoqlGNX1MPkYTRE95L48O+0wL9wE=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=Q0f/MFB60OgQV41IyM732dmw67aHClBEePo0ZRLOurfS/5nqgNfbtFguVMUxAfG/N 1Y4NDoUXgbETtCF72fvkNMPSE7GvwyJlrEXPQhMP5wzrigdlcEblsyEYSt/3mBgSbd BFhRgVFQLTYcfstcDg0F24spA/dU7o2o+f40lTV62xvvt+TEWb1SJJlx94a2TMcTz3 LwOC9UThtLK3N6BLyTnOMhz/ka9krTFgeEah03wEcH8mnPQDpkFFrZiIocFxvS2mbq wsN1fUmXtyWx+sQEVwf1aCxVOzql3uEo+AI7ywBkemH/TCT6EemX/cT17ovKFoPLHt XF6UVkxes041w== Message-ID: <5647171d-7b95-4fe9-a5c6-461d178c25ac@kernel.org> Date: Mon, 14 Apr 2025 10:56:34 +0200 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 v2] mptcp: pm: Defer freeing of MPTCP userspace path manager entries Content-Language: en-GB, fr-BE To: Mat Martineau Cc: mptcp@lists.linux.dev References: <20250410224503.2056587-1-martineau@kernel.org> From: Matthieu Baerts Autocrypt: addr=matttbe@kernel.org; keydata= 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 lzVbFe7fduHbABmYz9cefQpO7wDE/Q== Organization: NGI0 Core In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi Mat, On 12/04/2025 02:11, Mat Martineau wrote: > On Fri, 11 Apr 2025, Matthieu Baerts wrote: > >> Hi Mat, >> >> On 11/04/2025 00:44, Mat Martineau wrote: >>> When path manager entries are deleted from the local address list, they >>> are first unlinked from the address list using list_del_rcu(). The >>> entries must not be freed until after the RCU grace period, but the >>> existing code immediately frees the entry. >>> >>> Use kfree_rcu_mightsleep() and adjust sk_omem_alloc in open code instead >>> of using the sock_kfree_s() helper. This code path is only called in a >>> netlink handler, so the "might sleep" function is preferable to adding >>> a rarely-used rcu_head member to struct mptcp_pm_addr_entry. >>> >>> Fixes: 88d097316371 ("mptcp: drop free_list for deleting entries") >>> Signed-off-by: Mat Martineau >>> --- >>> >>> v2: Add comment explaining connection to sock_kfree_s, add "Fixes" tag >> >> Thank you for the v2, and your reply on my previous review. This v2 >> looks good to me: >> >> Reviewed-by: Matthieu Baerts (NGI0) >> >> I guess I should wait to apply "only remove entry from local_addr_list >> when sending a REMOVE_ADDR" series first then, right? Are these other >> patches supposed to be fixes for net? They are not marked as that for >> the moment: in that case, should we add another patch to fix >> mptcp_userspace_pm_delete_local_addr() as well? >> > > I don't think there's any issue or conflict with applying this to > export-net first, it would leave the bug not fixed in > mptcp_userspace_pm_delete_local_addr(). If this patch needs to stand > alone, then it would need to be reworked to add a struct rcu_head to the > local addr entry because mptcp_userspace_pm_delete_local_addr() gets > called in contexts where sleepable calls aren't allowed. Thank you, it makes sense. Now in our tree: New patches for t/upstream-net and t/upstream: - 49746c77f0b1: mptcp: pm: Defer freeing of MPTCP userspace path manager entries - Results: 0142ff39fa9b..ce1452067424 (export-net) - Results: f1e32c11be27..309e5b3a6b32 (export) Tests are now in progress: - export-net: https://github.com/multipath-tcp/mptcp_net-next/commit/cbf7c52183ef1d88ba762839fb579780ff6150e8/checks - export: https://github.com/multipath-tcp/mptcp_net-next/commit/b8b8b4ab98727371e1b3278b18314402cecd8da6/checks > I'll reply separately to v2 of the "only remove entry from > local_addr_list when sending a REMOVE_ADDR" series. Thank you! Cheers, Matt -- Sponsored by the NGI0 Core fund.