From patchwork Fri Sep 14 14:11:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bala Sankaran X-Patchwork-Id: 969891 X-Patchwork-Delegate: ian.stokes@intel.com 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=redhat.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 42BctW1X9Hz9s4V for ; Sat, 15 Sep 2018 00:13:07 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 572D0E48; Fri, 14 Sep 2018 14:12:08 +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 A511BE44 for ; Fri, 14 Sep 2018 14:12:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 579907DE for ; Fri, 14 Sep 2018 14:12:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BEE25C05D3E5; Fri, 14 Sep 2018 14:12:05 +0000 (UTC) Received: from localhost.localdomain (unknown [10.18.25.174]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1907A600C6; Fri, 14 Sep 2018 14:12:05 +0000 (UTC) From: Bala Sankaran To: dev@openvswitch.org Date: Fri, 14 Sep 2018 10:11:58 -0400 Message-Id: <20180914141202.5334-3-bsankara@redhat.com> In-Reply-To: <20180914141202.5334-1-bsankara@redhat.com> References: <20180914141202.5334-1-bsankara@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 14 Sep 2018 14:12:05 +0000 (UTC) X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, URIBL_RED 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 v5 2/6] system-dpdk: Skip all tests if there are no hugepages 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 A failure is quite harsh in this scenario. It's better to simply skip all the tests and let the user look at the logs to understand the missing hugepages. Signed-off-by: Bala Sankaran Co-authored-by: Aaron Conole Signed-off-by: Aaron Conole --- Documentation/topics/testing.rst | 6 ++++++ tests/system-dpdk-macros.at | 2 +- tests/system-dpdk.at | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Documentation/topics/testing.rst b/Documentation/topics/testing.rst index 0c194ca14..a8892e1c1 100644 --- a/Documentation/topics/testing.rst +++ b/Documentation/topics/testing.rst @@ -322,6 +322,12 @@ the NIC to the DPDK-compatible driver. .. _DPDK supported NIC: http://dpdk.org/doc/nics +All tests are skipped if no hugepages are configured. User must look into the DPDK +manual to figure out how to `Configure hugepages`_. +The phy test will skip if no compatible physical device is available. + +.. _Configure hugepages: http://doc.dpdk.org/guides/linux_gsg/sys_reqs.html + Kernel datapath ''''''''''''''' diff --git a/tests/system-dpdk-macros.at b/tests/system-dpdk-macros.at index 2e5571fc4..f772a1945 100644 --- a/tests/system-dpdk-macros.at +++ b/tests/system-dpdk-macros.at @@ -6,7 +6,7 @@ m4_define([OVS_DPDK_PRE_CHECK], [dnl Check Hugepages AT_CHECK([cat /proc/meminfo], [], [stdout]) - AT_CHECK([grep HugePages_ stdout], [], [stdout]) + AT_SKIP_IF([egrep 'HugePages_Free: *0' stdout], [], [stdout]) AT_CHECK([mount], [], [stdout]) AT_CHECK([grep 'hugetlbfs' stdout], [], [stdout], []) diff --git a/tests/system-dpdk.at b/tests/system-dpdk.at index 6901d19e6..c1c908411 100644 --- a/tests/system-dpdk.at +++ b/tests/system-dpdk.at @@ -47,7 +47,7 @@ dnl -------------------------------------------------------------------------- dnl Add vhost-user-client port AT_SETUP([OVS-DPDK datapath - add vhost-user-client port]) AT_KEYWORDS([dpdk]) - +OVS_DPDK_PRE_CHECK() OVS_DPDK_START() dnl Add userspace bridge and attach it to OVS