From nobody Mon Feb 9 12:29:43 2026 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2840B8489 for ; Thu, 27 Jul 2023 08:45:45 +0000 (UTC) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-3fbc12181b6so7594455e9.2 for ; Thu, 27 Jul 2023 01:45:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1690447544; x=1691052344; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SPg4eSQOn2RRpb0GruSim2/Tji/I9NO1lbHKuNPLzyE=; b=Li+xQYt8l7QZBRrN3JoDoMNPXHcdxRSqO+ouZDeAm1gpTN0+Tz8MuEpp0q0ZmLjR/o 5Po1Z5CUDBijBy8vaj5nX/m1R9yw2loQVkq0SNRTLVk6oQqfaBvrqDwjwPiijAmPCdzN bI6/hGI3nFxgA6Jxwiq5J++IDKYnh2dFA1sbLbAID/a/bZnfVYXd2CLM8Ikx8iuaHw98 UbNXP99j80XwQ04fIipyXmpP9rl6VpIAiBBgz1fbFGd2SBRmZdDpF7zdUXSsdaRreeX5 9+juHOCtZlT14qqv3+taomaFVdqg7xtHQ/ILTXxv4Areufv/zzdimPlgu3EXySyksTJI //SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690447544; x=1691052344; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SPg4eSQOn2RRpb0GruSim2/Tji/I9NO1lbHKuNPLzyE=; b=hPy8tCLBsVRztHSuwV7wXVy66xegajaMphuVRHOmflz7v5k2fuaPE1X6dw/CRNwzs8 8Ry4Vg8OiEE54RfcX8x0kCIPT6z0xJi4ad7c1LDPxp+09IoycmXnfuYHVMkALzH8AGNG tjEV7TXDDMcD5oikwr9XZKFbCCvUsPiIfnx02VaceFSFB++TfrgaX0mCHqqx2bfKbh6M 72xPUwGCV7upIHRMxskW+EXEoEJ/lFSJmOwUrpNyJPi35BTThBO07RZBaXmzg+QCdJaF PrFuHg/sq4BkTtqSHl86AxJxtCnSYIQxd9lxmchZbFnjlYunLwYDZ94ev1t7mFP/Lwww HBJw== X-Gm-Message-State: ABy/qLYzHczmSpvnD+BKxg6LTYi68OfVC9wODXvOo/RoVouh32anWN5c pq+X0sI6fbXlGhpjRdtYsLNlNQ== X-Google-Smtp-Source: APBJJlHAJk0T2S0aguib7Zc0XdepjlyrQbmzro3/9o1h0bqMPXQ5c9h/HyRDtxYLkWKPrtEO1j4TGA== X-Received: by 2002:adf:ef05:0:b0:315:7d2f:fc36 with SMTP id e5-20020adfef05000000b003157d2ffc36mr1232975wro.20.1690447543624; Thu, 27 Jul 2023 01:45:43 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id u13-20020a5d514d000000b003172510d19dsm1352429wrt.73.2023.07.27.01.45.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 01:45:43 -0700 (PDT) From: Matthieu Baerts To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: MPTCP Upstream , Matthieu Baerts , Paolo Abeni , "David S . Miller" Subject: [PATCH 5.15.y] selftests: mptcp: sockopt: use 'iptables-legacy' if available Date: Thu, 27 Jul 2023 10:45:22 +0200 Message-Id: <20230727084522.2035300-1-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <2023072145-cardigan-stinger-9c9a@gregkh> References: <2023072145-cardigan-stinger-9c9a@gregkh> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2796; i=matthieu.baerts@tessares.net; h=from:subject; bh=+k9lBRyH4O2eIEt1+k+jsFkebCcN3ieBWl9B9paW6Vw=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkwi6iyLFg36SA7RH/ecHEMjpah7erAQZtpBoAK KobR5U/8HmJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZMIuogAKCRD2t4JPQmmg cwyqD/4p/B9Z4iLbxgyDMgNZyvM8aTKKE5Dsepdy7z3+N5Xzy60hPp7oMGo0SsVIJnA1GriOdPz lue7Qdd4Z8CxF18pb+AcX1OvJaIgM72xwu4+iUssT9DzwY6bQp5Mw4+MXG8gRc7e/BKo0Y94rVJ TSAaCb+fiatH4oIytgZ8eikGsYDXE+/YGxWhNlORtsmRuxhcltlk0QYnusE6m16m8GCSvv8zM/a LoMVJwyWCgf2rc4gM+H+F/ne4F1n0HrBomc/0tnQaUbm8qvC7oI32IyqBY6B0LXg+but7p5uzU7 gI1U/PJPgW+Qq01GaCn27bHMxLI3f4an9pBeww8pAchFHIm2ToiDq/thnr3sti3AB3kWABnzatf ++Vhvl2yXndOB2wFnfjEMJnjjKTAN5i+vLo5jI35HkrYzZBWEA9J4jlQMbRD8CVUuQmTOhPNzwa bWPALfbJECreep3E3XzKP+CPTxuYkmVxsbZvn8CBQtkP1jpKCi5SaCQ+Ld/ffJ3ag4iJ8gWpYse 1stuHNBeN/7nXsesCig2cHaQGVwRbKJjsPOgMG1hbVpZ3y+QrtF1Da0i6vKchhNMBTuhAYvaaH0 qNCULKQVm4FApsXvc5os8/CXTOaH8iDJlIsSVRPFNqXzRapQAKbsdcGUpfgYwxvNttmTxQQc4Ve lyN68VZuMB5pzUQ== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" commit a5a5990c099dd354e05e89ee77cd2dbf6655d4a1 upstream. IPTables commands using 'iptables-nft' fail on old kernels, at least on v5.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: dc65fe82fb07 ("selftests: mptcp: add packet mark test case") Cc: stable@vger.kernel.org Acked-by: Paolo Abeni Signed-off-by: Matthieu Baerts Signed-off-by: David S. Miller Signed-off-by: Matthieu Baerts --- Backport notes: - it was conflicting with some cleanup patches: b71dd705179c ("selftests: mptcp: removed defined but unused vars") and 5f17f8e315ad ("selftests: mptcp: declare var as local") - conflicts were in the same context but not with the code that needed to be adapted. --- .../selftests/net/mptcp/mptcp_sockopt.sh | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index d5c79e4a8f1e..3432d11e0a03 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -13,13 +13,15 @@ timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) mptcp_connect=3D"" do_all_tests=3D1 +iptables=3D"iptables" +ip6tables=3D"ip6tables" =20 add_mark_rules() { local ns=3D$1 local m=3D$2 =20 - for t in iptables ip6tables; do + for t in ${iptables} ${ip6tables}; do # just to debug: check we have multiple subflows connection requests ip netns exec $ns $t -A OUTPUT -p tcp --syn -m mark --mark $m -j ACCEPT =20 @@ -90,14 +92,14 @@ if [ $? -ne 0 ];then exit $ksft_skip fi =20 -iptables -V > /dev/null 2>&1 -if [ $? -ne 0 ];then +# Use the legacy version if available to support old kernel versions +if iptables-legacy -V &> /dev/null; then + iptables=3D"iptables-legacy" + ip6tables=3D"ip6tables-legacy" +elif ! iptables -V &> /dev/null; then echo "SKIP: Could not run all tests without iptables tool" exit $ksft_skip -fi - -ip6tables -V > /dev/null 2>&1 -if [ $? -ne 0 ];then +elif ! ip6tables -V &> /dev/null; then echo "SKIP: Could not run all tests without ip6tables tool" exit $ksft_skip fi @@ -107,10 +109,10 @@ check_mark() local ns=3D$1 local af=3D$2 =20 - tables=3Diptables + tables=3D${iptables} =20 if [ $af -eq 6 ];then - tables=3Dip6tables + tables=3D${ip6tables} fi =20 counters=3D$(ip netns exec $ns $tables -v -L OUTPUT | grep DROP) --=20 2.40.1