FAILED: patch "[PATCH] mptcp: pm: only set request_bkup flag when sending MP_PRIO" failed to apply to 5.15-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 5.15-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.15.y
git checkout FETCH_HEAD
git cherry-pick -x 4258b94831bb7ff28ab80e3c8d94db37db930728
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024080704-coconut-decorated-b5ae@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
4258b94831bb ("mptcp: pm: only set request_bkup flag when sending MP_PRIO") f5360e9b314c ("mptcp: introduce and use mptcp_pm_send_ack()") 892f396c8e68 ("mptcp: netlink: issue MP_PRIO signals from userspace PMs") a657430260e5 ("mptcp: Acquire the subflow socket lock before modifying MP_PRIO flags") c21b50d5912b ("mptcp: Avoid acquiring PM lock for subflow priority changes") 702c2f646d42 ("mptcp: netlink: allow userspace-driven subflow establishment") d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE")9ab4807c84a4 ("mptcp: netlink: Add MPTCP_PM_CMD_ANNOUNCE")982f17ba1a25 ("mptcp: netlink: split mptcp_pm_parse_addr into two functions") 8b20137012d9 ("mptcp: read attributes of addr entries managed by userspace PMs") 4638de5aefe5 ("mptcp: handle local addrs announced by userspace PMs") c682bf536cf4 ("mptcp: add pm_nl_pernet helpers")0e203c324752 ("mptcp: reset the packet scheduler on PRIO change") 4cf86ae84c71 ("mptcp: strict local address ID selection")d045b9eb95a9 ("mptcp: introduce implicit endpoints")90d930882139 ("mptcp: constify a bunch of of helpers")33397b83eee6 ("selftests: mptcp: add backup with port testcase") 09f12c3ab7a5 ("mptcp: allow to use port and non-signal in set_flags") 6a0653b96f5d ("selftests: mptcp: add fullmesh setting tests") 73c762c1f07d ("mptcp: set fullmesh flag in pm_netlink")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 4258b94831bb7ff28ab80e3c8d94db37db930728 Mon Sep 17 00:00:00 2001
From: "Matthieu Baerts (NGI0)" <[email protected]>
Date: Sat, 27 Jul 2024 12:01:25 +0200
Subject: [PATCH] mptcp: pm: only set request_bkup flag when sending MP_PRIO
The 'backup' flag from mptcp_subflow_context structure is supposed to be set only when the other peer flagged a subflow as backup, not the opposite.
net/mptcp/pm_netlink.c +0 -1
@@ -471,7 +471,6 @@ static void __mptcp_pm_send_ack(struct mptcp_sock *msk, struct mptcp_subflow_con slow =lock_sock_fast (ssk);if (prio) { subflow->send_mp_prio =1 ; - subflow->backup = backup; subflow->request_bkup = backup; }
Matthieu Baerts (NGI0)
maintainerPATCH 1/1 mptcp: pm: only set request_bkup flag when sending MP_PRIO
commit 4258b94831bb7ff28ab80e3c8d94db37db930728 upstream.
The 'backup' flag from mptcp_subflow_context structure is supposed to be set only when the other peer flagged a subflow as backup, not the opposite.
[ Conflicts in pm_netlink.c, because the commit f5360e9b314c ("mptcp:
introduce and use mptcp_pm_send_ack()") is not in this version. This code is in mptcp_pm_nl_mp_prio_send_ack() instead of in a dedicated helper. The same modification can be applied there. ]
--- net/mptcp/pm_netlink.c | 1 - 1 file changed, 1 deletion(-)
net/mptcp/pm_netlink.c +0 -1
@@ -699,7 +699,6 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,if (subflow->backup != bkup) msk->last_snd =NULL ; - subflow->backup = bkup; subflow->send_mp_prio =1 ; subflow->request_bkup = bkup;__MPTCP_INC_STATS (sock_net (sk),MPTCP_MIB_MPPRIOTX );
Signature · 1 line
2.45.2
Patch "mptcp: pm: only set request_bkup flag when sending MP_PRIO" has been added to the 5.15-stable tree
This is a note to let you know that I've just added the patch titled
mptcp: pm: only set request_bkup flag when sending MP_PRIO
to the 5.15-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-pm-only-set-request_bkup-flag-when-sending-mp_prio.patch
and it can be found in the queue-5.15 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 11:09:00 2024
From: "Matthieu Baerts (NGI0)" <[email protected]>
Date: Fri, 9 Aug 2024 11:08:46 +0200
Subject: mptcp: pm: only set request_bkup flag when sending MP_PRIO
To: [email protected], [email protected]
Cc: MPTCP Upstream <[email protected]>, "Matthieu Baerts (NGI0)" <[email protected]>, Mat Martineau <[email protected]>, Paolo Abeni <[email protected]>
Message-ID: <[email protected]>
From: "Matthieu Baerts (NGI0)" <[email protected]>
commit 4258b94831bb7ff28ab80e3c8d94db37db930728 upstream.
The 'backup' flag from mptcp_subflow_context structure is supposed to be set only when the other peer flagged a subflow as backup, not the opposite.
[ Conflicts in pm_netlink.c, because the commit f5360e9b314c ("mptcp:
introduce and use mptcp_pm_send_ack()") is not in this version. This code is in mptcp_pm_nl_mp_prio_send_ack() instead of in a dedicated helper. The same modification can be applied there. ]
--- net/mptcp/pm_netlink.c | 1 - 1 file changed, 1 deletion(-)
net/mptcp/pm_netlink.c +0 -1
@@ -699,7 +699,6 @@ int mptcp_pm_nl_mp_prio_send_ack(structif (subflow->backup != bkup) msk->last_snd =NULL ; - subflow->backup = bkup; subflow->send_mp_prio =1 ; subflow->request_bkup = bkup;__MPTCP_INC_STATS (sock_net (sk),MPTCP_MIB_MPPRIOTX );
Patches currently in stable-queue which might be from [email protected] are
queue-5.15/mptcp-fix-nl-pm-announced-address-accounting.patch queue-5.15/mptcp-distinguish-rcv-vs-sent-backup-flag-in-requests.patch queue-5.15/mptcp-pm-fix-backup-support-in-signal-endpoints.patch queue-5.15/mptcp-mib-count-mpj-with-backup-flag.patch queue-5.15/selftests-mptcp-join-validate-backup-in-mpj.patch queue-5.15/mptcp-export-local_address.patch queue-5.15/mptcp-pm-only-set-request_bkup-flag-when-sending-mp_prio.patch queue-5.15/mptcp-fix-bad-rcvpruned-mib-accounting.patch