Hi Greg, On 22/06/2023 10:00, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > The 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 <stable@xxxxxxxxxxxxxxx>. (...) > ------------------ original commit in Linus's tree ------------------ > > From 4a0b866a3f7d3c22033f40e93e94befc6fe51bce Mon Sep 17 00:00:00 2001 > From: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx> > Date: Sat, 10 Jun 2023 18:11:40 +0200 > Subject: [PATCH] selftests: mptcp: join: skip test if iptables/tc cmds fail > > Selftests are supposed to run on any kernels, including the old ones not > supporting all MPTCP features. > > Some tests are using IPTables and/or TC commands to force some > behaviours. If one of these commands fails -- likely because some > features are not available due to missing kernel config -- we should > intercept the error and skip the tests requiring these features. > > Note that if we expect to have these features available and if > SELFTESTS_MPTCP_LIB_EXPECT_ALL_FEATURES env var is set to 1, the tests > will be marked as failed instead of skipped. > > This patch also replaces the 'exit 1' by 'return 1' not to stop the > selftest in the middle without the conclusion if there is an issue with > NF or TC. > > Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368 > Fixes: 8d014eaa9254 ("selftests: mptcp: add ADD_ADDR timeout test case") > Cc: stable@xxxxxxxxxxxxxxx > Signed-off-by: Matthieu Baerts <matthieu.baerts@xxxxxxxxxxxx> > Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx> Thank you for this notification! We don't need to backport this commit 4a0b866a3f7d ("selftests: mptcp: join: skip test if iptables/tc cmds fail"): it depends on a feature introduced in commit ae7bd9ccecc3 ("selftests: mptcp: join: option to execute specific tests") and we don't want to backport this. Also, this fix here is mainly useful for the last stable version: I guess people will likely not take the selftests version from v5.15.y and run them on older kernels. They will more likely take the selftests from the last stable version (or the same version as the kernel one). So no need to do anything here. Cheers, Matt -- Tessares | Belgium | Hybrid Access Solutions www.tessares.net
