From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.netfilter.org (mail.netfilter.org [217.70.190.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E07F02920A1; Fri, 23 May 2025 13:27:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.190.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748006857; cv=none; b=Xa5BqMeP+U15U3zEnfVAGqBaHBQpgqtnUjxM5JsSnmRmrNFjDVvq59u20hYBFwQMed7aCo81BcTybOdsA/JIvYynFswPDWaYySnJgARnS1YYdiRV9bVRJnb4Ij4I0Q7rgllPPhfxU3KkXoL1tBfbHMup68G5bp3koquQZy9FMYE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748006857; c=relaxed/simple; bh=NTH6kECzPpXanoAZm0u/VO2TS9XpoVmEqX9TTnLFidE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SOsMY7OQElyL5K+QUvscj7hd4JvOX69hegsGTcpyZTVmVDd/mgHTeYF0QlOQW9hb/mcULjroqo17BqhR3fViIwgjedymPcxlC8fUKCgJlaMWZ4+TzuRZUm+nXGV5fjrOnJjonDTu/RRmEhTxEfnvtWvd3JIJUxU1AY2+iRsUIzo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=netfilter.org; spf=pass smtp.mailfrom=netfilter.org; dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org header.b=ukA1BUZ4; dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org header.b=azo3spgB; arc=none smtp.client-ip=217.70.190.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=netfilter.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=netfilter.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org header.b="ukA1BUZ4"; dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org header.b="azo3spgB" Received: by mail.netfilter.org (Postfix, from userid 109) id 3BF9160787; Fri, 23 May 2025 15:27:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netfilter.org; s=2025; t=1748006854; bh=MXp3+00aJe+c85KcoRT8nrcRrZ1XBLmuc+9HhJO9MEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ukA1BUZ4iM69GaglmRLtujz+L7j1uMUzneidBrqtaltt6JPpl2aFmgWelRwncXNNR Z9KyrE4Jv3Y0gegPjplNXL+PwVHvBET+XmzrC92izvOOBEOxpzv+qFGgLDNa0TEnMQ shI11WVr/+EVqErn8iMoFPWYHw1LVG8u02TkVGGV4WIrogHAu9W2jCvJKOJRTPBolK Wx2QDv7+qBi3SUmASv7vrq2MPeObB24Gp4cFe8gY3eMXcS0zz+++22qDHruwSY8Tha YNCJVHf6Jcq20VLg68TsUUwzbbApTSiWzQzkbsthjgPY24gDuhRfzaeyNIYw/EAC0N Zr343eZC9ZXQA== X-Spam-Level: Received: from localhost.localdomain (mail-agni [217.70.190.124]) by mail.netfilter.org (Postfix) with ESMTPSA id 8CE9160761; Fri, 23 May 2025 15:27:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netfilter.org; s=2025; t=1748006842; bh=MXp3+00aJe+c85KcoRT8nrcRrZ1XBLmuc+9HhJO9MEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=azo3spgBnhs6S1WJLAZUiWPUgq3lWfkcQdf3vj4sdTtdCqeHOUqAHNf2b8wf0HrMl olbFERCcsAyvXoJAX3FIHsV9t5wLO7mShjwUqfE809dsTVoMXRLerWmTsbkusL5zTx GphgczFi5nLSANhpKrY0Jdgg4FlrdgwHWxGwWk/2cPp2whZhhdVd6e24X+6gMNee2l FP4FNAZy9lIw3MbFBOF2Vye84qkR2U7Gif8kqGWvduMALL0ubotbSZXdHwFQVNqn9L JhC4LQlBlS38toyiyFzDordndNDn1HCt38XrUJsJrH1uvzcOvnTohi1TilIEAnbG+J KV0IIOS56lqwQ== From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, fw@strlen.de, horms@kernel.org Subject: [PATCH net-next 04/26] selftests: netfilter: move fib vrf test to nft_fib.sh Date: Fri, 23 May 2025 15:26:50 +0200 Message-Id: <20250523132712.458507-5-pablo@netfilter.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20250523132712.458507-1-pablo@netfilter.org> References: <20250523132712.458507-1-pablo@netfilter.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Florian Westphal It was located in conntrack_vrf.sh because that already had the VRF bits. Lets not add to this and move it to nft_fib.sh where this belongs. No functional changes for the subtest intended. The subtest is limited, it only covered 'fib oif' (route output interface query) when the incoming interface is part of a VRF. Next we can extend it to cover 'fib type' for VRFs and also check fib results when there is an unrelated VRF in same netns. Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso --- .../selftests/net/netfilter/conntrack_vrf.sh | 34 ------- .../selftests/net/netfilter/nft_fib.sh | 90 +++++++++++++++++++ 2 files changed, 90 insertions(+), 34 deletions(-) diff --git a/tools/testing/selftests/net/netfilter/conntrack_vrf.sh b/tools/testing/selftests/net/netfilter/conntrack_vrf.sh index 025b58f2ae91..207b79932d91 100755 --- a/tools/testing/selftests/net/netfilter/conntrack_vrf.sh +++ b/tools/testing/selftests/net/netfilter/conntrack_vrf.sh @@ -32,7 +32,6 @@ source lib.sh IP0=172.30.30.1 IP1=172.30.30.2 -DUMMYNET=10.9.9 PFXL=30 ret=0 @@ -52,8 +51,6 @@ trap cleanup EXIT setup_ns ns0 ns1 -ip netns exec "$ns0" sysctl -q -w net.ipv4.conf.all.forwarding=1 - if ! ip link add veth0 netns "$ns0" type veth peer name veth0 netns "$ns1" > /dev/null 2>&1; then echo "SKIP: Could not add veth device" exit $ksft_skip @@ -64,18 +61,13 @@ if ! ip -net "$ns0" li add tvrf type vrf table 9876; then exit $ksft_skip fi -ip -net "$ns0" link add dummy0 type dummy - ip -net "$ns0" li set veth0 master tvrf -ip -net "$ns0" li set dummy0 master tvrf ip -net "$ns0" li set tvrf up ip -net "$ns0" li set veth0 up -ip -net "$ns0" li set dummy0 up ip -net "$ns1" li set veth0 up ip -net "$ns0" addr add $IP0/$PFXL dev veth0 ip -net "$ns1" addr add $IP1/$PFXL dev veth0 -ip -net "$ns0" addr add $DUMMYNET.1/$PFXL dev dummy0 listener_ready() { @@ -216,35 +208,9 @@ EOF fi } -test_fib() -{ -ip netns exec "$ns0" nft -f - < /dev/null - - if ip netns exec "$ns0" nft list counter t fibcount | grep -q "packets 1"; then - echo "PASS: fib lookup returned exepected output interface" - else - echo "FAIL: fib lookup did not return exepected output interface" - ret=1 - return - fi -} - test_ct_zone_in test_masquerade_vrf "default" test_masquerade_vrf "pfifo" test_masquerade_veth -test_fib exit $ret diff --git a/tools/testing/selftests/net/netfilter/nft_fib.sh b/tools/testing/selftests/net/netfilter/nft_fib.sh index 4b93e4954536..f636ad781033 100755 --- a/tools/testing/selftests/net/netfilter/nft_fib.sh +++ b/tools/testing/selftests/net/netfilter/nft_fib.sh @@ -252,6 +252,23 @@ test_ping() { return 0 } +test_ping_unreachable() { + local daddr4=$1 + local daddr6=$2 + + if ip netns exec "$ns1" ping -c 1 -w 1 -q "$daddr4" > /dev/null; then + echo "FAIL: ${ns1} could reach $daddr4" 1>&2 + return 1 + fi + + if ip netns exec "$ns1" ping -c 1 -w 1 -q "$daddr6" > /dev/null; then + echo "FAIL: ${ns1} could reach $daddr6" 1>&2 + return 1 + fi + + return 0 +} + test_fib_type() { local notice="$1" local errmsg="addr-on-if" @@ -295,6 +312,77 @@ test_fib_type() { fi } +test_fib_vrf_dev_add_dummy() +{ + if ! ip -net "$nsrouter" link add dummy0 type dummy ;then + echo "SKIP: VRF tests: dummy device type not supported" + return 1 + fi + + if ! ip -net "$nsrouter" link add tvrf type vrf table 9876;then + echo "SKIP: VRF tests: vrf device type not supported" + return 1 + fi + + ip -net "$nsrouter" link set veth0 master tvrf + ip -net "$nsrouter" link set dummy0 master tvrf + ip -net "$nsrouter" link set dummy0 up + ip -net "$nsrouter" link set tvrf up +} + +# Extends nsrouter config by adding dummy0+vrf. +# +# 10.0.1.99 10.0.1.1 10.0.2.1 10.0.2.99 +# dead:1::99 dead:1::1 dead:2::1 dead:2::99 +# ns1 <-------> [ veth0 ] nsrouter [veth1] <-------> ns2 +# [dummy0] +# 10.9.9.1 +# dead:9::1 +# [tvrf] +test_fib_vrf() +{ + local dummynet="10.9.9" + local dummynet6="dead:9" + local cntname="" + + if ! test_fib_vrf_dev_add_dummy; then + [ $ret -eq 0 ] && ret=$ksft_skip + return + fi + + ip -net "$nsrouter" addr add "$dummynet.1"/24 dev dummy0 + ip -net "$nsrouter" addr add "${dummynet6}::1"/64 dev dummy0 nodad + + +ip netns exec "$nsrouter" nft -f - < /dev/null ip netns exec "$nsrouter" sysctl net.ipv4.conf.veth0.forwarding=1 > /dev/null ip netns exec "$nsrouter" sysctl net.ipv4.conf.veth1.forwarding=1 > /dev/null @@ -416,4 +504,6 @@ test_fib_type "default table" ip netns exec "$nsrouter" nft delete table ip filter ip netns exec "$nsrouter" nft delete table ip6 filter +test_fib_vrf + exit $ret -- 2.30.2