From patchwork Fri Feb 22 09:01:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1046683 X-Patchwork-Delegate: petr.vorel@gmail.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=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 445QLZ1RqMz9s8m for ; Fri, 22 Feb 2019 20:01:26 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id E77D039007D for ; Fri, 22 Feb 2019 10:01:22 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [217.194.8.6]) by picard.linux.it (Postfix) with ESMTP id 4A0A73EA141 for ; Fri, 22 Feb 2019 10:01:20 +0100 (CET) Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id F1CD614016EA for ; Fri, 22 Feb 2019 10:01:17 +0100 (CET) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 5F8B3AE26; Fri, 22 Feb 2019 09:01:17 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 22 Feb 2019 10:01:09 +0100 Message-Id: <20190222090109.19824-1-pvorel@suse.cz> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-6.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-6.smtp.seeweb.it Subject: [LTP] [PATCH 1/1] net/virt: Introduce MIN_VIRT_PERF_THRESHOLD variable X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" to reduce duplicity in VIRT_PERF_THRESHOLD checks Signed-off-by: Petr Vorel --- testcases/network/virt/geneve01.sh | 4 +--- testcases/network/virt/geneve02.sh | 4 +--- testcases/network/virt/macsec_lib.sh | 2 +- testcases/network/virt/virt_lib.sh | 6 +++++- testcases/network/virt/vxlan03.sh | 4 +--- testcases/network/virt/vxlan04.sh | 4 +--- 6 files changed, 10 insertions(+), 14 deletions(-) diff --git a/testcases/network/virt/geneve01.sh b/testcases/network/virt/geneve01.sh index a5cdd0788..5d557d1d3 100755 --- a/testcases/network/virt/geneve01.sh +++ b/testcases/network/virt/geneve01.sh @@ -18,11 +18,9 @@ vxlan_dst_addr="uni" TST_TESTFUNC=do_test TST_CLEANUP=virt_cleanup -VIRT_PERF_THRESHOLD=${VIRT_PERF_THRESHOLD:-160} +MIN_VIRT_PERF_THRESHOLD=160 . virt_lib.sh -[ "$VIRT_PERF_THRESHOLD" -lt 160 ] && VIRT_PERF_THRESHOLD=160 - do_test() { if [ -z $ip_local -o -z $ip_remote ]; then diff --git a/testcases/network/virt/geneve02.sh b/testcases/network/virt/geneve02.sh index ba0fc351f..b79f9b67f 100755 --- a/testcases/network/virt/geneve02.sh +++ b/testcases/network/virt/geneve02.sh @@ -17,11 +17,9 @@ TST_TESTFUNC=do_test TST_CLEANUP=virt_cleanup TST_TEST_DATA="noudpcsum udp6zerocsumtx udp6zerocsumrx, udpcsum" TST_TEST_DATA_IFS="," -VIRT_PERF_THRESHOLD=${VIRT_PERF_THRESHOLD:-160} +MIN_VIRT_PERF_THRESHOLD=160 . virt_lib.sh -[ "$VIRT_PERF_THRESHOLD" -lt 160 ] && VIRT_PERF_THRESHOLD=160 - do_test() { virt_check_cmd virt_add ltp_v0 id 1 $2 remote \ diff --git a/testcases/network/virt/macsec_lib.sh b/testcases/network/virt/macsec_lib.sh index 6e112de20..7290693de 100755 --- a/testcases/network/virt/macsec_lib.sh +++ b/testcases/network/virt/macsec_lib.sh @@ -5,7 +5,7 @@ # Author: Alexey Kodanev virt_type="macsec" -VIRT_PERF_THRESHOLD=${VIRT_PERF_THRESHOLD:-100} +MIN_VIRT_PERF_THRESHOLD=100 IPSEC_MODE="transport" TST_NEEDS_TMPDIR=1 diff --git a/testcases/network/virt/virt_lib.sh b/testcases/network/virt/virt_lib.sh index 12512db62..6aebdaf30 100644 --- a/testcases/network/virt/virt_lib.sh +++ b/testcases/network/virt/virt_lib.sh @@ -69,9 +69,13 @@ ip_remote=$(tst_ipaddr rhost) ip_virt_remote="$(TST_IPV6= tst_ipaddr_un rhost)" ip6_virt_remote="$(TST_IPV6=6 tst_ipaddr_un rhost)" +vxlan_dstport=0 + # Max performance loss (%) for virtual devices during network load VIRT_PERF_THRESHOLD=${VIRT_PERF_THRESHOLD:-80} -vxlan_dstport=0 +if [ -n "$MIN_VIRT_PERF_THRESHOLD" ] && [ "$VIRT_PERF_THRESHOLD" -lt $MIN_VIRT_PERF_THRESHOLD ]; then + VIRT_PERF_THRESHOLD="$MIN_VIRT_PERF_THRESHOLD" +fi cleanup_vifaces() { diff --git a/testcases/network/virt/vxlan03.sh b/testcases/network/virt/vxlan03.sh index 9708e8e5d..d8ced5fda 100755 --- a/testcases/network/virt/vxlan03.sh +++ b/testcases/network/virt/vxlan03.sh @@ -31,11 +31,9 @@ TST_CLEANUP=virt_cleanup # by 10-30%. If hosts are too close to each other, e.g. connected to the same # switch, VxLAN can be much slower when comparing to the performance without # any encapsulation. -VIRT_PERF_THRESHOLD=${VIRT_PERF_THRESHOLD:-160} +MIN_VIRT_PERF_THRESHOLD=160 . virt_lib.sh -[ "$VIRT_PERF_THRESHOLD" -lt 160 ] && VIRT_PERF_THRESHOLD=160 - do_test() { if [ -z $ip_local -o -z $ip_remote ]; then diff --git a/testcases/network/virt/vxlan04.sh b/testcases/network/virt/vxlan04.sh index cfff8b2a6..042ff5f12 100755 --- a/testcases/network/virt/vxlan04.sh +++ b/testcases/network/virt/vxlan04.sh @@ -15,11 +15,9 @@ TST_TEST_DATA_IFS="," virt_type="vxlan" start_id=16700000 vxlan_dst_addr="uni" -VIRT_PERF_THRESHOLD=${VIRT_PERF_THRESHOLD:-160} +MIN_VIRT_PERF_THRESHOLD=160 . virt_lib.sh -[ "$VIRT_PERF_THRESHOLD" -lt 160 ] && VIRT_PERF_THRESHOLD=160 - do_test() { if [ -z $ip_local -o -z $ip_remote ]; then