FAILED: patch "[PATCH] mptcp: pm: only mark 'subflow' endp as available" failed to apply to 6.1-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 322ea3778965da72862cca2a0c50253aacf65fe6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024082626-citadel-cortex-f8ef@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
322ea3778965 ("mptcp: pm: only mark 'subflow' endp as available") f448451aa62d ("mptcp: pm: remove mptcp_pm_remove_subflow()") ef34a6ea0cab ("mptcp: pm: re-using ID of unused flushed subflows") edd8b5d868a4 ("mptcp: pm: re-using ID of unused removed subflows") 4b317e0eb287 ("mptcp: fix NL PM announced address accounting") 6a09788c1a66 ("mptcp: pm: inc RmAddr MIB counter once per RM_ADDR ID") 9bbec87ecfe8 ("mptcp: unify pm get_local_id interfaces") dc886bce753c ("mptcp: export local_address")8b1c94da1e48 ("mptcp: only send RM_ADDR in nl_cmd_remove")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 322ea3778965da72862cca2a0c50253aacf65fe6 Mon Sep 17 00:00:00 2001
From: "Matthieu Baerts (NGI0)" <[email protected]>
Date: Mon, 19 Aug 2024 21:45:26 +0200
Subject: [PATCH] mptcp: pm: only mark 'subflow' endp as available
Adding the following warning ...
WARN_ON_ONCE(msk->pm.local_addr_used == 0)
... before decrementing the local_addr_used counter helped to find a bug when running the "remove single address" subtest from the mptcp_join.sh selftests.
Removing a 'signal' endpoint will trigger the removal of all subflows linked to this endpoint via mptcp_pm_nl_rm_addr_or_subflow() with rm_type == MPTCP_MIB_RMSUBFLOW. This will decrement the local_addr_used counter, which is wrong in this case because this counter is linked to 'subflow' endpoints, and here it is a 'signal' endpoint that is being removed.
Now, the counter is decremented, only if the ID is being used outside of mptcp_pm_nl_rm_addr_or_subflow(), only for 'subflow' endpoints, and if the ID is not 0 -- local_addr_used is not taking into account these ones. This marking of the ID as being available, and the decrement is done no matter if a subflow using this ID is currently available, because the subflow could have been closed before.
net/mptcp/pm_netlink.c +17 -9
@@ -833,10 +833,10 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk,if (rm_type ==MPTCP_MIB_RMSUBFLOW )__MPTCP_INC_STATS (sock_net (sk), rm_type); } -if (rm_type ==MPTCP_MIB_RMSUBFLOW ) -__set_bit (rm_id ? rm_id : msk->mpc_endpoint_id, msk->pm.id_avail_bitmap); -else if (rm_type ==MPTCP_MIB_RMADDR ) + +if (rm_type ==MPTCP_MIB_RMADDR )__MPTCP_INC_STATS (sock_net (sk), rm_type); +if (!removed)continue ;
@@ -846,8 +846,6 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk,if (rm_type ==MPTCP_MIB_RMADDR ) { msk->pm.add_addr_accepted--;WRITE_ONCE (msk->pm.accept_addr, true); - }else if (rm_type ==MPTCP_MIB_RMSUBFLOW ) { - msk->pm.local_addr_used--; } } }
@@ -1441,6 +1439,14 @@ static bool mptcp_pm_remove_anno_addr(struct mptcp_sock *msk,return ret; } +static void __mark_subflow_endp_available (struct mptcp_sock *msk,u8 id) +{ +/* If it was marked as used, and not ID 0, decrement local_addr_used */ +if (!__test_and_set_bit (id ? : msk->mpc_endpoint_id, msk->pm.id_avail_bitmap) && + id && !WARN_ON_ONCE (msk->pm.local_addr_used ==0 )) + msk->pm.local_addr_used--; +} +static int mptcp_nl_remove_subflow_and_signal_addr (struct net *net,const struct mptcp_pm_addr_entry *entry) {
@@ -1474,11 +1480,11 @@ static int mptcp_nl_remove_subflow_and_signal_addr(struct net *net,spin_lock_bh (&msk->pm.lock);mptcp_pm_nl_rm_subflow_received (msk, &list);spin_unlock_bh (&msk->pm.lock); - }else if (entry->flags &MPTCP_PM_ADDR_FLAG_SUBFLOW ) { -/* If the subflow has been used, but now closed */ + } + +if (entry->flags &MPTCP_PM_ADDR_FLAG_SUBFLOW ) {spin_lock_bh (&msk->pm.lock); -if (!__test_and_set_bit (entry->addr.id, msk->pm.id_avail_bitmap)) - msk->pm.local_addr_used--; +__mark_subflow_endp_available (msk, list.ids[0 ]);spin_unlock_bh (&msk->pm.lock); }
@@ -1516,6 +1522,7 @@ static int mptcp_nl_remove_id_zero_address(struct net *net,spin_lock_bh (&msk->pm.lock);mptcp_pm_remove_addr (msk, &list);mptcp_pm_nl_rm_subflow_received (msk, &list); +__mark_subflow_endp_available (msk,0 );spin_unlock_bh (&msk->pm.lock);release_sock (sk);
@@ -1917,6 +1924,7 @@ static void mptcp_pm_nl_fullmesh(struct mptcp_sock *msk,spin_lock_bh (&msk->pm.lock);mptcp_pm_nl_rm_subflow_received (msk, &list); +__mark_subflow_endp_available (msk, list.ids[0 ]);mptcp_pm_create_subflow_or_signal_addr (msk);spin_unlock_bh (&msk->pm.lock); }