From: Matthieu Baerts <matthieu.baerts@tessares.net>
To: mptcp@lists.linux.dev, Mat Martineau <martineau@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Shuah Khan <shuah@kernel.org>,
Florian Westphal <fw@strlen.de>,
Davide Caratti <dcaratti@redhat.com>,
Christoph Paasch <cpaasch@apple.com>,
Geliang Tang <geliangtang@gmail.com>,
Geliang Tang <geliang.tang@suse.com>
Cc: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org,
linux-kernel@vger.kernel.org, bpf@vger.kernel.org,
Matthieu Baerts <matthieu.baerts@tessares.net>,
stable@vger.kernel.org
Subject: [PATCH net 02/17] selftests: mptcp: join: use 'iptables-legacy' if available
Date: Sat, 10 Jun 2023 18:11:37 +0200 [thread overview]
Message-ID: <20230609-upstream-net-20230610-mptcp-selftests-support-old-kernels-part-3-v1-2-2896fe2ee8a3@tessares.net> (raw)
In-Reply-To: <20230609-upstream-net-20230610-mptcp-selftests-support-old-kernels-part-3-v1-0-2896fe2ee8a3@tessares.net>
IPTables commands using 'iptables-nft' fail on old kernels, at least
5.15 because it doesn't see the default IPTables chains:
$ iptables -L
iptables/1.8.2 Failed to initialize nft: Protocol not supported
As a first step before switching to NFTables, we can use iptables-legacy
if available.
Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368
Fixes: 8d014eaa9254 ("selftests: mptcp: add ADD_ADDR timeout test case")
Cc: stable@vger.kernel.org
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
tools/testing/selftests/net/mptcp/mptcp_join.sh | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 29f0c99d9a46..74cc8a74a9d6 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -25,6 +25,8 @@ capout=""
ns1=""
ns2=""
ksft_skip=4
+iptables="iptables"
+ip6tables="ip6tables"
timeout_poll=30
timeout_test=$((timeout_poll * 2 + 1))
capture=0
@@ -146,7 +148,11 @@ check_tools()
exit $ksft_skip
fi
- if ! iptables -V &> /dev/null; then
+ # Use the legacy version if available to support old kernel versions
+ if iptables-legacy -V &> /dev/null; then
+ iptables="iptables-legacy"
+ ip6tables="ip6tables-legacy"
+ elif ! iptables -V &> /dev/null; then
echo "SKIP: Could not run all tests without iptables tool"
exit $ksft_skip
fi
@@ -247,9 +253,9 @@ reset_with_add_addr_timeout()
reset "${1}" || return 1
- tables="iptables"
+ tables="${iptables}"
if [ $ip -eq 6 ]; then
- tables="ip6tables"
+ tables="${ip6tables}"
fi
ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=1
@@ -314,9 +320,9 @@ reset_with_fail()
local ip="${3:-4}"
local tables
- tables="iptables"
+ tables="${iptables}"
if [ $ip -eq 6 ]; then
- tables="ip6tables"
+ tables="${ip6tables}"
fi
ip netns exec $ns2 $tables \
@@ -704,7 +710,7 @@ filter_tcp_from()
local src="${2}"
local target="${3}"
- ip netns exec "${ns}" iptables -A INPUT -s "${src}" -p tcp -j "${target}"
+ ip netns exec "${ns}" ${iptables} -A INPUT -s "${src}" -p tcp -j "${target}"
}
do_transfer()
--
2.40.1
next prev parent reply other threads:[~2023-06-10 16:11 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-10 16:11 [PATCH net 00/17] selftests: mptcp: skip tests not supported by old kernels (part 3) Matthieu Baerts
2023-06-10 16:11 ` [PATCH net 01/17] selftests: mptcp: lib: skip if not below kernel version Matthieu Baerts
2023-06-13 0:00 ` patchwork-bot+netdevbpf
2023-06-10 16:11 ` Matthieu Baerts [this message]
2023-06-10 16:11 ` [PATCH net 03/17] selftests: mptcp: join: helpers to skip tests Matthieu Baerts
2023-06-10 16:11 ` [PATCH net 04/17] selftests: mptcp: join: skip check if MIB counter not supported Matthieu Baerts
2023-06-10 16:11 ` [PATCH net 05/17] selftests: mptcp: join: skip test if iptables/tc cmds fail Matthieu Baerts
2023-06-10 16:11 ` [PATCH net 06/17] selftests: mptcp: join: support local endpoint being tracked or not Matthieu Baerts
2023-06-10 16:11 ` [PATCH net 07/17] selftests: mptcp: join: skip Fastclose tests if not supported Matthieu Baerts
2023-06-10 16:11 ` [PATCH net 08/17] selftests: mptcp: join: support RM_ADDR for used endpoints or not Matthieu Baerts
2023-06-10 16:11 ` [PATCH net 09/17] selftests: mptcp: join: skip implicit tests if not supported Matthieu Baerts
2023-06-10 16:11 ` [PATCH net 10/17] selftests: mptcp: join: skip backup if set flag on ID " Matthieu Baerts
2023-06-10 16:11 ` [PATCH net 11/17] selftests: mptcp: join: skip fullmesh flag tests if " Matthieu Baerts
2023-06-10 16:11 ` [PATCH net 12/17] selftests: mptcp: join: skip userspace PM " Matthieu Baerts
2023-06-10 16:11 ` [PATCH net 13/17] selftests: mptcp: join: skip fail " Matthieu Baerts
2023-06-10 16:11 ` [PATCH net 14/17] selftests: mptcp: join: skip MPC backups " Matthieu Baerts
2023-06-10 16:11 ` [PATCH net 15/17] selftests: mptcp: join: skip PM listener " Matthieu Baerts
2023-06-10 16:11 ` [PATCH net 16/17] selftests: mptcp: join: uniform listener tests Matthieu Baerts
2023-06-10 16:11 ` [PATCH net 17/17] selftests: mptcp: join: skip mixed tests if not supported Matthieu Baerts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230609-upstream-net-20230610-mptcp-selftests-support-old-kernels-part-3-v1-2-2896fe2ee8a3@tessares.net \
--to=matthieu.baerts@tessares.net \
--cc=bpf@vger.kernel.org \
--cc=cpaasch@apple.com \
--cc=davem@davemloft.net \
--cc=dcaratti@redhat.com \
--cc=edumazet@google.com \
--cc=fw@strlen.de \
--cc=geliang.tang@suse.com \
--cc=geliangtang@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martineau@kernel.org \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shuah@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).