From patchwork Tue Nov 5 08:27:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 2006747 X-Patchwork-Delegate: aconole@redhat.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XjM0M5b0Vz1xyM for ; Tue, 5 Nov 2024 19:27:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id CB5BB60853; Tue, 5 Nov 2024 08:27:44 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id euCTbkvgg6tR; Tue, 5 Nov 2024 08:27:43 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.9.56; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 98F0860854 Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 98F0860854; Tue, 5 Nov 2024 08:27:43 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 64D89C08A9; Tue, 5 Nov 2024 08:27:43 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id D4FE6C08A3 for ; Tue, 5 Nov 2024 08:27:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id B1405400FB for ; Tue, 5 Nov 2024 08:27:39 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id aHYb3T50FTGx for ; Tue, 5 Nov 2024 08:27:38 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=217.70.183.193; helo=relay1-d.mail.gandi.net; envelope-from=horms@ovn.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 76B8B4012F Authentication-Results: smtp2.osuosl.org; dmarc=none (p=none dis=none) header.from=ovn.org DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 76B8B4012F Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by smtp2.osuosl.org (Postfix) with ESMTPS id 76B8B4012F for ; Tue, 5 Nov 2024 08:27:38 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id 84530240006; Tue, 5 Nov 2024 08:27:36 +0000 (UTC) From: Simon Horman Date: Tue, 05 Nov 2024 08:27:31 +0000 MIME-Version: 1.0 Message-Id: <20241105-nft-testsuite-v2-3-e356adf75e81@ovn.org> References: <20241105-nft-testsuite-v2-0-e356adf75e81@ovn.org> In-Reply-To: <20241105-nft-testsuite-v2-0-e356adf75e81@ovn.org> To: dev@openvswitch.org X-Mailer: b4 0.14.0 X-GND-Sasl: horms@ovn.org Subject: [ovs-dev] [PATCH v2 3/3] tests: Handle marks using nft if available. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Update the "offloads - ping over vxlan tunnel with gbp - offloads enabled" test to use nft, instead of iptables, if available. This is part of an effort to use nft in place of iptables throughout the testsuite. Unlike other patches towards this series, simply inline nft support into the test, rather than using macros. This matches the current iptables support in this test. Signed-off-by: Simon Horman --- tests/system-offloads-traffic.at | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/tests/system-offloads-traffic.at b/tests/system-offloads-traffic.at index 6e3b063eee9d..78c6f5d7ec7e 100644 --- a/tests/system-offloads-traffic.at +++ b/tests/system-offloads-traffic.at @@ -812,6 +812,7 @@ OVS_CHECK_VXLAN() OVS_TRAFFIC_VSWITCHD_START([], [], [-- set Open_vSwitch . other_config:hw-offload=true]) AT_SKIP_IF([! grep -q "probe tc: vxlan gbp is supported." ovs-vswitchd.log]) +AT_SKIP_IF([test $HAVE_NFT = no -a $HAVE_IPTABLES = no]) ADD_BR([br-underlay]) AT_CHECK([ovs-ofctl add-flow br-underlay "actions=normal"]) @@ -832,8 +833,32 @@ AT_CHECK([ovs-ofctl add-flow br0 "actions=normal"]) ADD_NATIVE_TUNNEL([vxlan], [at_vxlan1], [at_ns0], [172.31.1.100], [10.1.1.1/24], [id 0 dstport 4789 gbp]) -NS_CHECK_EXEC([at_ns0], [iptables -I OUTPUT -p ip -j MARK --set-mark 512 2>/dev/null], [0]) -NS_CHECK_EXEC([at_ns0], [iptables -I INPUT -m mark --mark 512 -j ACCEPT 2>/dev/null], [0], [ignore]) + +if test $HAVE_NFT = yes; then + NS_CHECK_EXEC([at_ns0], [nft -f - << EOF + table ip filter { + chain OUTPUT { + type filter hook output priority filter; policy accept; + counter meta mark set 512 + } + } + + table ip filter { + chain INPUT { + type filter hook input priority filter; policy accept; + mark 512 counter accept; + } + } +EOF + ]) +else + NS_CHECK_EXEC([at_ns0], + [iptables -I OUTPUT -p ip -j MARK --set-mark 512 2>/dev/null], + [0]) + NS_CHECK_EXEC([at_ns0], + [iptables -I INPUT -m mark --mark 512 -j ACCEPT 2>/dev/null], + [0], [ignore]) +fi dnl First, check the underlay. NS_CHECK_EXEC([at_ns0], [ping -q -c 3 -i 0.3 -W 2 172.31.1.100 | FORMAT_PING], [0], [dnl