* [MPTCP] Re: [MPTCP][PATCH v2 mptcp-next] Squash to "mptcp: remove id 0 address"
@ 2021-03-16 22:23 Mat Martineau
0 siblings, 0 replies; 2+ messages in thread
From: Mat Martineau @ 2021-03-16 22:23 UTC (permalink / raw)
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 1149 bytes --]
On Tue, 16 Mar 2021, Geliang Tang wrote:
> Hold msk->pm.lock when invoking mptcp_pm_remove_addr.
>
> Signed-off-by: Geliang Tang <geliangtang(a)gmail.com>
> ---
> v2:
> - use mptcp_pm_nl_rm_subflow_received instead of
> mptcp_pm_remove_subflow.
Thanks Geliang! v2 looks good to squash.
Mat
> ---
> net/mptcp/pm_netlink.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index c73b7cfc7ae9..f9606934104d 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -1185,8 +1185,10 @@ static int mptcp_nl_remove_id_zero_address(struct net *net,
> goto next;
>
> lock_sock(sk);
> + spin_lock_bh(&msk->pm.lock);
> mptcp_pm_remove_addr(msk, &list);
> - mptcp_pm_remove_subflow(msk, &list);
> + mptcp_pm_nl_rm_subflow_received(msk, &list);
> + spin_unlock_bh(&msk->pm.lock);
> release_sock(sk);
>
> next:
> --
> 2.30.2
> _______________________________________________
> mptcp mailing list -- mptcp(a)lists.01.org
> To unsubscribe send an email to mptcp-leave(a)lists.01.org
>
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 2+ messages in thread
* [MPTCP] Re: [MPTCP][PATCH v2 mptcp-next] Squash to "mptcp: remove id 0 address"
@ 2021-03-17 10:35 Matthieu Baerts
0 siblings, 0 replies; 2+ messages in thread
From: Matthieu Baerts @ 2021-03-17 10:35 UTC (permalink / raw)
To: mptcp
[-- Attachment #1: Type: text/plain, Size: 463 bytes --]
Hi Geliang, Mat,
On 16/03/2021 06:18, Geliang Tang wrote:
> Hold msk->pm.lock when invoking mptcp_pm_remove_addr.
>
> Signed-off-by: Geliang Tang <geliangtang(a)gmail.com>
Thank you for the patch and the review!
Now in our tree:
- 03d95186eb42: "squashed" in "mptcp: remove id 0 address"
- Results: 19f890a6dd32..a4aed0922265
Tests + export are in progress!
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-17 10:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-16 22:23 [MPTCP] Re: [MPTCP][PATCH v2 mptcp-next] Squash to "mptcp: remove id 0 address" Mat Martineau
2021-03-17 10:35 Matthieu Baerts
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).