From patchwork Thu Sep 6 13:18:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lam, Tiago" X-Patchwork-Id: 967004 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=intel.com 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 425h5K2cGCz9s4s for ; Thu, 6 Sep 2018 23:20:21 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 47BEEF7E; Thu, 6 Sep 2018 13:18:56 +0000 (UTC) X-Original-To: ovs-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 DDBF0F34 for ; Thu, 6 Sep 2018 13:18:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 9E3AA71C for ; Thu, 6 Sep 2018 13:18:54 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Sep 2018 06:18:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,338,1531810800"; d="scan'208";a="81387446" Received: from silpixa00399125.ir.intel.com ([10.237.223.34]) by orsmga003.jf.intel.com with ESMTP; 06 Sep 2018 06:18:45 -0700 From: Tiago Lam To: ovs-dev@openvswitch.org Date: Thu, 6 Sep 2018 14:18:40 +0100 Message-Id: <1536239920-76330-1-git-send-email-tiago.lam@intel.com> X-Mailer: git-send-email 2.7.4 X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] system-traffic: Fix conntrack per zone limit test. 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 Commit 3f1087c added a per zone limit test which relied on the CHECK_CT_DPIF_FLUSH_BY_CT_TUPLE m4 macro to skip the test when executing in a userspace datapath (since the per zone limit feature is not yet implemented in userspace). That macro, however, has been removed in commit 271e48a ("conntrack: Support conntrack flush by ct 5-tuple") which was causing the test to fail when executing in userspace. Instead, a new m4 macro, CHECK_CT_DPIF_PER_ZONE_LIMIT, is introduced to make the same differentiation, until userspace doesn't support the per zone limit. CC: Yi-Hung Wei Fixes: 3f1087c ("system-traffic: Add conntrack per zone limit test case") Signed-off-by: Tiago Lam Acked-by: Yi-Hung Wei --- tests/system-kmod-macros.at | 7 +++++++ tests/system-traffic.at | 2 +- tests/system-userspace-macros.at | 9 +++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index 770703b..3296d64 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -114,6 +114,13 @@ m4_define([CHECK_CONNTRACK_FRAG_IPV6_MULT_EXTEN], # m4_define([CHECK_CONNTRACK_NAT]) +# CHECK_CT_DPIF_PER_ZONE_LIMIT() +# +# Perform requirements checks for running ovs-dpctl ct-[set|get|del]-limits per +# zone. The kernel datapath does support this feature. Will remove this check +# after both kernel and userspace datapath support it. +m4_define([CHECK_CT_DPIF_PER_ZONE_LIMIT]) + # CHECK_CT_DPIF_SET_GET_MAXCONNS() # # Perform requirements checks for running ovs-dpctl ct-set-maxconns or diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 2a33e9f..19cf89a 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -3189,7 +3189,7 @@ AT_CLEANUP AT_SETUP([conntrack - limit by zone]) CHECK_CONNTRACK() -CHECK_CT_DPIF_FLUSH_BY_CT_TUPLE() +CHECK_CT_DPIF_PER_ZONE_LIMIT() OVS_TRAFFIC_VSWITCHD_START() ADD_NAMESPACES(at_ns0, at_ns1) diff --git a/tests/system-userspace-macros.at b/tests/system-userspace-macros.at index 968a95e..27bde8b 100644 --- a/tests/system-userspace-macros.at +++ b/tests/system-userspace-macros.at @@ -116,6 +116,15 @@ m4_define([CHECK_CONNTRACK_FRAG_IPV6_MULT_EXTEN], # m4_define([CHECK_CONNTRACK_NAT]) +# CHECK_CT_DPIF_PER_ZONE_LIMIT() +# +# Perform requirements checks for running ovs-dpctl ct-[set|get|del]-limits per +# zone. The userspace datapath does not support this feature yet. +m4_define([CHECK_CT_DPIF_PER_ZONE_LIMIT], +[ + AT_SKIP_IF([:]) +]) + # CHECK_CT_DPIF_SET_GET_MAXCONNS() # # Perform requirements checks for running ovs-dpctl ct-set-maxconns or