FAILED: patch "[PATCH] mptcp: fix NL PM announced address accounting" failed to apply to 5.10-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 5.10-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-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 4b317e0eb287bd30a1b329513531157c25e8b692
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024080706-omnivore-undermost-43f1@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
4b317e0eb287 ("mptcp: fix NL PM announced address accounting") 6fa0174a7c86 ("mptcp: more careful RM_ADDR generation") 7d9bf018f907 ("selftests: mptcp: update output info of chk_rm_nr") 327b9a94e2a8 ("selftests: mptcp: more stable join tests-cases") 6bb3ab4913e9 ("selftests: mptcp: add MP_FAIL mibs check") f7713dd5d23a ("selftests: mptcp: delete uncontinuous removing ids") 4f49d63352da ("selftests: mptcp: add fullmesh testcases") 0cddb4a6f4e3 ("selftests: mptcp: add deny_join_id0 testcases") af66d3e1c3fa ("selftests: mptcp: enable checksum in mptcp_join.sh") 5e287fe76149 ("selftests: mptcp: remove id 0 address testcases") ef360019db40 ("selftests: mptcp: signal addresses testcases") efd13b71a3fa ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 4b317e0eb287bd30a1b329513531157c25e8b692 Mon Sep 17 00:00:00 2001
From: Paolo Abeni <[email protected]>
Date: Sat, 27 Jul 2024 11:04:00 +0200
Subject: [PATCH] mptcp: fix NL PM announced address accounting
Currently the per connection announced address counter is never decreased. As a consequence, after connection establishment, if the NL PM deletes an endpoint and adds a new/different one, no additional subflow is created for the new endpoint even if the current limits allow that.
Address the issue properly updating the signaled address counter every time the NL PM removes such addresses.
net/mptcp/pm_netlink.c +6 -4
@@ -1401,6 +1401,7 @@ static bool mptcp_pm_remove_anno_addr(struct mptcp_sock *msk, ret =remove_anno_list_by_saddr (msk, addr);if (ret || force) {spin_lock_bh (&msk->pm.lock); + msk->pm.add_addr_signaled -= ret;mptcp_pm_remove_addr (msk, &list);spin_unlock_bh (&msk->pm.lock); }
@@ -1565,17 +1566,18 @@ static void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk,struct mptcp_pm_addr_entry *entry;list_for_each_entry (entry, rm_list, list) { -if (lookup_subflow_by_saddr (&msk->conn_list, &entry->addr) && - slist.nr <MPTCP_RM_IDS_MAX ) +if (slist.nr <MPTCP_RM_IDS_MAX && +lookup_subflow_by_saddr (&msk->conn_list, &entry->addr)) slist.ids[slist.nr++] = entry->addr.id; -if (remove_anno_list_by_saddr (msk, &entry->addr) && - alist.nr <MPTCP_RM_IDS_MAX ) +if (alist.nr <MPTCP_RM_IDS_MAX && +remove_anno_list_by_saddr (msk, &entry->addr)) alist.ids[alist.nr++] = entry->addr.id; }if (alist.nr) {spin_lock_bh (&msk->pm.lock); + msk->pm.add_addr_signaled -= alist.nr;mptcp_pm_remove_addr (msk, &alist);spin_unlock_bh (&msk->pm.lock); }
Matthieu Baerts (NGI0)
maintainerPATCH 1/1 mptcp: fix NL PM announced address accounting
From: Paolo Abeni <[email protected]>
commit 4b317e0eb287bd30a1b329513531157c25e8b692 upstream.
Currently the per connection announced address counter is never decreased. As a consequence, after connection establishment, if the NL PM deletes an endpoint and adds a new/different one, no additional subflow is created for the new endpoint even if the current limits allow that.
Address the issue properly updating the signaled address counter every time the NL PM removes such addresses.
[ Conflicts in pm_netlink.c, because the commit 06faa2271034 ("mptcp:
remove multi addresses and subflows in PM") is not in this version. Only the modification in mptcp_pm_remove_anno_addr() is then needed. ]
--- net/mptcp/pm_netlink.c | 1 + 1 file changed, 1 insertion(+)
net/mptcp/pm_netlink.c +1 -0
@@ -759,6 +759,7 @@ static bool mptcp_pm_remove_anno_addr(struct mptcp_sock *msk, ret =remove_anno_list_by_saddr (msk, addr);if (ret || force) {spin_lock_bh (&msk->pm.lock); + msk->pm.add_addr_signaled -= ret;mptcp_pm_remove_addr (msk, addr->id);spin_unlock_bh (&msk->pm.lock); }
Signature · 1 line
2.45.2
Patch "mptcp: fix NL PM announced address accounting" has been added to the 5.10-stable tree
This is a note to let you know that I've just added the patch titled
mptcp: fix NL PM announced address accounting
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mptcp-fix-nl-pm-announced-address-accounting.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Fri Aug 9 12:55:06 2024
From: "Matthieu Baerts (NGI0)" <[email protected]>
Date: Fri, 9 Aug 2024 12:54:50 +0200
Subject: mptcp: fix NL PM announced address accounting
To: [email protected], [email protected]
Cc: MPTCP Upstream <[email protected]>, Paolo Abeni <[email protected]>, Matthieu Baerts <[email protected]>, "David S . Miller" <[email protected]>
Message-ID: <[email protected]>
From: Paolo Abeni <[email protected]>
commit 4b317e0eb287bd30a1b329513531157c25e8b692 upstream.
Currently the per connection announced address counter is never decreased. As a consequence, after connection establishment, if the NL PM deletes an endpoint and adds a new/different one, no additional subflow is created for the new endpoint even if the current limits allow that.
Address the issue properly updating the signaled address counter every time the NL PM removes such addresses.
[ Conflicts in pm_netlink.c, because the commit 06faa2271034 ("mptcp:
remove multi addresses and subflows in PM") is not in this version. Only the modification in mptcp_pm_remove_anno_addr() is then needed. ]
--- net/mptcp/pm_netlink.c | 1 + 1 file changed, 1 insertion(+)
net/mptcp/pm_netlink.c +1 -0
@@ -759,6 +759,7 @@ static bool mptcp_pm_remove_anno_addr(st ret =remove_anno_list_by_saddr (msk, addr);if (ret || force) {spin_lock_bh (&msk->pm.lock); + msk->pm.add_addr_signaled -= ret;mptcp_pm_remove_addr (msk, addr->id);spin_unlock_bh (&msk->pm.lock); }
Patches currently in stable-queue which might be from [email protected] are
queue-5.10/mptcp-fix-nl-pm-announced-address-accounting.patch queue-5.10/mptcp-distinguish-rcv-vs-sent-backup-flag-in-requests.patch queue-5.10/mptcp-pm-fix-backup-support-in-signal-endpoints.patch queue-5.10/mptcp-mib-count-mpj-with-backup-flag.patch queue-5.10/mptcp-sched-check-both-directions-for-backup.patch queue-5.10/mptcp-export-local_address.patch