FAILED: patch "[PATCH] selftests: mptcp: pm nl: remove hardcoded default limits" failed to apply to 5.4-stable tree

FAILED: patch "[PATCH] selftests: mptcp: pm nl: remove hardcoded default limits" failed to apply to 5.4-stable tree

[gregkh]

The patch below does not apply to the 5.4-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 <stable@vger.kernel.org>.

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.4.y
git checkout FETCH_HEAD
git cherry-pick -x 2177d0b08e421971e035672b70f3228d9485c650
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2023062218-porous-squiggle-d837@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..

Possible dependencies:



thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 2177d0b08e421971e035672b70f3228d9485c650 Mon Sep 17 00:00:00 2001
From: Matthieu Baerts <matthieu.baerts@tessares.net>
Date: Thu, 8 Jun 2023 18:38:49 +0200
Subject: [PATCH] selftests: mptcp: pm nl: remove hardcoded default limits

Selftests are supposed to run on any kernels, including the old ones not
supporting all MPTCP features.

One of them is the checks of the default limits returned by the MPTCP
in-kernel path-manager. The default values have been modified by commit
72bcbc46a5c3 ("mptcp: increase default max additional subflows to 2").
Instead of comparing with hardcoded values, we can get the default one
and compare with them.

Note that if we expect to have the latest version, we continue to check
the hardcoded values to avoid unexpected behaviour changes.

Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368
Fixes: eedbc685321b ("selftests: add PM netlink functional tests")
Cc: stable@vger.kernel.org
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testing/selftests/net/mptcp/pm_netlink.sh
index 32f7533e0919..664cafc60705 100755
--- a/tools/testing/selftests/net/mptcp/pm_netlink.sh
+++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh
@@ -73,8 +73,12 @@ check()
 }
 
 check "ip netns exec $ns1 ./pm_nl_ctl dump" "" "defaults addr list"
-check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 0
+
+default_limits="$(ip netns exec $ns1 ./pm_nl_ctl limits)"
+if mptcp_lib_expect_all_features; then
+	check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 0
 subflows 2" "defaults limits"
+fi
 
 ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1
 ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.2 flags subflow dev lo
@@ -121,12 +125,10 @@ ip netns exec $ns1 ./pm_nl_ctl flush
 check "ip netns exec $ns1 ./pm_nl_ctl dump" "" "flush addrs"
 
 ip netns exec $ns1 ./pm_nl_ctl limits 9 1
-check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 0
-subflows 2" "rcv addrs above hard limit"
+check "ip netns exec $ns1 ./pm_nl_ctl limits" "$default_limits" "rcv addrs above hard limit"
 
 ip netns exec $ns1 ./pm_nl_ctl limits 1 9
-check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 0
-subflows 2" "subflows above hard limit"
+check "ip netns exec $ns1 ./pm_nl_ctl limits" "$default_limits" "subflows above hard limit"
 
 ip netns exec $ns1 ./pm_nl_ctl limits 8 8
 check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 8

Re: FAILED: patch "[PATCH] selftests: mptcp: pm nl: remove hardcoded default limits" failed to apply to 5.4-stable tree

[Matthieu Baerts]

Hi Greg,

On 22/06/2023 09:57, gregkh@linuxfoundation.org wrote:
> 
> The patch below does not apply to the 5.4-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 <stable@vger.kernel.org>.
> 
> To reproduce the conflict and resubmit, you may use the following commands:

(...)

> ------------------ original commit in Linus's tree ------------------
> 
> From 2177d0b08e421971e035672b70f3228d9485c650 Mon Sep 17 00:00:00 2001
> From: Matthieu Baerts <matthieu.baerts@tessares.net>
> Date: Thu, 8 Jun 2023 18:38:49 +0200
> Subject: [PATCH] selftests: mptcp: pm nl: remove hardcoded default limits
> 
> Selftests are supposed to run on any kernels, including the old ones not
> supporting all MPTCP features.
> 
> One of them is the checks of the default limits returned by the MPTCP
> in-kernel path-manager. The default values have been modified by commit
> 72bcbc46a5c3 ("mptcp: increase default max additional subflows to 2").
> Instead of comparing with hardcoded values, we can get the default one
> and compare with them.
> 
> Note that if we expect to have the latest version, we continue to check
> the hardcoded values to avoid unexpected behaviour changes.
> 
> Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368
> Fixes: eedbc685321b ("selftests: add PM netlink functional tests")

Thank you for this notification!

I'm not sure why this patch got picked up for v5.4-stable tree because
it is fixing code that is not in v5.4 but introduced in v5.7. The commit
mentioned here above has not been backported in v5.4. That seems to be
confirmed by:

  https://kernel.dance/#eedbc685321b

So no need to do anything here.

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

Re: FAILED: patch "[PATCH] selftests: mptcp: pm nl: remove hardcoded default limits" failed to apply to 5.4-stable tree

[Greg KH]

On Thu, Jun 22, 2023 at 03:38:45PM +0200, Matthieu Baerts wrote:
> Hi Greg,
> 
> On 22/06/2023 09:57, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 5.4-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 <stable@vger.kernel.org>.
> > 
> > To reproduce the conflict and resubmit, you may use the following commands:
> 
> (...)
> 
> > ------------------ original commit in Linus's tree ------------------
> > 
> > From 2177d0b08e421971e035672b70f3228d9485c650 Mon Sep 17 00:00:00 2001
> > From: Matthieu Baerts <matthieu.baerts@tessares.net>
> > Date: Thu, 8 Jun 2023 18:38:49 +0200
> > Subject: [PATCH] selftests: mptcp: pm nl: remove hardcoded default limits
> > 
> > Selftests are supposed to run on any kernels, including the old ones not
> > supporting all MPTCP features.
> > 
> > One of them is the checks of the default limits returned by the MPTCP
> > in-kernel path-manager. The default values have been modified by commit
> > 72bcbc46a5c3 ("mptcp: increase default max additional subflows to 2").
> > Instead of comparing with hardcoded values, we can get the default one
> > and compare with them.
> > 
> > Note that if we expect to have the latest version, we continue to check
> > the hardcoded values to avoid unexpected behaviour changes.
> > 
> > Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368
> > Fixes: eedbc685321b ("selftests: add PM netlink functional tests")
> 
> Thank you for this notification!
> 
> I'm not sure why this patch got picked up for v5.4-stable tree because
> it is fixing code that is not in v5.4 but introduced in v5.7. The commit
> mentioned here above has not been backported in v5.4. That seems to be
> confirmed by:
> 
>   https://kernel.dance/#eedbc685321b
> 
> So no need to do anything here.

Yes, my fault, I sent out too many "this failed" messages for some of
these, sorry about that.

greg k-h