Re: [PATCH mptcp-next 1/6] mptcp: fix local endpoint acconting.

[Mat Martineau <mathew.j.martineau@linux.intel.com>]

On Fri, 1 Jul 2022, Paolo Abeni wrote:

> In mptcp_pm_nl_rm_addr_or_subflow() we always mark as availble
> the id corresponding to the just removed address.
>
> The used bitmap actually tracks only the local IDs: we must
> restrict the operation when a (local) subflow is removed.
>
> Fixes: a88c9e496937 ("mptcp: do not block subflows creation on errors")
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>

Looks good to me. Ok to apply this one to the net branch, separate from 
the rest of the series?


For this single patch:
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>

> ---
> net/mptcp/pm_netlink.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index 0a295acf99b8..f1909006a859 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -800,7 +800,8 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk,
> 			removed = true;
> 			__MPTCP_INC_STATS(sock_net(sk), rm_type);
> 		}
> -		__set_bit(rm_list->ids[i], msk->pm.id_avail_bitmap);
> +		if (rm_type == MPTCP_MIB_RMSUBFLOW)
> +			__set_bit(rm_list->ids[i], msk->pm.id_avail_bitmap);
> 		if (!removed)
> 			continue;
>
> -- 
> 2.35.3
>
>
>

--
Mat Martineau
Intel