Re: [PATCH 5.10 51/84] selftests: mptcp: add ADD_ADDR timeout test case

[Mat Martineau]

On Tue, 5 Jul 2022, Greg Kroah-Hartman wrote:

> On Tue, Jul 05, 2022 at 05:59:22PM +0200, Matthieu Baerts wrote:
> > Hi Greg, Sasha,
> >
> > (+ MPTCP upstream ML)
> >
> > First, thank you again for maintaining the stable branches!
> >
> > On 05/07/2022 13:58, Greg Kroah-Hartman wrote:
> > > From: Geliang Tang <geliangtang@xxxxxxxxx>
> > >
> > > [ Upstream commit 8d014eaa9254a9b8e0841df40dd36782b451579a ]
> > >
> > > This patch added the test case for retransmitting ADD_ADDR when timeout
> > > occurs. It set NS1's add_addr_timeout to 1 second, and drop NS2's ADD_ADDR
> > > echo packets.
> > TL;DR: Could it be possible to drop all selftests MPTCP patches from
> > v5.10 queue please?
> >
> >
> > I was initially reacting on this patch because it looks like it depends on:
> >
> >   93f323b9cccc ("mptcp: add a new sysctl add_addr_timeout")
> >
> > and indirectly to:
> >
> >   9ce7deff92e8 ("docs: networking: mptcp: Add MPTCP sysctl entries")
> >
> > to have "net.mptcp.add_addr_timeout" sysctl knob needed for this new
> > selftest.
> >
> > But then I tried to understand why this current patch ("selftests:
> > mptcp: add ADD_ADDR timeout test case") has been selected for 5.10. I
> > guess it was to ease the backport of another one, right?
> > Looking at the 'series' file in 5.10 queue, it seems the new
> > "selftests-mptcp-more-stable-diag-tests" patch requires 5 other patches:
> >
> > -> selftests-mptcp-more-stable-diag-tests.patch
> >  -> selftests-mptcp-fix-diag-instability.patch
> >   -> selftests-mptcp-launch-mptcp_connect-with-timeout.patch
> >    -> selftests-mptcp-add-add_addr-ipv6-test-cases.patch
> >     -> selftests-mptcp-add-link-failure-test-case.patch
> >      -> selftests-mptcp-add-add_addr-timeout-test-case.patch
> >
> >
> > When looking at these patches in more detail, it looks like "selftests:
> > mptcp: add ADD_ADDR IPv6 test cases" depends on a new feature only
> > available from v5.11: ADD_ADDR for IPv6.
> >
> >
> > Could it be possible to drop all these patches from v5.10 then please?
>
> Sure, but leave them in for 5.15.y and 5.18.y?

Hi Greg -

I'm the other MPTCP maintainer, jumping in here due to Matt's time zone.

Yes: leave selftests-mptcp-more-stable-diag-tests.patch in 5.15.y and 
5.18.y

--
Mat Martineau
Intel