Hi Greg,
On 22/06/2023 11:19, Greg KH wrote:
> On Thu, Jun 22, 2023 at 11:08:52AM +0200, Matthieu Baerts wrote:
>> commit dc97251bf0b70549c76ba261516c01b8096771c5 upstream.
>>
>> Selftests are supposed to run on any kernels, including the old ones not
>> supporting all MPTCP features.
>>
>> One of them is the listen diag dump support introduced by
>> commit 4fa39b701ce9 ("mptcp: listen diag dump support").
>>
>> It looks like there is no good pre-check to do here, i.e. dedicated
>> function available in kallsyms. Instead, we try to get info if nothing
>> is returned, the test is marked as skipped.
>>
>> That's not ideal because something could be wrong with the feature and
>> instead of reporting an error, the test could be marked as skipped. If
>> we know in advanced that the feature is supposed to be supported, the
>> tester can set SELFTESTS_MPTCP_LIB_EXPECT_ALL_FEATURES env var to 1: in
>> this case the test will report an error instead of marking the test as
>> skipped if nothing is returned.
>>
>> Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368
>> Fixes: f2ae0fa68e28 ("selftests/mptcp: add diag listen tests")
>> Cc: stable@xxxxxxxxxxxxxxx
>> Signed-off-by: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
>> Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
>> Signed-off-by: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx>
>> ---
>> Applied on top of stable-rc/linux-6.1.y: 639ecee7e0d3 ("Linux 6.1.36-rc1")
>> Conflicting with commit e04a30f78809 ("selftest: mptcp: add test for
>> mptcp socket in use"): modifications around __chk_msk_nr() have been
>> included here.
>> ---
>> tools/testing/selftests/net/mptcp/diag.sh | 47 ++++++++++++-----------
>> 1 file changed, 24 insertions(+), 23 deletions(-)
>>
>
> Now queued up, thanks.
Thank you for having already queued this patch and all the other ones
from Linus' tree!
I just sent the last patches fixing conflicts in v5.10. I don't have any
others linked to MPTCP and I replied to the ones that don't need to be
backported to older versions than v6.1.
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
