From patchwork Fri Nov 1 21:51:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 1188198 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SUomiwjg"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 474bVz3LBhz9sP6 for ; Sat, 2 Nov 2019 08:51:38 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C0FFFE8C; Fri, 1 Nov 2019 21:51:35 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id E7B7AE8B for ; Fri, 1 Nov 2019 21:51:34 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D642B466 for ; Fri, 1 Nov 2019 21:51:33 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id x195so4438616pfd.1 for ; Fri, 01 Nov 2019 14:51:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=vTSs5/WnqK8DEEk++XGDrqYIzu6QxZXh3Uce94OlJL4=; b=SUomiwjglAOy4+qsj8sAiOs9tYMSXBkB+Lo8rUG5VUm5XM1SD0Zpijco/L6Bpjj5Wf 0+idhcZ42zkcRySyGrRvrdo6v6QB5xpKrc/vDaWhYl1IvU6caejUagcf+Fj21DIfJbYM LUua21ylKKNs8rscmayR6Bb9EFJqJQhuy8KCu+KECSIF1jC1PvFueHfmM+jFe3GGzNuG 38QPdkkGG+LMoqnAFwvQzvdfCos1PTUVHKo1MIVOB6Dbu+xT3/yVhH/zGpyLHj0fa0UI KLakXJ90GzBrhL1J0gzpMwfev0+8EaYwIgTwHme16dPV5McG3PorLbpH7R/bO2PnU9gT HmZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=vTSs5/WnqK8DEEk++XGDrqYIzu6QxZXh3Uce94OlJL4=; b=pfTrtwkmEJo3Lx+e8iuIXcNGBtzzCqdbTB8M1L2cjmQSL1a6j9bPhclHZsNFFqxbP+ IhvgEiR9mrAgj6iMZ7VjEbhXHC6nNyaf5RQ+R3/Z+3cpCp+h230Jpe/EwxCiyKHCVtHp dgR7M1X0GY/DtKmP9I6uSfDwytJzplI267pJHxMWP45i54nm8vuyDMrsmXz81jj9o+bm 8x9ZKO8XFAGMtLtwfsnwxQ6oQGHiCrrsblfCUbtlMf8w2PiSlv2DRuiaBLRg1kLTeddD PHeCzYFl2LnIPuNqZZiF5lcSrQRklJAXywo95cHVupRVArGGHO7agTtX8W9GKCLkL23F ZYpw== X-Gm-Message-State: APjAAAXuLQYqn0rM27XyXERn0hPhpe8RIxCLmYP3hM4eUGsUCGthPnbS A6xnZgoMKjYCa8ep5zaLMvnpJEwyDxE= X-Google-Smtp-Source: APXvYqyqe1FMzOPy4WjmWJqLqGH/FWKe48PskzRPwo6Y0Pos6n3nshJqXqdarUfSo/E3f8MLrI8VJw== X-Received: by 2002:a17:90a:ad44:: with SMTP id w4mr18067557pjv.11.1572645092894; Fri, 01 Nov 2019 14:51:32 -0700 (PDT) Received: from sc9-mailhost3.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id 82sm10283779pfa.115.2019.11.01.14.51.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Nov 2019 14:51:32 -0700 (PDT) From: William Tu To: dev@openvswitch.org Date: Fri, 1 Nov 2019 14:51:05 -0700 Message-Id: <1572645065-130301-1-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: i.maximets@ovn.org Subject: [ovs-dev] [PATCH] tests: Skip testcases using nc under check-afxdp. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org AF_XDP veth does not support TCP with namespaces. This patch skips them. Signed-off-by: William Tu --- v1: - Tested-at: https://travis-ci.org/williamtu/ovs-travis/builds/606194550 - make check-afxdp all pass on my machine, but cirrus, it is still unstable, observe 1 failed at: https://cirrus-ci.com/task/6597038589870080 --- tests/system-afxdp-macros.at | 7 +++++++ tests/system-kmod-macros.at | 8 ++++++++ tests/system-traffic.at | 18 +++++++++--------- tests/system-userspace-macros.at | 8 ++++++++ 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/tests/system-afxdp-macros.at b/tests/system-afxdp-macros.at index f0683c0a901b..27c220998355 100644 --- a/tests/system-afxdp-macros.at +++ b/tests/system-afxdp-macros.at @@ -37,3 +37,10 @@ m4_define([CONFIGURE_VETH_OFFLOADS], # m4_define([OVS_START_L7], [AT_SKIP_IF([:])]) + +# OVS_CHECK_NC() +# +# Check if comman nc is available. Always skip because +# AF_XDP veth does not support TCP with namespaces. +m4_define([OVS_CHECK_NC], + [AT_SKIP_IF([:])]) diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index 9e89aec43734..5b610f5517ec 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -211,3 +211,11 @@ m4_define([VSCTL_ADD_DATAPATH_TABLE], # or necessary for the userspace datapath as it is checking for a kernel # specific regression. m4_define([CHECK_L3L4_CONNTRACK_REASM]) + +# OVS_CHECK_NC() +# +# Check if comman nc is available. +m4_define([OVS_CHECK_NC], +[ + AT_SKIP_IF([test $HAVE_NC = no]) +]) diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 870a05efe04c..d3214696aff1 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -993,7 +993,7 @@ NS_CHECK_EXEC([at_ns1], [ping -q -c 3 -i 0.3 -w 2 10.1.1.1 | FORMAT_PING], [0], OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - basic truncate action]) -AT_SKIP_IF([test $HAVE_NC = no]) +OVS_CHECK_NC() OVS_TRAFFIC_VSWITCHD_START() AT_CHECK([ovs-ofctl del-flows br0]) @@ -1109,7 +1109,7 @@ dnl br-underlay: with IP: 172.31.1.100 dnl ns0: connect to br-underlay, with IP: 10.1.1.1 AT_SETUP([datapath - truncate and output to gre tunnel by simulated packets]) OVS_CHECK_MIN_KERNEL(3, 10) -AT_SKIP_IF([test $HAVE_NC = no]) +OVS_CHECK_NC() OVS_TRAFFIC_VSWITCHD_START() ADD_BR([br-underlay], [set bridge br-underlay other-config:hwaddr=\"02:90:8c:a8:a1:49\"]) @@ -1240,7 +1240,7 @@ dnl ns1: connect to br0, with IP:10.1.1.2 dnl br-underlay: with IP: 172.31.1.100 dnl ns0: connect to br-underlay, with IP: 10.1.1.1 AT_SETUP([datapath - truncate and output to gre tunnel]) -AT_SKIP_IF([test $HAVE_NC = no]) +OVS_CHECK_NC() OVS_CHECK_KERNEL_EXCL(3, 10, 4, 15) OVS_CHECK_GRE() OVS_TRAFFIC_VSWITCHD_START() @@ -2252,7 +2252,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([conntrack - ICMP related]) -AT_SKIP_IF([test $HAVE_NC = no]) +OVS_CHECK_NC() CHECK_CONNTRACK() OVS_TRAFFIC_VSWITCHD_START() @@ -2288,7 +2288,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([conntrack - ICMP related to original direction]) -AT_SKIP_IF([test $HAVE_NC = no]) +OVS_CHECK_NC() CHECK_CONNTRACK() OVS_TRAFFIC_VSWITCHD_START() @@ -4417,7 +4417,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([conntrack - ICMP related with NAT]) -AT_SKIP_IF([test $HAVE_NC = no]) +OVS_CHECK_NC() AT_SKIP_IF([test $HAVE_TCPDUMP = no]) CHECK_CONNTRACK() CHECK_CONNTRACK_NAT() @@ -5571,7 +5571,7 @@ AT_CLEANUP AT_SETUP([conntrack - DNAT load balancing with NC]) -AT_SKIP_IF([test $HAVE_NC = no]) +OVS_CHECK_NC() CHECK_CONNTRACK() CHECK_CONNTRACK_NAT() OVS_TRAFFIC_VSWITCHD_START() @@ -5659,7 +5659,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([conntrack - floating IP]) -AT_SKIP_IF([test $HAVE_NC = no]) +OVS_CHECK_NC() CHECK_CONNTRACK() OVS_TRAFFIC_VSWITCHD_START() OVS_CHECK_CT_CLEAR() @@ -5734,7 +5734,7 @@ AT_CLEANUP AT_SETUP([conntrack - negative test for recirculation optimization]) dnl This test will fail if 'conn' caching is being used, because the tuple dnl has been changed outside of conntrack. -AT_SKIP_IF([test $HAVE_NC = no]) +OVS_CHECK_NC() CHECK_CONNTRACK() OVS_TRAFFIC_VSWITCHD_START() OVS_CHECK_CT_CLEAR() diff --git a/tests/system-userspace-macros.at b/tests/system-userspace-macros.at index a419f30c1563..9e9787429f6f 100644 --- a/tests/system-userspace-macros.at +++ b/tests/system-userspace-macros.at @@ -323,3 +323,11 @@ m4_define([CHECK_L3L4_CONNTRACK_REASM], [ AT_SKIP_IF([:]) ]) + +# OVS_CHECK_NC() +# +# Check if comman nc is available. +m4_define([OVS_CHECK_NC], +[ + AT_SKIP_IF([test $HAVE_NC = no]) +])