From patchwork Fri Oct 11 13:24:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1175170 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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46qTGV0sFvz9sNx for ; Sat, 12 Oct 2019 00:25:22 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 621113C2273 for ; Fri, 11 Oct 2019 15:25:19 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [217.194.8.5]) by picard.linux.it (Postfix) with ESMTP id 74EC83C1447 for ; Fri, 11 Oct 2019 15:24:43 +0200 (CEST) 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-5.smtp.seeweb.it (Postfix) with ESMTPS id 49BB26013E4 for ; Fri, 11 Oct 2019 15:23:06 +0200 (CEST) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id C7464AE5E; Fri, 11 Oct 2019 13:24:42 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 11 Oct 2019 15:24:26 +0200 Message-Id: <20191011132433.24197-2-pvorel@suse.cz> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191011132433.24197-1-pvorel@suse.cz> References: <20191011132433.24197-1-pvorel@suse.cz> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-5.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-5.smtp.seeweb.it Subject: [LTP] [PATCH v5 1/8] tst_net.sh: enhance tst_add_ipaddr(), add tst_del_ipaddr() X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 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 be reusable in tests (not just for internal tst_net.sh usage) Added -a, -d, -q, -s options: -a IP: IP address to be added, default value is $(tst_ipaddr)/$IPV{4,6}_{L,R}PREFIX -d: delete address instead of adding -q: quiet mode (don't print info) -s: safe option, if something goes wrong, will exit with TBROK -a and -d are intended for easier handling with IP addresses (not have to calculate dad for IPv6 when adding IP address). -q is for limit noise in test output, when test uses many loops. tst_del_ipaddr() which is just tst_add_ipaddr() wrapper was added mainly for better code readability. Signed-off-by: Petr Vorel --- testcases/lib/tst_net.sh | 50 +++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/testcases/lib/tst_net.sh b/testcases/lib/tst_net.sh index 6c3ae708d..2f6f0b275 100644 --- a/testcases/lib/tst_net.sh +++ b/testcases/lib/tst_net.sh @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2014-2017 Oracle and/or its affiliates. All Rights Reserved. -# Copyright (c) 2016-2018 Petr Vorel +# Copyright (c) 2016-2019 Petr Vorel # Author: Alexey Kodanev [ -n "$TST_LIB_NET_LOADED" ] && return 0 @@ -447,14 +447,35 @@ tst_init_iface() tst_rhost_run -c "ip link set $iface up" } -# tst_add_ipaddr [TYPE] [LINK] -# TYPE: { lhost | rhost }; Default value is 'lhost'. -# LINK: link number starting from 0. Default value is '0'. +# tst_add_ipaddr [TYPE] [LINK] [-a IP] [-d] [-q] [-s] +# Options: +# TYPE: { lhost | rhost }, default value is 'lhost' +# LINK: link number starting from 0, default value is '0' +# -a IP: IP address to be added, default value is +# $(tst_ipaddr)/$IPV{4,6}_{L,R}PREFIX +# -d: delete address instead of adding +# -q: quiet mode (don't print info) +# -s: safe option, if something goes wrong, will exit with TBROK tst_add_ipaddr() { + local action="add" + local addr dad lsafe mask quiet rsafe + + local OPTIND + while getopts a:dqs opt; do + case "$opt" in + a) addr="$OPTARG" ;; + d) action="del" ;; + q) quiet=1 ;; + s) lsafe="ROD"; rsafe="-s" ;; + *) tst_brk TBROK "tst_add_ipaddr: unknown option: $OPTARG" ;; + esac + done + shift $((OPTIND - 1)) + local type="${1:-lhost}" local link_num="${2:-0}" - local mask dad + local iface=$(tst_iface $type $link_num) if [ "$TST_IPV6" ]; then dad="nodad" @@ -462,17 +483,24 @@ tst_add_ipaddr() else [ "$type" = "lhost" ] && mask=$IPV4_LPREFIX || mask=$IPV4_RPREFIX fi - - local iface=$(tst_iface $type $link_num) + [ -n "$addr" ] || addr="$(tst_ipaddr $type)" + echo $addr | grep -q / || addr="$addr/$mask" if [ $type = "lhost" ]; then - tst_res_ TINFO "set local addr $(tst_ipaddr)/$mask" - ip addr add $(tst_ipaddr)/$mask dev $iface $dad + [ "$quiet" ] || tst_res_ TINFO "$action local addr $addr" + $lsafe ip addr $action $addr dev $iface $dad return $? fi - tst_res_ TINFO "set remote addr $(tst_ipaddr rhost)/$mask" - tst_rhost_run -c "ip addr add $(tst_ipaddr rhost)/$mask dev $iface $dad" + [ "$quiet" ] || tst_res_ TINFO "set remote addr $addr" + tst_rhost_run $rsafe -c "ip addr $action $addr dev $iface $dad" +} + +# tst_del_ipaddr [ tst_add_ipaddr options ] +# Delete IP address +tst_del_ipaddr() +{ + tst_add_ipaddr -d $@ } # tst_restore_ipaddr [TYPE] [LINK] From patchwork Fri Oct 11 13:24:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1175166 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=2001:1418:10:5::2; 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 [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46qTFr2K8nz9sCJ for ; Sat, 12 Oct 2019 00:24:48 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 690943C1480 for ; Fri, 11 Oct 2019 15:24:45 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) by picard.linux.it (Postfix) with ESMTP id DEA003C1447 for ; Fri, 11 Oct 2019 15:24:43 +0200 (CEST) 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-7.smtp.seeweb.it (Postfix) with ESMTPS id 6396C20118C for ; Fri, 11 Oct 2019 15:24:43 +0200 (CEST) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id DFA6CAF8A; Fri, 11 Oct 2019 13:24:42 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 11 Oct 2019 15:24:27 +0200 Message-Id: <20191011132433.24197-3-pvorel@suse.cz> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191011132433.24197-1-pvorel@suse.cz> References: <20191011132433.24197-1-pvorel@suse.cz> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH v5 2/8] tst_net.sh: Add -p option to return prefix in tst_ipaddr_un() X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 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" + reformat docs a bit Signed-off-by: Petr Vorel --- testcases/lib/tst_net.sh | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/testcases/lib/tst_net.sh b/testcases/lib/tst_net.sh index 2f6f0b275..0d6c29407 100644 --- a/testcases/lib/tst_net.sh +++ b/testcases/lib/tst_net.sh @@ -357,28 +357,33 @@ tst_ipaddr() # Get IP address of unused network, specified either by type and counter # or by net and host. -# tst_ipaddr_un [-cCOUNTER] [TYPE] -# tst_ipaddr_un NET_ID [HOST_ID] -# TYPE: { lhost | rhost }; Default value is 'lhost'. -# COUNTER: Integer value for counting HOST_ID and NET_ID. Default is 1. -# NET_ID: Integer or hex value of net. For IPv4 is 3rd octet, for IPv6 -# is 3rd hextet. -# HOST_ID: Integer or hex value of host. For IPv4 is 4th octet, for -# IPv6 is the last hextet. Default value is 0. +# tst_ipaddr_un [-cCOUNTER] [-p] [TYPE] +# tst_ipaddr_un [-p] NET_ID [HOST_ID] +# +# TYPE: { lhost | rhost } (default: 'lhost') +# NET_ID: integer or hex value of net (IPv4: 3rd octet, IPv6: 3rd hextet) +# HOST_ID: integer or hex value of host (IPv4: 4th octet, IPv6: the last +# hextet, default: 0) +# +# OPTIONS +# -c COUNTER: integer value for counting HOST_ID and NET_ID (default: 1) +# -p: print also prefix tst_ipaddr_un() { - local counter host_id net_id max_host_id max_net_id tmp type + local counter host_id max_host_id max_net_id net_id prefix tmp type local OPTIND - while getopts "c:" opt; do + while getopts "c:p" opt; do case $opt in c) counter="$OPTARG";; + p) [ "$TST_IPV6" ] && prefix="/64" || prefix="/24";; esac done shift $(($OPTIND - 1)) [ "$TST_IPV6" ] && max_net_id=65535 || max_net_id=255 + # counter if [ $# -eq 0 -o "$1" = "lhost" -o "$1" = "rhost" ]; then [ -z "$counter" ] && counter=1 [ $counter -lt 1 ] && counter=1 @@ -394,7 +399,7 @@ tst_ipaddr_un() host_id=$max_host_id net_id=$((net_id - 1)) fi - else + else # net_id & host_id net_id="$1" host_id="${2:-0}" if [ "$TST_IPV6" ]; then @@ -409,14 +414,14 @@ tst_ipaddr_un() host_id=$((host_id % max_net_id)) if [ -z "$TST_IPV6" ]; then - echo "${IPV4_NET16_UNUSED}.${net_id}.${host_id}" + echo "${IPV4_NET16_UNUSED}.${net_id}.${host_id}${prefix}" return fi [ $host_id -gt 0 ] && host_id="$(printf %x $host_id)" || host_id= [ $net_id -gt 0 ] && net_id="$(printf %x $net_id)" || net_id= [ "$net_id" ] && net_id=":$net_id" - echo "${IPV6_NET32_UNUSED}${net_id}::${host_id}" + echo "${IPV6_NET32_UNUSED}${net_id}::${host_id}${prefix}" } # tst_init_iface [TYPE] [LINK] From patchwork Fri Oct 11 13:24:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1175167 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=2001:1418:10:5::2; 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 [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46qTG03WSsz9sNx for ; Sat, 12 Oct 2019 00:24:56 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id A5BBE3C1D2A for ; Fri, 11 Oct 2019 15:24:53 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [217.194.8.7]) by picard.linux.it (Postfix) with ESMTP id E098A3C1453 for ; Fri, 11 Oct 2019 15:24:43 +0200 (CEST) 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-7.smtp.seeweb.it (Postfix) with ESMTPS id 6C005201189 for ; Fri, 11 Oct 2019 15:24:43 +0200 (CEST) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 116A6B35A; Fri, 11 Oct 2019 13:24:43 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 11 Oct 2019 15:24:28 +0200 Message-Id: <20191011132433.24197-4-pvorel@suse.cz> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191011132433.24197-1-pvorel@suse.cz> References: <20191011132433.24197-1-pvorel@suse.cz> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH v5 3/8] tst_net.sh: Add -h -n options to tst_ipaddr_un() X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 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 limit HOST_ID and NET_ID: -h: specify *host* address range (HOST_ID) -h MIN,MAX or -h MIN or -h ,MAX -n: specify *network* address range (NET_ID) -n MIN,MAX or -n MIN or -n ,MAX These options are important for looping over max HOST_ID or NET_ID (255 resp. 0xffff for IPv6), when different than the default range. NOTE: The default range for host_id & net_id changed from <0, 254 resp. 65534> to <0, 254 resp. 65535>: broadcast bit was added. For backwards compatibility -n must be used. But non of the code used host_id & net_id in loop => no change needed. Signed-off-by: Petr Vorel --- testcases/lib/tst_net.sh | 98 ++++++++++++++++++++++++++++++---------- 1 file changed, 74 insertions(+), 24 deletions(-) diff --git a/testcases/lib/tst_net.sh b/testcases/lib/tst_net.sh index 0d6c29407..92d55b5e2 100644 --- a/testcases/lib/tst_net.sh +++ b/testcases/lib/tst_net.sh @@ -355,50 +355,102 @@ tst_ipaddr() fi } -# Get IP address of unused network, specified either by type and counter +# Get IP address of unused network, specified either counter and type # or by net and host. -# tst_ipaddr_un [-cCOUNTER] [-p] [TYPE] -# tst_ipaddr_un [-p] NET_ID [HOST_ID] +# counter mode: +# tst_ipaddr_un [-h MIN,MAX] [-n MIN,MAX] [-p] [-c COUNTER] [TYPE] +# net & host mode: +# tst_ipaddr_un [-h MIN,MAX] [-n MIN,MAX] [-p] NET_ID [HOST_ID] # # TYPE: { lhost | rhost } (default: 'lhost') -# NET_ID: integer or hex value of net (IPv4: 3rd octet, IPv6: 3rd hextet) -# HOST_ID: integer or hex value of host (IPv4: 4th octet, IPv6: the last -# hextet, default: 0) +# NET_ID: integer or hex value of net (IPv4: 3rd octet <0,255>, IPv6: 3rd +# hextet <0,65535>) +# HOST_ID: integer or hex value of host (IPv4: 4th octet <0,255>, IPv6: the +# last hextet <0, 65535>, default: 0) # # OPTIONS # -c COUNTER: integer value for counting HOST_ID and NET_ID (default: 1) +# +# -h: specify *host* address range (HOST_ID) +# -h MIN,MAX or -h MIN or -h ,MAX +# +# -n: specify *network* address range (NET_ID) +# -n MIN,MAX or -n MIN or -n ,MAX +# # -p: print also prefix tst_ipaddr_un() { - local counter host_id max_host_id max_net_id net_id prefix tmp type - local OPTIND + local default_max=255 + [ "$TST_IPV6" ] && default_max=65535 + local max_net_id=$default_max + local min_net_id=0 - while getopts "c:p" opt; do + local counter host_id host_range is_counter max_host_id min_host_id net_id prefix tmp type + + local OPTIND + while getopts "c:h:n:p" opt; do case $opt in c) counter="$OPTARG";; + h) + if echo $OPTARG | grep -q ','; then # 'min,max' or 'min,' or ',max' + min_host_id="$(echo $OPTARG | cut -d, -f1)" + max_host_id="$(echo $OPTARG | cut -d, -f2)" + else # min + min_host_id="$OPTARG" + fi + ;; + n) + if echo $OPTARG | grep -q ','; then # 'min,max' or 'min,' or ',max' + min_net_id="$(echo $OPTARG | cut -d, -f1)" + max_net_id="$(echo $OPTARG | cut -d, -f2)" + else # min + min_net_id="$OPTARG" + fi + ;; + m) + ! tst_is_int "$OPTARG" || [ "$OPTARG" -lt 0 ]|| [ "$OPTARG" -gt $max_net_id ] && \ + tst_brk TBROK "tst_ipaddr_un: -m must be integer <0,$max_net_id> ($OPTARG)" + [ "$OPTARG" -gt $max_net_id ] && \ + tst_brk_ TBROK "tst_ipaddr_un: -m cannot be higher than $max_net_id ($OPTARG)" + max_host_id="$OPTARG" + ;; p) [ "$TST_IPV6" ] && prefix="/64" || prefix="/24";; esac done shift $(($OPTIND - 1)) + [ $# -eq 0 -o "$1" = "lhost" -o "$1" = "rhost" ] && is_counter=1 - [ "$TST_IPV6" ] && max_net_id=65535 || max_net_id=255 + if [ -z "$min_host_id" ]; then + [ "$is_counter" ] && min_host_id=1 || min_host_id=0 + fi + if [ -z "$max_host_id" ]; then + [ "$is_counter" ] && max_host_id=$((default_max - 1)) || max_host_id=$default_max + fi + + ! tst_is_int "$min_host_id" || ! tst_is_int "$max_host_id" || \ + [ $min_host_id -lt 0 -o $min_host_id -gt $default_max ] || \ + [ $max_host_id -lt 0 -o $max_host_id -gt $default_max ] && \ + tst_brk TBROK "tst_ipaddr_un: HOST_ID must be int in range <0,$default_max> ($min_host_id,$max_host_id)" + ! tst_is_int "$min_net_id" || ! tst_is_int "$max_net_id" || \ + [ $min_net_id -lt 0 -o $min_net_id -gt $default_max ] || \ + [ $max_net_id -lt 0 -o $max_net_id -gt $default_max ] && \ + tst_brk TBROK "tst_ipaddr_un: NET_ID must be int in range <0,$default_max> ($min_net_id,$max_net_id)" + + [ $min_host_id -gt $max_host_id ] && \ + tst_brk TBROK "tst_ipaddr_un: max HOST_ID ($max_host_id) must be >= min HOST_ID ($min_host_id)" + [ $min_net_id -gt $max_net_id ] && \ + tst_brk TBROK "tst_ipaddr_un: max NET_ID ($max_net_id) must be >= min NET_ID ($min_net_id)" # counter - if [ $# -eq 0 -o "$1" = "lhost" -o "$1" = "rhost" ]; then + host_range=$((max_host_id - min_host_id + 1)) + if [ "$is_counter" ]; then [ -z "$counter" ] && counter=1 [ $counter -lt 1 ] && counter=1 type="${1:-lhost}" - max_host_id=$((max_net_id - 1)) tmp=$((counter * 2)) [ "$type" = "rhost" ] && tmp=$((tmp - 1)) - - host_id=$((tmp % max_host_id)) - net_id=$((tmp / max_host_id)) - - if [ $host_id -eq 0 ]; then - host_id=$max_host_id - net_id=$((net_id - 1)) - fi + net_id=$(((tmp - 1) / host_range)) + host_id=$((tmp - net_id * host_range + min_host_id - 1)) else # net_id & host_id net_id="$1" host_id="${2:-0}" @@ -406,12 +458,10 @@ tst_ipaddr_un() net_id=$(printf %d $net_id) host_id=$(printf %d $host_id) fi - [ $net_id -lt 0 ] && net_id=0 - [ $host_id -lt 0 ] && host_id=1 + host_id=$((host_id % host_range + min_host_id)) fi - net_id=$((net_id % max_net_id)) - host_id=$((host_id % max_net_id)) + net_id=$((net_id % (max_net_id - min_net_id + 1) + min_net_id)) if [ -z "$TST_IPV6" ]; then echo "${IPV4_NET16_UNUSED}.${net_id}.${host_id}${prefix}" From patchwork Fri Oct 11 13:24:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1175174 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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46qTH85rBXz9sCJ for ; Sat, 12 Oct 2019 00:25:56 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 8C9AC3C2074 for ; Fri, 11 Oct 2019 15:25:53 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [IPv6:2001:4b78:1:20::2]) by picard.linux.it (Postfix) with ESMTP id A5E233C1CF5 for ; Fri, 11 Oct 2019 15:24:43 +0200 (CEST) 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-2.smtp.seeweb.it (Postfix) with ESMTPS id 6ABA6600C88 for ; Fri, 11 Oct 2019 15:24:43 +0200 (CEST) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 27FE9B552; Fri, 11 Oct 2019 13:24:43 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 11 Oct 2019 15:24:29 +0200 Message-Id: <20191011132433.24197-5-pvorel@suse.cz> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191011132433.24197-1-pvorel@suse.cz> References: <20191011132433.24197-1-pvorel@suse.cz> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-2.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-2.smtp.seeweb.it Subject: [LTP] [PATCH v5 4/8] net: Add tst_ipaddr_un.sh test X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 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" Testing tst_ipaddr_un() function from network shell API (tst_net.sh). Signed-off-by: Petr Vorel --- lib/newlib_tests/shell/net/tst_ipaddr_un.sh | 167 ++++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100755 lib/newlib_tests/shell/net/tst_ipaddr_un.sh diff --git a/lib/newlib_tests/shell/net/tst_ipaddr_un.sh b/lib/newlib_tests/shell/net/tst_ipaddr_un.sh new file mode 100755 index 000000000..a9d95f975 --- /dev/null +++ b/lib/newlib_tests/shell/net/tst_ipaddr_un.sh @@ -0,0 +1,167 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2019 Petr Vorel + +TST_TESTFUNC=do_test +TST_CNT=2 +TST_NEEDS_CMDS="cut" + +PATH="$(dirname $0)/../../../../testcases/lib/:$PATH" + +RHOST="foo" +. tst_net.sh + +IPV4_DATA=" +0 0|10.23.0.0 +0 1|10.23.0.1 +1 0|10.23.1.0 +1 1|10.23.1.1 +1 2|10.23.1.2 +2 2|10.23.2.2 +1 3|10.23.1.3 +3 3|10.23.3.3 +1 128|10.23.1.128 +128 128|10.23.128.128 +1 254|10.23.1.254 +254 254|10.23.254.254 +1 255|10.23.1.255 +255 255|10.23.255.255 +1 256|10.23.1.0 +256 256|10.23.0.0 +1 257|10.23.1.1 +257 257|10.23.1.1 + +-c 0|10.23.0.2 +-c 0 lhost|10.23.0.2 +-c 0 rhost|10.23.0.1 + +-c 1|10.23.0.2 +-c 1 rhost|10.23.0.1 +-c 2|10.23.0.4 +-c 2 rhost|10.23.0.3 +-c 127|10.23.0.254 +-c 127 rhost|10.23.0.253 +-c 128|10.23.1.2 +-c 128 rhost|10.23.1.1 +-c 254|10.23.1.254 +-c 254 rhost|10.23.1.253 +-c 255|10.23.2.2 +-c 255 rhost|10.23.2.1 + +-c 0 -h1,255|10.23.0.2 +-c 0 -h1,255 rhost|10.23.0.1 +-c 1 -h1,255|10.23.0.2 +-c 1 -h1,255 rhost|10.23.0.1 +-c 127 -h1,255|10.23.0.254 +-c 127 -h1,255 rhost|10.23.0.253 +-c 128 -h1,255|10.23.1.1 +-c 128 -h1,255 rhost|10.23.0.255 +-c 255 -h1,255|10.23.1.255 +-c 255 -h1,255 rhost|10.23.1.254 +-c 256 -h1,255|10.23.2.2 +-c 256 -h1,255 rhost|10.23.2.1 + +-c1 -h 2,8 -n 2,8|10.23.2.3 +-c1 -h 2,8 -n 2,8 rhost|10.23.2.2 +-c2 -h 2,8 -n 2,8|10.23.2.5 +-c2 -h 2,8 -n 2,8 rhost|10.23.2.4 + +-c1 -n 22,44|10.23.22.2 +-c1 -n 22,44 rhost|10.23.22.1 +-c2 -n 22,44|10.23.22.4 +-c2 -n 22,44 rhost|10.23.22.3 +" + +IPV6_DATA=" +0 0|fd00:23:: +0 1|fd00:23::1 +1 0|fd00:23:1:: +1 1|fd00:23:1::1 +1 2|fd00:23:1::2 +2 2|fd00:23:2::2 +1 3|fd00:23:1::3 +3 3|fd00:23:3::3 +1 32767|fd00:23:1::7fff +32767 32767|fd00:23:7fff::7fff +1 65534|fd00:23:1::fffe +65534 65534|fd00:23:fffe::fffe +1 65535|fd00:23:1::ffff +65535 65535|fd00:23:ffff::ffff +1 65536|fd00:23:1:: +65536 65536|fd00:23:: +1 65537|fd00:23:1::1 +65537 65537|fd00:23:1::1 + +-c 0|fd00:23::2 +-c 0 lhost|fd00:23::2 +-c 0 rhost|fd00:23::1 + +-c 1|fd00:23::2 +-c 1 rhost|fd00:23::1 +-c 2|fd00:23::4 +-c 2 rhost|fd00:23::3 +-c 32767|fd00:23::fffe +-c 32767 rhost|fd00:23::fffd +-c 32768|fd00:23:1::2 +-c 32768 rhost|fd00:23:1::1 +-c 65534|fd00:23:1::fffe +-c 65534 rhost|fd00:23:1::fffd +-c 65535|fd00:23:2::2 +-c 65535 rhost|fd00:23:2::1 + +-c 0 -h1,65535|fd00:23::2 +-c 0 -h1,65535 rhost|fd00:23::1 +-c 1 -h1,65535|fd00:23::2 +-c 1 -h1,65535 rhost|fd00:23::1 +-c 32767 -h1,65535|fd00:23::fffe +-c 32767 -h1,65535 rhost|fd00:23::fffd +-c 32768 -h1,65535|fd00:23:1::1 +-c 32768 -h1,65535 rhost|fd00:23::ffff +-c 65535 -h1,65535|fd00:23:1::ffff +-c 65535 -h1,65535 rhost|fd00:23:1::fffe +-c 65536 -h1,65535|fd00:23:2::2 +-c 65536 -h1,65535 rhost|fd00:23:2::1 + +-c1 -h 2,8 -n 2,8|fd00:23:2::3 +-c1 -h 2,8 -n 2,8 rhost|fd00:23:2::2 +-c2 -h 2,8 -n 2,8|fd00:23:2::5 +-c2 -h 2,8 -n 2,8 rhost|fd00:23:2::4 + +-c1 -n 22,44|fd00:23:16::2 +-c1 -n 22,44 rhost|fd00:23:16::1 +-c2 -n 22,44|fd00:23:16::4 +-c2 -n 22,44 rhost|fd00:23:16::3 +" + +test_tst_ipaddr_un() +{ + local data cmd i result + local var="$1" + + tst_res TINFO "Testing for IPv${TST_IPVER}, data: \$$var" + + eval data="\$$var" + IFS=" +" + for i in $data; do + cmd="tst_ipaddr_un $(echo $i | cut -d'|' -f 1)" + result="$(echo $i | cut -d'|' -f 2)" + tst_res TINFO "testing $cmd" + EXPECT_PASS "[ '$(eval $cmd)' = '$result' ]" + done +} + +do_test2() +{ + test_tst_ipaddr_un "IPV${TST_IPVER}_DATA" +} + +do_test() +{ + case $1 in + 1) TST_IPV6= TST_IPVER=4 do_test2;; + 2) TST_IPV6=6 TST_IPVER=6 do_test2;; + esac +} + +tst_run From patchwork Fri Oct 11 13:24:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1175169 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=2001:1418:10:5::2; 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 [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46qTGJ106Sz9sNx for ; Sat, 12 Oct 2019 00:25:12 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 6F49F3C1CAA for ; Fri, 11 Oct 2019 15:25:09 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [217.194.8.7]) by picard.linux.it (Postfix) with ESMTP id 4B5103C1447 for ; Fri, 11 Oct 2019 15:24:44 +0200 (CEST) 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-7.smtp.seeweb.it (Postfix) with ESMTPS id 0E746201189 for ; Fri, 11 Oct 2019 15:24:44 +0200 (CEST) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 425F1B560; Fri, 11 Oct 2019 13:24:43 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 11 Oct 2019 15:24:30 +0200 Message-Id: <20191011132433.24197-6-pvorel@suse.cz> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191011132433.24197-1-pvorel@suse.cz> References: <20191011132433.24197-1-pvorel@suse.cz> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH v5 5/8] shell: Introduce EXPECT_{FAIL,PASS}_BRK() X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 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" Signed-off-by: Petr Vorel --- doc/test-writing-guidelines.txt | 5 ++++- testcases/lib/tst_test.sh | 34 +++++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/doc/test-writing-guidelines.txt b/doc/test-writing-guidelines.txt index 6da87baa7..722472800 100644 --- a/doc/test-writing-guidelines.txt +++ b/doc/test-writing-guidelines.txt @@ -2428,7 +2428,7 @@ Note the '>' is escaped with '\', this causes that the '>' and filename are passed to the 'ROD' function as parameters and the 'ROD' function contains code to split '$@' on '>' and redirects the output to the file. -EXPECT_PASS and EXPECT_FAIL +EXPECT_PASS{,_BRK} and EXPECT_FAIL{,_BRK} +++++++++++++++++++++++++++ [source,sh] @@ -2443,6 +2443,9 @@ and 'tst_resm TFAIL' otherwise. 'EXPECT_FAIL' does vice versa. Output redirection rules are the same as for the 'ROD' function. In addition to that, 'EXPECT_FAIL' always redirects the command's stderr to '/dev/null'. +There are also 'EXPECT_PASS_BRK' and 'EXPECT_FAIL_BRK', which works the same way +except breaking a test when unexpected action happen. + tst_kvcmp +++++++++ diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh index e0b24c6b9..6b9374b2b 100644 --- a/testcases/lib/tst_test.sh +++ b/testcases/lib/tst_test.sh @@ -139,27 +139,53 @@ ROD() fi } -EXPECT_PASS() +_tst_expect_pass() { + local fnc="$1" + shift + tst_rod "$@" if [ $? -eq 0 ]; then tst_res TPASS "$@ passed as expected" else - tst_res TFAIL "$@ failed unexpectedly" + $fnc TFAIL "$@ failed unexpectedly" fi } -EXPECT_FAIL() +_tst_expect_fail() { + local fnc="$1" + shift + # redirect stderr since we expect the command to fail tst_rod "$@" 2> /dev/null if [ $? -ne 0 ]; then tst_res TPASS "$@ failed as expected" else - tst_res TFAIL "$@ passed unexpectedly" + $fnc TFAIL "$@ passed unexpectedly" fi } +EXPECT_PASS() +{ + _tst_expect_pass tst_res "$@" +} + +EXPECT_PASS_BRK() +{ + _tst_expect_pass tst_brk "$@" +} + +EXPECT_FAIL() +{ + _tst_expect_fail tst_res "$@" +} + +EXPECT_FAIL_BRK() +{ + _tst_expect_fail tst_brk "$@" +} + TST_RETRY_FN_EXP_BACKOFF() { local tst_fun="$1" From patchwork Fri Oct 11 13:24:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1175171 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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46qTGg1Y5Dz9sNx for ; Sat, 12 Oct 2019 00:25:30 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 48A4B3C1447 for ; Fri, 11 Oct 2019 15:25:28 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [217.194.8.7]) by picard.linux.it (Postfix) with ESMTP id CA0293C1454 for ; Fri, 11 Oct 2019 15:24:44 +0200 (CEST) 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-7.smtp.seeweb.it (Postfix) with ESMTPS id 0EEF82011CA for ; Fri, 11 Oct 2019 15:24:44 +0200 (CEST) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 6A7D9B564; Fri, 11 Oct 2019 13:24:43 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 11 Oct 2019 15:24:31 +0200 Message-Id: <20191011132433.24197-7-pvorel@suse.cz> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191011132433.24197-1-pvorel@suse.cz> References: <20191011132433.24197-1-pvorel@suse.cz> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH v5 6/8] network/route: Rewrite route{4, 6}-change-dst into new shell API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 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" * Drop route command (use just ip command), support both IPv4 and IPv6 * Add route-lib.sh (will be used in other route-change-*) * Use unused network range to avoid clash with real network * Add verification with ping (previous version sent UDP datagram with ns-udpsender, but didn't verify receiving it on rhost and didn't setup rhost ip at all) Suggested-by: Alexey Kodanev Signed-off-by: Petr Vorel --- runtest/net_stress.route | 7 +- .../network/stress/route/00_Descriptions.txt | 18 +- .../network/stress/route/route-change-dst.sh | 34 +++ testcases/network/stress/route/route-lib.sh | 17 ++ .../network/stress/route/route4-change-dst | 276 ------------------ .../network/stress/route/route6-change-dst | 272 ----------------- 6 files changed, 56 insertions(+), 568 deletions(-) create mode 100755 testcases/network/stress/route/route-change-dst.sh create mode 100644 testcases/network/stress/route/route-lib.sh delete mode 100644 testcases/network/stress/route/route4-change-dst delete mode 100644 testcases/network/stress/route/route6-change-dst diff --git a/runtest/net_stress.route b/runtest/net_stress.route index 266ef0383..5ffd57b12 100644 --- a/runtest/net_stress.route +++ b/runtest/net_stress.route @@ -1,14 +1,11 @@ -# # Stress test for routing table -# - -route4-change-dst route4-change-dst +route4-change-dst route-change-dst.sh route4-change-gw route4-change-gw route4-change-if route4-change-if route4-redirect route4-redirect route4-rmmod route4-rmmod -route6-change-dst route6-change-dst +route6-change-dst route-change-dst.sh -6 route6-change-gw route6-change-gw route6-change-if route6-change-if route6-redirect route6-redirect diff --git a/testcases/network/stress/route/00_Descriptions.txt b/testcases/network/stress/route/00_Descriptions.txt index 2a871fdae..d8a83b327 100644 --- a/testcases/network/stress/route/00_Descriptions.txt +++ b/testcases/network/stress/route/00_Descriptions.txt @@ -1,10 +1,6 @@ -route4-change-dst01 - Verify the kernel is not crashed when the destination of an IPv4 route - is changed frequently by route command - -route4-change-dst02 - Verify the kernel is not crashed when the destination of an IPv4 route - is changed frequently by ip command +route{4,6}-change-dst + Verify the IPv4/IPv6 is not broken when ip command changes route + destination many times route4-change-gw01 Verify the kernel is not crashed when the gateway of an IPv4 route is @@ -35,14 +31,6 @@ route4-rmmod02 then it is deleted by the removing network driver -route6-change-dst01 - Verify the kernel is not crashed when the destination of an IPv6 route - is changed frequently by route command - -route6-change-dst02 - Verify the kernel is not crashed when the destination of an IPv6 route - is changed frequently by ip command - route6-change-gw01 Verify the kernel is not crashed when the gateway of an IPv6 route is changed frequently by route command diff --git a/testcases/network/stress/route/route-change-dst.sh b/testcases/network/stress/route/route-change-dst.sh new file mode 100755 index 000000000..fff79fa6e --- /dev/null +++ b/testcases/network/stress/route/route-change-dst.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2019 Petr Vorel +# Copyright (c) International Business Machines Corp., 2006 +# Author: Mitsuru Chinen +# Rewrite into new shell API: Petr Vorel +# +# Change route destination +# lhost: 10.0.0.2, rhost: 10.23.x.1 + +TST_TESTFUNC="test_dst" +. route-lib.sh + +setup() +{ + tst_res TINFO "change IPv$TST_IPVER route destination $NS_TIMES times" +} + +test_dst() +{ + local iface="$(tst_iface)" + local rt="$(tst_ipaddr_un -p $1)" + local rhost="$(tst_ipaddr_un $1 1)" + + tst_res TINFO "testing route '$rt'" + + tst_add_ipaddr -s -q -a $rhost rhost + ROD ip route add $rt dev $iface + EXPECT_PASS_BRK ping$TST_IPV6 -c1 -I $(tst_ipaddr) $rhost \>/dev/null + ROD ip route del $rt dev $iface + tst_del_ipaddr -s -q -a $rhost rhost +} + +tst_run diff --git a/testcases/network/stress/route/route-lib.sh b/testcases/network/stress/route/route-lib.sh new file mode 100644 index 000000000..4afbe6323 --- /dev/null +++ b/testcases/network/stress/route/route-lib.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2019 Petr Vorel + +TST_NEEDS_ROOT=1 +TST_SETUP="setup" +TST_CLEANUP="route_cleanup" +TST_NEEDS_CMDS="ip" +TST_CNT=$NS_TIMES + +. tst_net.sh + +route_cleanup() +{ + tst_restore_ipaddr + tst_restore_ipaddr rhost +} diff --git a/testcases/network/stress/route/route4-change-dst b/testcases/network/stress/route/route4-change-dst deleted file mode 100644 index 8ec606152..000000000 --- a/testcases/network/stress/route/route4-change-dst +++ /dev/null @@ -1,276 +0,0 @@ -#!/bin/sh - -################################################################################ -## ## -## Copyright (c) International Business Machines Corp., 2006 ## -## ## -## This program is free software; you can redistribute it and#or modify ## -## it under the terms of the GNU General Public License as published by ## -## the Free Software Foundation; either version 2 of the License, or ## -## (at your option) any later version. ## -## ## -## This program is distributed in the hope that it will be useful, but ## -## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ## -## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ## -## for more details. ## -## ## -## You should have received a copy of the GNU General Public License ## -## along with this program; if not, write to the Free Software ## -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ## -## ## -## ## -################################################################################ -# -# File: -# route4-change-dst -# -# Description: -# Verify the kernel is not crashed when the destination of an IPv4 route is -# changed frequently -# test01 - by route command -# test02 - by ip command -# -# Setup: -# See testcases/network/stress/README -# -# Author: -# Mitsuru Chinen -# -# History: -# Mar 16 2006 - Created (Mitsuru Chinen) -# -#----------------------------------------------------------------------- -# Uncomment line below for debug output. -#trace_logic=${trace_logic:-"set -x"} -$trace_logic - -# Make sure the value of LTPROOT -LTPROOT=${LTPROOT:-`(cd ../../../../ ; pwd)`} -export LTPROOT - -# Total number of the test case -TST_TOTAL=2 -export TST_TOTAL - -# Default of the test case ID and the test case count -TCID=route4-change-dst -TST_COUNT=0 -export TCID -export TST_COUNT - -# Check the environmanet variable -. check_envval || exit $TST_TOTAL - -# The number of times where route is changed -NS_TIMES=${NS_TIMES:-10000} - -# The number of the test link where tests run -LINK_NUM=${LINK_NUM:-0} - -# Network portion of the IPv4 address -IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"} - -# Netmask of for the tested network -IPV4_NETMASK="255.255.255.0" -IPV4_NETMASK_NUM=24 - -# Broadcast address of the tested network -IPV4_BROADCAST=${IPV4_NETWORK}.255 - -# Host portion of the IPv4 address -LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"2"} # src -RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"} # gateway - -# The destination network -DST_NETWORK_PREFIX="10.10" # destination network would be 10.10.n.0/24 -DST_HOST="5" -DST_PORT="7" - - -#----------------------------------------------------------------------- -# -# NAME: -# do_setup -# -# DESCRIPTION: -# Make a IPv4 connectivity -# -# SET VALUES: -# rhost_ipv4addr - IPv4 Address of the remote host -# lhost_ifname - Interface name of the local host -# rhost_ifname - Interface name of the remote host -# -#----------------------------------------------------------------------- -do_setup() -{ - TCID=route4-change-dst - TST_COUNT=0 - - # Initialize the interfaces of the remote host - initialize_if rhost ${LINK_NUM} - - # Set IPv4 address to the interfaces - set_ipv4addr rhost ${LINK_NUM} ${IPV4_NETWORK} ${RHOST_IPV4_HOST} - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to add an IPv4 address the remote host" - exit $TST_TOTAL - fi - - # IPv4 address of the remote host (gateway) - rhost_ipv4addr="${IPV4_NETWORK}.${RHOST_IPV4_HOST}" - - # Get the Interface name of local host - lhost_ifname=`get_ifname lhost ${LINK_NUM}` - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to get the interface name at the local host" - exit $TST_TOTAL - fi - - # Get the Interface name of remote host - rhost_ifname=`get_ifname rhost ${LINK_NUM}` - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to get the interface name at the remote host" - exit $TST_TOTAL - fi -} - - - -#----------------------------------------------------------------------- -# -# NAME: -# do_cleanup -# -# DESCRIPTION: -# Recover the tested interfaces -# -#----------------------------------------------------------------------- -do_cleanup() -{ - # Initialize the interfaces - initialize_if lhost ${LINK_NUM} - initialize_if rhost ${LINK_NUM} -} - - -#----------------------------------------------------------------------- -# -# FUNCTION: -# test_body -# -# DESCRIPTION: -# main code of the test -# -# Arguments: -# $1: define the test type -# 1 - route command case -# 2 - ip command case -# -#----------------------------------------------------------------------- -test_body() -{ - test_type=$1 - - TCID=route4-change-dst0${test_type} - TST_COUNT=$test_type - - case $test_type in - 1) - test_command="route" - ;; - 2) - test_command="ip" - ;; - *) - tst_resm TBROK "unspecified case" - return 1 - ;; - esac - - tst_resm TINFO "Verify the kernel is not crashed when the destination of an IPv4 route is changed frequently by $test_command command in $NS_TIMES times" - - # Initialize the interface of the local host - initialize_if lhost ${LINK_NUM} - - # Assign IPv4 address to the interface of the local host - set_ipv4addr lhost ${LINK_NUM} ${IPV4_NETWORK} ${LHOST_IPV4_HOST} - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to assign an IPv4 address at the local host" - return 1 - fi - lhost_ipv4addr="${IPV4_NETWORK}.${LHOST_IPV4_HOST}" - - # Check the connectivity to the gateway - check_icmpv4_connectivity $lhost_ifname $rhost_ipv4addr - if [ $? -ne 0 ]; then - tst_resm TBROK "Test Link $LINK_NUM is somthing wrong." - return 1 - fi - - # Start the loop - cnt=0 - while [ $cnt -lt $NS_TIMES ]; do - # Define the destination IP address - dst_network_postfix=`expr $cnt % 255` - dst_addr=${DST_NETWORK_PREFIX}.${dst_network_postfix}.${DST_HOST} - dst_network=${DST_NETWORK_PREFIX}.${dst_network_postfix}.0 - - # Add the route - case $test_type in - 1) - route add -net $dst_network netmask 255.255.255.0 gw $rhost_ipv4addr dev $lhost_ifname - ;; - 2) - ip route add ${dst_network}/24 via $rhost_ipv4addr dev $lhost_ifname - ;; - esac - if [ $? -ne 0 ]; then - tst_resm TFAIL "Failed to add the route to ${dst_network}/24" - return 1 - fi - - # Load the route with UDP datagram - ns-udpsender -f 4 -D $dst_addr -p $DST_PORT -o -s 1472 - if [ $? -ne 0 ]; then - tst_resm TFAIL "Failed to run a UDP datagram sender" - return 1 - fi - - # Delete the route - case $test_type in - 1) - route del -net $dst_network netmask 255.255.255.0 gw $rhost_ipv4addr dev $lhost_ifname - ;; - 2) - ip route del ${dst_network}/24 via $rhost_ipv4addr dev $lhost_ifname - ;; - esac - if [ $? -ne 0 ]; then - tst_resm TFAIL "Cannot delete the route to ${ADDDEL_ROUTE}" - return 1 - fi - - cnt=`expr $cnt + 1` - done - - tst_resm TPASS "Test is finished correctly." - return 0 -} - - -#----------------------------------------------------------------------- -# -# Main -# -# Exit Value: -# The number of the failure -# -#----------------------------------------------------------------------- - -RC=0 -do_setup -test_body 1 || RC=`expr $RC + 1` # Case of route command -test_body 2 || RC=`expr $RC + 1` # Case of ip command -do_cleanup - -exit $RC diff --git a/testcases/network/stress/route/route6-change-dst b/testcases/network/stress/route/route6-change-dst deleted file mode 100644 index 2aa953396..000000000 --- a/testcases/network/stress/route/route6-change-dst +++ /dev/null @@ -1,272 +0,0 @@ -#!/bin/sh - -################################################################################ -## ## -## Copyright (c) International Business Machines Corp., 2006 ## -## ## -## This program is free software; you can redistribute it and#or modify ## -## it under the terms of the GNU General Public License as published by ## -## the Free Software Foundation; either version 2 of the License, or ## -## (at your option) any later version. ## -## ## -## This program is distributed in the hope that it will be useful, but ## -## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ## -## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ## -## for more details. ## -## ## -## You should have received a copy of the GNU General Public License ## -## along with this program; if not, write to the Free Software ## -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ## -## ## -## ## -################################################################################ -# -# File: -# route6-change-dst -# -# Description: -# Verify the kernel is not crashed when the destination of an IPv6 route is -# changed frequently -# test01 - by route command -# test02 - by ip command -# -# Setup: -# See testcases/network/stress/README -# -# Author: -# Mitsuru Chinen -# -# History: -# Mar 16 2006 - Created (Mitsuru Chinen) -# -#----------------------------------------------------------------------- -# Uncomment line below for debug output. -#trace_logic=${trace_logic:-"set -x"} -$trace_logic - -# Make sure the value of LTPROOT -LTPROOT=${LTPROOT:-`(cd ../../../../ ; pwd)`} -export LTPROOT - -# Total number of the test case -TST_TOTAL=2 -export TST_TOTAL - -# Default of the test case ID and the test case count -TCID=route6-change-dst -TST_COUNT=0 -export TCID -export TST_COUNT - -# Check the environmanet variable -. check_envval || exit $TST_TOTAL - -# The number of times where route is changed -NS_TIMES=${NS_TIMES:-10000} - -# The number of the test link where tests run -LINK_NUM=${LINK_NUM:-0} - -# Network portion of the IPv6 address -IPV6_NETWORK="fec0:1:1:1" - -# Netmask of for the tested network -IPV6_NETMASK_NUM=64 - -# Host portion of the IPv6 address -LHOST_IPV6_HOST=":2" # src -RHOST_IPV6_HOST=":3" # gateway - -# The destination network -DST_NETWORK_PREFIX="fd00:100:1" # dest network would be fd00:100:1:n:::/64 -DST_HOST="5" -DST_PORT="7" - - -#----------------------------------------------------------------------- -# -# NAME: -# do_setup -# -# DESCRIPTION: -# Make a IPv6 connectivity -# -# SET VALUES: -# rhost_ipv6addr - IPv6 Address of the remote host -# lhost_ifname - Interface name of the local host -# rhost_ifname - Interface name of the remote host -# -#----------------------------------------------------------------------- -do_setup() -{ - TCID=route6-change-dst - TST_COUNT=0 - - # Initialize the interfaces of the remote host - initialize_if rhost ${LINK_NUM} - - # Set IPv6 address to the interfaces - add_ipv6addr rhost ${LINK_NUM} ${IPV6_NETWORK} ${RHOST_IPV6_HOST} - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to add an IPv6 address the remote host" - exit $TST_TOTAL - fi - - # IPv6 address of the remote host (gateway) - rhost_ipv6addr="${IPV6_NETWORK}:${RHOST_IPV6_HOST}" - - # Get the Interface name of local host - lhost_ifname=`get_ifname lhost ${LINK_NUM}` - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to get the interface name at the local host" - exit $TST_TOTAL - fi - - # Get the Interface name of remote host - rhost_ifname=`get_ifname rhost ${LINK_NUM}` - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to get the interface name at the remote host" - exit $TST_TOTAL - fi -} - - -#----------------------------------------------------------------------- -# -# NAME: -# do_cleanup -# -# DESCRIPTION: -# Recover the tested interfaces -# -#----------------------------------------------------------------------- -do_cleanup() -{ - # Initialize the interfaces - initialize_if lhost ${LINK_NUM} - initialize_if rhost ${LINK_NUM} -} - - -#----------------------------------------------------------------------- -# -# FUNCTION: -# test_body -# -# DESCRIPTION: -# main code of the test -# -# Arguments: -# $1: define the test type -# 1 - route command case -# 2 - ip command case -# -#----------------------------------------------------------------------- -test_body() -{ - test_type=$1 - - TCID=route6-change-dst0${test_type} - TST_COUNT=$test_type - - case $test_type in - 1) - test_command="route" - ;; - 2) - test_command="ip" - ;; - *) - tst_resm TBROK "unspecified case" - return 1 - ;; - esac - - tst_resm TINFO "Verify the kernel is not crashed when the destination of an IPv6 route is changed frequently by $test_command command in $NS_TIMES times" - - # Initialize the interface of the local host - initialize_if lhost ${LINK_NUM} - - # Assign IPv6 address to the interface of the local host - add_ipv6addr lhost ${LINK_NUM} ${IPV6_NETWORK} ${LHOST_IPV6_HOST} - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to assign an IPv6 address at the local host" - return 1 - fi - lhost_ipv6addr="${IPV6_NETWORK}:${LHOST_IPV6_HOST}" - - # Check the connectivity to the gateway - check_icmpv6_connectivity $lhost_ifname $rhost_ipv6addr - if [ $? -ne 0 ]; then - tst_resm TBROK "Test Link $LINK_NUM is something wrong." - return 1 - fi - - # Start the loop - cnt=0 - while [ $cnt -lt $NS_TIMES ]; do - # Define the destination IP address - tmp_postfix=`expr $cnt % 65535` - dst_network_postfix=`printf "%x" $tmp_postfix` - dst_addr=${DST_NETWORK_PREFIX}:${dst_network_postfix}::${DST_HOST} - dst_network=${DST_NETWORK_PREFIX}:${dst_network_postfix}:: - - # Add the route - case $test_type in - 1) - route -A inet6 add ${dst_network}/64 gw $rhost_ipv6addr dev $lhost_ifname - ;; - 2) - ip -f inet6 route add ${dst_network}/64 via $rhost_ipv6addr dev $lhost_ifname - ;; - esac - if [ $? -ne 0 ]; then - tst_resm TFAIL "Failed to add the route to ${dst_network}/64" - return 1 - fi - - # Load the route with UDP datagram - ns-udpsender -f 6 -D $dst_addr -p $DST_PORT -o -s 1452 - if [ $? -ne 0 ]; then - tst_resm TFAIL "Failed to run a UDP datagram sender" - return 1 - fi - - # Delete the route - case $test_type in - 1) - route -A inet6 del ${dst_network}/64 gw $rhost_ipv6addr dev $lhost_ifname - ;; - 2) - ip -f inet6 route del ${dst_network}/64 via $rhost_ipv6addr dev $lhost_ifname - ;; - esac - if [ $? -ne 0 ]; then - tst_resm TFAIL "Cannot delete the route to ${ADDDEL_ROUTE}" - return 1 - fi - - cnt=`expr $cnt + 1` - done - - tst_resm TPASS "Test is finished correctly." - return 0 -} - - -#----------------------------------------------------------------------- -# -# Main -# -# Exit Value: -# The number of the failure -# -#----------------------------------------------------------------------- - -RC=0 -do_setup -test_body 1 || RC=`expr $RC + 1` # Case of route command -test_body 2 || RC=`expr $RC + 1` # Case of ip command -do_cleanup - -exit $RC From patchwork Fri Oct 11 13:24:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1175173 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=2001:1418:10:5::2; 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 [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46qTGy4TrRz9sCJ for ; Sat, 12 Oct 2019 00:25:46 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 92E493C22A7 for ; Fri, 11 Oct 2019 15:25:43 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) by picard.linux.it (Postfix) with ESMTP id 9007A3C1CB9 for ; Fri, 11 Oct 2019 15:24:44 +0200 (CEST) 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-7.smtp.seeweb.it (Postfix) with ESMTPS id 0E7E420118C for ; Fri, 11 Oct 2019 15:24:44 +0200 (CEST) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 9B254B565; Fri, 11 Oct 2019 13:24:43 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 11 Oct 2019 15:24:32 +0200 Message-Id: <20191011132433.24197-8-pvorel@suse.cz> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191011132433.24197-1-pvorel@suse.cz> References: <20191011132433.24197-1-pvorel@suse.cz> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH v5 7/8] network/route: Rewrite route{4, 6}-change-gw into new shell API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 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" * Drop route command (use just ip command), support both IPv4 and IPv6 * Use unused network range to avoid clash with real network * Add verification with ping (previous version sent UDP datagram with ns-udpsender, but didn't verify receiving it on rhost and didn't setup rhost ip at all) Signed-off-by: Petr Vorel --- runtest/net_stress.route | 4 +- .../network/stress/route/00_Descriptions.txt | 18 +- .../network/stress/route/route-change-gw.sh | 39 +++ .../network/stress/route/route4-change-gw | 292 ------------------ .../network/stress/route/route6-change-gw | 292 ------------------ 5 files changed, 44 insertions(+), 601 deletions(-) create mode 100755 testcases/network/stress/route/route-change-gw.sh delete mode 100644 testcases/network/stress/route/route4-change-gw delete mode 100644 testcases/network/stress/route/route6-change-gw diff --git a/runtest/net_stress.route b/runtest/net_stress.route index 5ffd57b12..cde6d5d11 100644 --- a/runtest/net_stress.route +++ b/runtest/net_stress.route @@ -1,12 +1,12 @@ # Stress test for routing table route4-change-dst route-change-dst.sh -route4-change-gw route4-change-gw +route4-change-gw route-change-gw.sh route4-change-if route4-change-if route4-redirect route4-redirect route4-rmmod route4-rmmod route6-change-dst route-change-dst.sh -6 -route6-change-gw route6-change-gw +route6-change-gw route-change-gw.sh -6 route6-change-if route6-change-if route6-redirect route6-redirect route6-rmmod route6-rmmod diff --git a/testcases/network/stress/route/00_Descriptions.txt b/testcases/network/stress/route/00_Descriptions.txt index d8a83b327..bb8f46da6 100644 --- a/testcases/network/stress/route/00_Descriptions.txt +++ b/testcases/network/stress/route/00_Descriptions.txt @@ -2,13 +2,9 @@ route{4,6}-change-dst Verify the IPv4/IPv6 is not broken when ip command changes route destination many times -route4-change-gw01 - Verify the kernel is not crashed when the gateway of an IPv4 route is - changed frequently by route command - -route4-change-gw02 - Verify the kernel is not crashed when the gateway of an IPv4 route is - changed frequently by ip command +route{4,6}-change-gw + Verify the IPv4/IPv6 is not broken when ip command changes route + gateway many times route4-change-if01 Verify the kernel is not crashed when the interface of an IPv4 route is @@ -31,14 +27,6 @@ route4-rmmod02 then it is deleted by the removing network driver -route6-change-gw01 - Verify the kernel is not crashed when the gateway of an IPv6 route is - changed frequently by route command - -route6-change-gw02 - Verify the kernel is not crashed when the gateway of an IPv6 route is - changed frequently by ip command - route6-change-if01 Verify the kernel is not crashed when the interface of an IPv6 route is changed frequently by route command diff --git a/testcases/network/stress/route/route-change-gw.sh b/testcases/network/stress/route/route-change-gw.sh new file mode 100755 index 000000000..d9eeb8184 --- /dev/null +++ b/testcases/network/stress/route/route-change-gw.sh @@ -0,0 +1,39 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2019 Petr Vorel +# Copyright (c) International Business Machines Corp., 2006 +# Author: Mitsuru Chinen +# Rewrite into new shell API: Petr Vorel +# +# Change route gateway +# lhost: 10.23.x.2, gw (on rhost): 10.23.x.1, rhost: 10.23.0.1 + +TST_TESTFUNC="test_gw" +. route-lib.sh + +setup() +{ + tst_res TINFO "change IPv$TST_IPVER route gateway $NS_TIMES times" + + rt="$(tst_ipaddr_un -p 0 0)" + lhost="$(tst_ipaddr_un 1 1)" + rhost="$(tst_ipaddr_un 0 1)" + tst_add_ipaddr -s -q -a $lhost + tst_add_ipaddr -s -q -a $rhost rhost +} + +test_gw() +{ + local gw="$(tst_ipaddr_un -h 2,254 1 $(($1 + 1)))" + local iface="$(tst_iface)" + + tst_res TINFO "testing route over gateway '$gw'" + + tst_add_ipaddr -s -q -a $gw rhost + ROD ip route add $rt dev $iface via $gw + EXPECT_PASS_BRK ping$TST_IPV6 -c1 -I $lhost $rhost \>/dev/null + ROD ip route del $rt dev $iface via $gw + tst_del_ipaddr -s -q -a $gw rhost +} + +tst_run diff --git a/testcases/network/stress/route/route4-change-gw b/testcases/network/stress/route/route4-change-gw deleted file mode 100644 index 791f98cc7..000000000 --- a/testcases/network/stress/route/route4-change-gw +++ /dev/null @@ -1,292 +0,0 @@ -#!/bin/sh - -################################################################################ -## ## -## Copyright (c) International Business Machines Corp., 2006 ## -## ## -## This program is free software; you can redistribute it and#or modify ## -## it under the terms of the GNU General Public License as published by ## -## the Free Software Foundation; either version 2 of the License, or ## -## (at your option) any later version. ## -## ## -## This program is distributed in the hope that it will be useful, but ## -## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ## -## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ## -## for more details. ## -## ## -## You should have received a copy of the GNU General Public License ## -## along with this program; if not, write to the Free Software ## -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ## -## ## -## ## -################################################################################ -# -# File: -# route4-change-gw -# -# Description: -# Verify the kernel is not crashed when the gateway of an IPv4 route is -# changed frequently -# test01 - by route command -# test02 - by ip command -# -# Setup: -# See testcases/network/stress/README -# -# Author: -# Mitsuru Chinen -# -# History: -# Mar 16 2006 - Created (Mitsuru Chinen) -# -#----------------------------------------------------------------------- -# Uncomment line below for debug output. -#trace_logic=${trace_logic:-"set -x"} -$trace_logic - -# Make sure the value of LTPROOT -LTPROOT=${LTPROOT:-`(cd ../../../../ ; pwd)`} -export LTPROOT - -# Total number of the test case -TST_TOTAL=2 -export TST_TOTAL - -# Default of the test case ID and the test case count -TCID=route4-change-gw -TST_COUNT=0 -export TCID -export TST_COUNT - -# Check the environmanet variable -. check_envval || exit $TST_TOTAL - -# The number of times where route is changed -NS_TIMES=${NS_TIMES:-10000} - -# The number of the test link where tests run -LINK_NUM=${LINK_NUM:-0} - -# Network portion of the IPv4 address -IPV4_NETWORK=${IPV4_NETWORK:-"10.0.0"} - -# Netmask of for the tested network -IPV4_NETMASK_NUM=24 - -# Broadcast address of the tested network -IPV4_BROADCAST=${IPV4_NETWORK}.255 - -# Host portion of the IPv4 address -LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"1"} # src -RHOST_IPV4_HOST_TOP="10" # gateway -RHOST_IPV4_HOST_LAST=19 - -# The destination network -DST_NETWORK="10.10.0" # destination network would be 10.10.0.0/24 -DST_HOST="5" -DST_PORT="7" - - -#----------------------------------------------------------------------- -# -# NAME: -# do_setup -# -# DESCRIPTION: -# Make a IPv4 connectivity -# -# SET VALUES: -# rhost_ipv4addr - IPv4 Address of the remote host -# lhost_ifname - Interface name of the local host -# rhost_ifname - Interface name of the remote host -# -#----------------------------------------------------------------------- -do_setup() -{ - TCID=route4-change-gw - TST_COUNT=0 - - # Get the Interface name of local host - lhost_ifname=`get_ifname lhost ${LINK_NUM}` - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to get the interface name at the local host" - exit $TST_TOTAL - fi - - # Get the Interface name of remote host - rhost_ifname=`get_ifname rhost ${LINK_NUM}` - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to get the interface name at the remote host" - exit $TST_TOTAL - fi - - # Initialize the interfaces of the remote host - initialize_if rhost ${LINK_NUM} - - # Set IPv4 address to the interface of the remote host - rhost_part=$RHOST_IPV4_HOST_TOP - while [ $rhost_part -le $RHOST_IPV4_HOST_LAST ]; do - ret=`$LTP_RSH $RHOST '( PATH=/sbin:/usr/sbin:$PATH ; ip addr add '${IPV4_NETWORK}.${rhost_part}/${IPV4_NETMASK_NUM}' broadcast '${IPV4_NETWORK}'.255 dev '$rhost_ifname' ) > /dev/null ; echo $?'` - if [ $ret -ne 0 ]; then - tst_resm TBROK "Failed to assign IP address to the interface at the remote host" - exit $TST_TOTAL - fi - rhost_part=`expr $rhost_part + 1` - done -} - - -#----------------------------------------------------------------------- -# -# NAME: -# do_cleanup -# -# DESCRIPTION: -# Recover the tested interfaces -# -#----------------------------------------------------------------------- -do_cleanup() -{ - killall -SIGHUP ns-udpsender >/dev/null 2>&1 - - # Initialize the interfaces - initialize_if lhost ${LINK_NUM} - initialize_if rhost ${LINK_NUM} -} - - -#----------------------------------------------------------------------- -# -# FUNCTION: -# test_body -# -# DESCRIPTION: -# main code of the test -# -# Arguments: -# $1: define the test type -# 1 - route command case -# 2 - ip command case -# -#----------------------------------------------------------------------- -test_body() -{ - test_type=$1 - - TCID=route4-change-gw0${test_type} - TST_COUNT=$test_type - - case $test_type in - 1) - test_command="route" - ;; - 2) - test_command="ip" - ;; - *) - tst_resm TBROK "unspecified case" - return 1 - ;; - esac - - tst_resm TINFO "Verify the kernel is not crashed when the gateway of an IPv4 route is changed frequently by $test_command command in $NS_TIMES times" - - # Initialize the interface of the local host - initialize_if lhost ${LINK_NUM} - - # Assign IPv4 address to the interface of the local host - set_ipv4addr lhost ${LINK_NUM} ${IPV4_NETWORK} ${LHOST_IPV4_HOST} - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to assign an IPv4 address at the local host" - return 1 - fi - - # Check the connectivity to the gateway - rhost_part=$RHOST_IPV4_HOST_TOP - check_icmpv4_connectivity $lhost_ifname ${IPV4_NETWORK}.${rhost_part} - if [ $? -ne 0 ]; then - tst_resm TBROK "Test Link $LINK_NUM is somthing wrong." - return 1 - fi - - # Set the variables regarding the destination host - dst_addr=${DST_NETWORK}.${DST_HOST} - dst_network=${DST_NETWORK}.0 - - # Set the first route - case $test_type in - 1) - route add -net $dst_network netmask 255.255.255.0 gw ${IPV4_NETWORK}.${rhost_part} dev $lhost_ifname - ;; - 2) - ip route add ${dst_network}/24 via ${IPV4_NETWORK}.${rhost_part} dev $lhost_ifname - ;; - esac - - # Load the route with UDP traffic - ns-udpsender -f 4 -D $dst_addr -p $DST_PORT -b -s 1472 - if [ $? -ne 0 ]; then - tst_resm TFAIL "Failed to run a UDP datagram sender" - return 1 - fi - - # Loop for changing the route - cnt=0 - while [ $cnt -lt $NS_TIMES ]; do - pre_rhost_part=$rhost_part - rhost_part=`expr $rhost_part + 1` - if [ $rhost_part -gt $RHOST_IPV4_HOST_LAST ]; then - rhost_part=$RHOST_IPV4_HOST_TOP - fi - - case $test_type in - 1) - route add -net $dst_network netmask 255.255.255.0 gw ${IPV4_NETWORK}.${rhost_part} dev $lhost_ifname - route del -net $dst_network netmask 255.255.255.0 gw ${IPV4_NETWORK}.${pre_rhost_part} dev $lhost_ifname - ;; - 2) - ip route change ${dst_network}/24 via ${IPV4_NETWORK}.${rhost_part} dev $lhost_ifname - ;; - esac - if [ $? -ne 0 ]; then - tst_resm TFAIL "Failed to change the gateway to ${IPV4_NETWORK}.${rhost_part}" - return 1 - fi - - # Rerun if udp datagram sender is dead - ps auxw | fgrep -v grep | grep ns-udpsender > /dev/null - if [ $? -ne 0 ]; then - ns-udpsender -f 4 -D $dst_addr -p $DST_PORT -b -s 1472 - if [ $? -ne 0 ]; then - tst_resm TFAIL "Failed to run a UDP datagram sender" - return 1 - fi - fi - - cnt=`expr $cnt + 1` - done - - # Kill the udp datagram sender - killall -SIGHUP ns-udpsender >/dev/null 2>&1 - - tst_resm TPASS "Test is finished correctly." - return 0 -} - - -#----------------------------------------------------------------------- -# -# Main -# -# Exit Value: -# The number of the failure -# -#----------------------------------------------------------------------- - -RC=0 -do_setup -test_body 1 || RC=`expr $RC + 1` # Case of route command -test_body 2 || RC=`expr $RC + 1` # Case of ip command -do_cleanup - -exit $RC diff --git a/testcases/network/stress/route/route6-change-gw b/testcases/network/stress/route/route6-change-gw deleted file mode 100644 index 05e45b907..000000000 --- a/testcases/network/stress/route/route6-change-gw +++ /dev/null @@ -1,292 +0,0 @@ -#!/bin/sh -################################################################################ -## ## -## Copyright (c) International Business Machines Corp., 2006 ## -## ## -## This program is free software; you can redistribute it and#or modify ## -## it under the terms of the GNU General Public License as published by ## -## the Free Software Foundation; either version 2 of the License, or ## -## (at your option) any later version. ## -## ## -## This program is distributed in the hope that it will be useful, but ## -## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ## -## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ## -## for more details. ## -## ## -## You should have received a copy of the GNU General Public License ## -## along with this program; if not, write to the Free Software ## -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ## -## ## -## ## -################################################################################ -# -# File: -# route6-change-gw -# -# Description: -# Verify the kernel is not crashed when the gateway of an IPv6 route is -# changed frequently -# test01 - by route command -# test02 - by ip command -# -# Setup: -# See testcases/network/stress/README -# -# Author: -# Mitsuru Chinen -# -# History: -# Mar 16 2006 - Created (Mitsuru Chinen) -# -#----------------------------------------------------------------------- -# Uncomment line below for debug output. -#trace_logic=${trace_logic:-"set -x"} -$trace_logic - -# Make sure the value of LTPROOT -LTPROOT=${LTPROOT:-`(cd ../../../../ ; pwd)`} -export LTPROOT - -# Total number of the test case -TST_TOTAL=2 -export TST_TOTAL - -# Default of the test case ID and the test case count -TCID=route6-change-gw -TST_COUNT=0 -export TCID -export TST_COUNT - -# Check the environmanet variable -. check_envval || exit $TST_TOTAL - -# The number of times where route is changed -NS_TIMES=${NS_TIMES:-10000} - -# The number of the test link where tests run -LINK_NUM=${LINK_NUM:-0} - -# Network portion of the IPv6 address -IPV6_NETWORK="fec0:1:1:1" - -# Netmask of for the tested network -IPV6_NETMASK_NUM=64 - -# Host portion of the IPv6 address -LHOST_IPV6_HOST=":2" # src -RHOST_IPV6_HOST_TOP="10" # gateway -RHOST_IPV6_HOST_LAST="19" - -# The destination network -DST_NETWORK="fd00:100:1:1" # dest network would be fd00:100:1:1:::/64 -DST_HOST="5" -DST_PORT="7" - - -#----------------------------------------------------------------------- -# -# NAME: -# do_setup -# -# DESCRIPTION: -# Make a IPv6 connectivity -# -# SET VALUES: -# rhost_ipv6addr - IPv6 Address of the remote host -# lhost_ifname - Interface name of the local host -# rhost_ifname - Interface name of the remote host -# -#----------------------------------------------------------------------- -do_setup() -{ - TCID=route6-change-gw - TST_COUNT=0 - - # Get the Interface name of local host - lhost_ifname=`get_ifname lhost ${LINK_NUM}` - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to get the interface name at the local host" - exit $TST_TOTAL - fi - - # Get the Interface name of remote host - rhost_ifname=`get_ifname rhost ${LINK_NUM}` - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to get the interface name at the remote host" - exit $TST_TOTAL - fi - - # Initialize the interfaces of the remote host - initialize_if rhost ${LINK_NUM} - - # Set IPv6 address to the interface of the remote host - rhost_part=$RHOST_IPV6_HOST_TOP - rhost_part_hex=`printf "%x" $rhost_part` - while [ $rhost_part -le $RHOST_IPV6_HOST_LAST ]; do - rhost_part_hex=":`printf "%x" $rhost_part`" - add_ipv6addr rhost ${LINK_NUM} ${IPV6_NETWORK} ${rhost_part_hex} - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to assign IP address to the interface at the remote host" - exit $TST_TOTAL - fi - rhost_part=`expr $rhost_part + 1` - done -} - - -#----------------------------------------------------------------------- -# -# NAME: -# do_cleanup -# -# DESCRIPTION: -# Recover the tested interfaces -# -#----------------------------------------------------------------------- -do_cleanup() -{ - killall -SIGHUP ns-udpsender >/dev/null 2>&1 - - # Initialize the interfaces - initialize_if lhost ${LINK_NUM} - initialize_if rhost ${LINK_NUM} -} - - -#----------------------------------------------------------------------- -# -# FUNCTION: -# test_body -# -# DESCRIPTION: -# main code of the test -# -# Arguments: -# $1: define the test type -# 1 - route command case -# 2 - ip command case -# -#----------------------------------------------------------------------- -test_body() -{ - test_type=$1 - - TCID=route6-change-gw0${test_type} - TST_COUNT=$test_type - - case $test_type in - 1) - test_command="route" - ;; - 2) - test_command="ip" - ;; - *) - tst_resm TBROK "unspecified case" - return 1 - ;; - esac - - tst_resm TINFO "Verify the kernel is not crashed when the gateway of an IPv6 route is changed frequently by $test_command command in $NS_TIMES times" - - # Initialize the interface of the local host - initialize_if lhost ${LINK_NUM} - - # Assign IPv6 address to the interface of the local host - add_ipv6addr lhost ${LINK_NUM} ${IPV6_NETWORK} ${LHOST_IPV6_HOST} - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to assign an IPv6 address at the local host" - return 1 - fi - - # Check the connectivity to the gateway - rhost_part=$RHOST_IPV6_HOST_TOP - rhost_part_hex=":`printf "%x" $rhost_part`" - check_icmpv6_connectivity $lhost_ifname ${IPV6_NETWORK}:${rhost_part_hex} - if [ $? -ne 0 ]; then - tst_resm TBROK "Test Link $LINK_NUM is somthing wrong." - return 1 - fi - - # Set the variables regarding the destination host - dst_addr=${DST_NETWORK}::${DST_HOST} - dst_network=${DST_NETWORK}:: - - # Set the first route - case $test_type in - 1) - route -A inet6 add ${dst_network}/64 gw ${IPV6_NETWORK}:${rhost_part_hex} dev $lhost_ifname - ;; - 2) - ip -f inet6 route add ${dst_network}/64 via ${IPV6_NETWORK}:${rhost_part_hex} dev $lhost_ifname - ;; - esac - - # Load the route with UDP traffic - ns-udpsender -f 6 -D $dst_addr -p $DST_PORT -b -s 1452 - if [ $? -ne 0 ]; then - tst_resm TFAIL "Failed to run a UDP datagram sender" - return 1 - fi - - # Loop for changing the route - cnt=0 - while [ $cnt -lt $NS_TIMES ]; do - pre_rhost_part_hex=$rhost_part_hex - rhost_part=`expr $rhost_part + 1` - if [ $rhost_part -gt $RHOST_IPV6_HOST_LAST ]; then - rhost_part=$RHOST_IPV6_HOST_TOP - fi - rhost_part_hex=":`printf "%x" $rhost_part`" - - case $test_type in - 1) - route -A inet6 add ${dst_network}/64 gw ${IPV6_NETWORK}:${rhost_part_hex} dev $lhost_ifname - route -A inet6 del ${dst_network}/64 gw ${IPV6_NETWORK}:${pre_rhost_part_hex} dev $lhost_ifname - ;; - 2) - ip -f inet6 route change ${dst_network}/64 via ${IPV6_NETWORK}:${rhost_part_hex} dev $lhost_ifname - ;; - esac - if [ $? -ne 0 ]; then - tst_resm TFAIL "Failed to change the gateway to ${IPV6_NETWORK}.${rhost_part}" - return 1 - fi - - # Rerun if udp datagram sender is dead - ps auxw | fgrep -v grep | grep ns-udpsender > /dev/null - if [ $? -ne 0 ]; then - ns-udpsender -f 4 -D $dst_addr -p $DST_PORT -o -s 1472 - if [ $? -ne 0 ]; then - tst_resm TFAIL "Failed to run a UDP datagram sender" - return 1 - fi - fi - - cnt=`expr $cnt + 1` - done - - # Kill the udp datagram sender - killall -SIGHUP ns-udpsender >/dev/null 2>&1 - - tst_resm TPASS "Test is finished correctly." - return 0 -} - - -#----------------------------------------------------------------------- -# -# Main -# -# Exit Value: -# The number of the failure -# -#----------------------------------------------------------------------- - -RC=0 -do_setup -test_body 1 || RC=`expr $RC + 1` # Case of route command -test_body 2 || RC=`expr $RC + 1` # Case of ip command -do_cleanup - -exit $RC From patchwork Fri Oct 11 13:24:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1175172 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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46qTGp6QbYz9sCJ for ; Sat, 12 Oct 2019 00:25:38 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 2A29A3C2296 for ; Fri, 11 Oct 2019 15:25:36 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [217.194.8.2]) by picard.linux.it (Postfix) with ESMTP id DEEF93C14BB for ; Fri, 11 Oct 2019 15:24:44 +0200 (CEST) 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-2.smtp.seeweb.it (Postfix) with ESMTPS id 2D07D600C24 for ; Fri, 11 Oct 2019 15:24:44 +0200 (CEST) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id D02C3B566; Fri, 11 Oct 2019 13:24:43 +0000 (UTC) From: Petr Vorel To: ltp@lists.linux.it Date: Fri, 11 Oct 2019 15:24:33 +0200 Message-Id: <20191011132433.24197-9-pvorel@suse.cz> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191011132433.24197-1-pvorel@suse.cz> References: <20191011132433.24197-1-pvorel@suse.cz> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-2.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-2.smtp.seeweb.it Subject: [LTP] [PATCH v5 8/8] network/route: Rewrite route{4, 6}-change-if into new API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 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" * Drop route command (use just ip command), support both IPv4 and IPv6 * Use unused network range to avoid clash with real network * Add verification with ping (previous version sent UDP datagram with ns-udpsender, but didn't verify receiving it on rhost and didn't setup rhost ip at all) * Add tst_get_ifaces_cnt() into tst_net.sh Signed-off-by: Petr Vorel --- runtest/net_stress.route | 4 +- testcases/lib/tst_net.sh | 8 + .../network/stress/route/00_Descriptions.txt | 18 +- .../network/stress/route/route-change-if.sh | 90 +++++ .../network/stress/route/route4-change-if | 324 ------------------ .../network/stress/route/route6-change-if | 323 ----------------- 6 files changed, 103 insertions(+), 664 deletions(-) create mode 100755 testcases/network/stress/route/route-change-if.sh delete mode 100644 testcases/network/stress/route/route4-change-if delete mode 100644 testcases/network/stress/route/route6-change-if diff --git a/runtest/net_stress.route b/runtest/net_stress.route index cde6d5d11..4eff6766a 100644 --- a/runtest/net_stress.route +++ b/runtest/net_stress.route @@ -1,12 +1,12 @@ # Stress test for routing table route4-change-dst route-change-dst.sh route4-change-gw route-change-gw.sh -route4-change-if route4-change-if +route4-change-if route-change-if.sh route4-redirect route4-redirect route4-rmmod route4-rmmod route6-change-dst route-change-dst.sh -6 route6-change-gw route-change-gw.sh -6 -route6-change-if route6-change-if +route6-change-if route-change-if.sh -6 route6-redirect route6-redirect route6-rmmod route6-rmmod diff --git a/testcases/lib/tst_net.sh b/testcases/lib/tst_net.sh index 92d55b5e2..4be1bc0fc 100644 --- a/testcases/lib/tst_net.sh +++ b/testcases/lib/tst_net.sh @@ -289,6 +289,14 @@ tst_get_ifaces() fi } +# Get count of test interfaces for local/remote host. +tst_get_ifaces_cnt() +{ + tst_test_cmds awk + local type="${1:-lhost}" + echo "$(tst_get_ifaces $type)" | awk '{print NF}' +} + # Get HW addresses from defined test interface names. # tst_get_hwaddrs [TYPE] # TYPE: { lhost | rhost }; Default value is 'lhost'. diff --git a/testcases/network/stress/route/00_Descriptions.txt b/testcases/network/stress/route/00_Descriptions.txt index bb8f46da6..e0e2e42c6 100644 --- a/testcases/network/stress/route/00_Descriptions.txt +++ b/testcases/network/stress/route/00_Descriptions.txt @@ -6,13 +6,9 @@ route{4,6}-change-gw Verify the IPv4/IPv6 is not broken when ip command changes route gateway many times -route4-change-if01 - Verify the kernel is not crashed when the interface of an IPv4 route is - changed frequently by route command - -route4-change-if02 - Verify the kernel is not crashed when the interface of an IPv4 route is - changed frequently by ip command +route{4,6}-change-if + Verify the IPv4/IPv6 is not broken when ip command changes route + interface many times route4-redirect01 Verify the kernel is not crashed when the IPv4 route is modified by @@ -27,14 +23,6 @@ route4-rmmod02 then it is deleted by the removing network driver -route6-change-if01 - Verify the kernel is not crashed when the interface of an IPv6 route is - changed frequently by route command - -route6-change-if02 - Verify the kernel is not crashed when the interface of an IPv6 route is - changed frequently by ip command - route6-redirect01 Verify the kernel is not crashed when the IPv6 route is modified by ICMP Redirects frequently diff --git a/testcases/network/stress/route/route-change-if.sh b/testcases/network/stress/route/route-change-if.sh new file mode 100755 index 000000000..fd7724d59 --- /dev/null +++ b/testcases/network/stress/route/route-change-if.sh @@ -0,0 +1,90 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2019 Petr Vorel +# Copyright (c) International Business Machines Corp., 2006 +# Author: Mitsuru Chinen +# +# Change route interface +# lhost: 10.23.x.2, gw (on rhost): 10.23.x.1, rhost: 10.23.0.1, switching ifaces on lhost + +TST_TESTFUNC="test_if" +. route-lib.sh +TST_CLEANUP="cleanup" + +add_macvlan() +{ + local action="add" + local OPTIND + while getopts d opt; do + case "$opt" in + d) action="del";; + esac + done + shift $((OPTIND - 1)) + + local iface="$1" + local type="${2:-lhost}" + + cmd="ip link $action $iface link $(tst_iface $type) type macvlan mode bridge" + if [ $type = "lhost" ]; then + ROD $cmd + [ "$action" = "add" ] || return + LHOST_IFACES="$LHOST_IFACES $iface" + else + tst_rhost_run -s -c "$cmd" + [ "$action" = "add" ] || return + RHOST_IFACES="$RHOST_IFACES $iface" + fi + tst_init_iface $type 1 +} + +setup() +{ + tst_res TINFO "change IPv$TST_IPVER route interface $NS_TIMES times" + + rt="$(tst_ipaddr_un -p 0)" + rhost="$(tst_ipaddr_un 0 1)" + tst_add_ipaddr -s -q -a $rhost rhost + + if [ $(tst_get_ifaces_cnt) -lt 2 ]; then + new_liface="ltp_mv2" + tst_res TINFO "2 or more local ifaces required, adding $new_liface" + add_macvlan $new_liface + fi + + if [ $(tst_get_ifaces_cnt rhost) -lt 2 ]; then + new_riface="ltp_mv1" + tst_res TINFO "2 or more remote ifaces required, adding $new_riface" + add_macvlan $new_riface rhost + fi +} + +test_if() +{ + local max=253 + [ "$TST_IPV6" ] && max=65533 + local net_id=$(($1 % $max + 1)) + local gw="$(tst_ipaddr_un $net_id 1)" + local lhost="$(tst_ipaddr_un $net_id 2)" + local link_num="$(($1 % $(tst_get_ifaces_cnt)))" + local iface="$(tst_iface lhost $link_num)" + + tst_res TINFO "testing route over interface '$iface' with gateway '$gw'" + + tst_add_ipaddr -s -q -a $lhost lhost $link_num + tst_add_ipaddr -s -q -a $gw rhost $link_num + ROD ip route add $rt dev $iface via $gw + EXPECT_PASS_BRK ping$TST_IPV6 -c1 -I $lhost $rhost \>/dev/null + ROD ip route del $rt dev $iface via $gw + tst_del_ipaddr -s -q -a $lhost lhost $link_num + tst_del_ipaddr -s -q -a $gw rhost $link_num +} + +cleanup() +{ + [ "$new_liface" ] && add_macvlan -d $new_liface + [ "$new_riface" ] && add_macvlan -d $new_riface rhost + route_cleanup +} + +tst_run diff --git a/testcases/network/stress/route/route4-change-if b/testcases/network/stress/route/route4-change-if deleted file mode 100644 index 8753203d0..000000000 --- a/testcases/network/stress/route/route4-change-if +++ /dev/null @@ -1,324 +0,0 @@ -#!/bin/sh - -################################################################################ -## ## -## Copyright (c) International Business Machines Corp., 2006 ## -## ## -## This program is free software; you can redistribute it and#or modify ## -## it under the terms of the GNU General Public License as published by ## -## the Free Software Foundation; either version 2 of the License, or ## -## (at your option) any later version. ## -## ## -## This program is distributed in the hope that it will be useful, but ## -## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ## -## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ## -## for more details. ## -## ## -## You should have received a copy of the GNU General Public License ## -## along with this program; if not, write to the Free Software ## -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ## -## ## -## ## -################################################################################ -# -# File: -# route4-change-if -# -# Description: -# Verify the kernel is not crashed when the interface of an IPv4 route is -# changed frequently -# test01 - by route command -# test02 - by ip command -# -# Setup: -# See testcases/network/stress/README -# -# Author: -# Mitsuru Chinen -# -# History: -# Mar 17 2006 - Created (Mitsuru Chinen) -# -#----------------------------------------------------------------------- -# Uncomment line below for debug output. -#trace_logic=${trace_logic:-"set -x"} -$trace_logic - -# Make sure the value of LTPROOT -LTPROOT=${LTPROOT:-`(cd ../../../../ ; pwd)`} -export LTPROOT - -# Total number of the test case -TST_TOTAL=2 -export TST_TOTAL - -# Default of the test case ID and the test case count -TCID=route4-change-if -TST_COUNT=0 -export TCID -export TST_COUNT - -# Check the environmanet variable -. check_envval || exit $TST_TOTAL - -# The number of times where route is changed -NS_TIMES=${NS_TIMES:-10000} - -# The first 2 ocnted of the Network portion of the gateway address -IPV4_NETWORK_PRE=${IPV4_NETWORK_PRE:-"10.0"} - -# Netmask of for the gateway -IPV4_NETMASK_NUM=24 - -# Host portion of the IPv4 address -LHOST_IPV4_HOST=${LHOST_IPV4_HOST:-"2"} # src -RHOST_IPV4_HOST=${RHOST_IPV4_HOST:-"1"} # gateway - -# The destination network -DST_NETWORK="10.10.0" # destination network would be 10.10.0.0/24 -DST_HOST="5" -DST_PORT="7" - - -#----------------------------------------------------------------------- -# -# NAME: -# do_setup -# -# DESCRIPTION: -# Make a IPv4 connectivity -# -# SET VALUES: -# rhost_ipv4addr - IPv4 Address of the remote host -# lhost_ifname - Interface name of the local host -# rhost_ifname - Interface name of the remote host -# -#----------------------------------------------------------------------- -do_setup() -{ - TCID=route4-change-if - TST_COUNT=0 - - # Get the number of the test links - link_total=`echo $LHOST_HWADDRS | wc -w` - rhost_link_total=`echo $RHOST_HWADDRS | wc -w` - if [ $link_total -ne $rhost_link_total ]; then - tst_resm TBROK "The number of element in LHOST_HWADDRS differs from RHOST_HWADDRS" - exit $TST_TOTAL - fi - if [ $link_total -lt 2 ]; then - tst_resm TBROK "This test case requires plural Test Links" - exit $TST_TOTAL - fi - - lhost_ifname_array="" - rhost_ifname_array="" - link_num=0 - while [ $link_num -lt $link_total ]; do - # Get the Interface names of the local host - lhost_ifname=`get_ifname lhost ${link_num}` - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to get the interface name at the local host" - exit $TST_TOTAL - fi - lhost_ifname_array="$lhost_ifname_array $lhost_ifname" - - # Get the Interface names of the remote host - rhost_ifname=`get_ifname rhost ${link_num}` - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to get the interface name at the remote host" - exit $TST_TOTAL - fi - rhost_ifname_array="$rhost_ifname_array $rhost_ifname" - - # Initialize the interfaces of the remote host - initialize_if rhost ${link_num} - - # Set IPv4 address to the interface of the remote host - set_ipv4addr rhost ${link_num} "${IPV4_NETWORK_PRE}.${link_num}" ${RHOST_IPV4_HOST} - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to assign IP address to the interface $rhost_ifname at the remote host" - exit $TST_TOTAL - fi - - link_num=`expr $link_num + 1` - done -} - - - - -#----------------------------------------------------------------------- -# -# NAME: -# do_cleanup -# -# DESCRIPTION: -# Recover the tested interfaces -# -#----------------------------------------------------------------------- -do_cleanup() -{ - # Make sure to kill the udp datagram sender - killall -SIGHUP ns-udpsender >/dev/null 2>&1 - - # Initialize the interfaces - link_num=0 - while [ $link_num -lt $link_total ]; do - initialize_if lhost ${link_num} - initialize_if rhost ${link_num} - link_num=`expr $link_num + 1` - done -} - - -#----------------------------------------------------------------------- -# -# FUNCTION: -# test_body -# -# DESCRIPTION: -# main code of the test -# -# Arguments: -# $1: define the test type -# 1 - route command case -# 2 - ip command case -# -#----------------------------------------------------------------------- -test_body() -{ - test_type=$1 - - TCID=route4-change-if0${test_type} - TST_COUNT=$test_type - - case $test_type in - 1) - test_command="route" - ;; - 2) - test_command="ip" - ;; - *) - tst_resm TBROK "unspecified case" - return 1 - ;; - esac - - tst_resm TINFO "Verify the kernel is not crashed when the interface of an IPv4 route is changed frequently by $test_command command in $NS_TIMES times" - - link_num=0 - while [ $link_num -lt $link_total ]; do - # Initialize the interface of the local host - initialize_if lhost ${link_num} - - # Assign IPv4 address to the interface of the local host - set_ipv4addr lhost ${link_num} "${IPV4_NETWORK_PRE}.${link_num}" ${LHOST_IPV4_HOST} - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to assign an IPv4 address at the local host" - return 1 - fi - - # Check the connectivity to the gateway - field=`expr $link_num + 1` - lhost_ifname=`echo $lhost_ifname_array | cut -d ' ' -f $field` - check_icmpv4_connectivity $lhost_ifname "${IPV4_NETWORK_PRE}.${link_num}.${LHOST_IPV4_HOST}" - if [ $? -ne 0 ]; then - tst_resm TBROK "Test Link $link_num is somthing wrong." - return 1 - fi - link_num=`expr $link_num + 1` - done - - # Set the variables regarding the destination host - dst_addr=${DST_NETWORK}.${DST_HOST} - dst_network=${DST_NETWORK}.0 - - # Set the first route - link_num=0 - field=`expr $link_num + 1` - lhost_ifname=`echo $lhost_ifname_array | cut -d ' ' -f $field` - gateway="${IPV4_NETWORK_PRE}.${link_num}.${RHOST_IPV4_HOST}" - case $test_type in - 1) - route add -net $dst_network netmask 255.255.255.0 gw $gateway dev $lhost_ifname - ;; - 2) - ip route add ${dst_network}/24 via $gateway dev $lhost_ifname - ;; - esac - - # Load the route with UDP traffic - ns-udpsender -f 4 -D $dst_addr -p $DST_PORT -b -s 1472 - if [ $? -ne 0 ]; then - tst_resm TFAIL "Failed to run a UDP datagram sender" - return 1 - fi - - # Loop for changing the route - cnt=0 - while [ $cnt -lt $NS_TIMES ]; do - link_num=`expr $link_num + 1` - if [ $link_num -ge $link_total ]; then - link_num=0 - fi - - pre_lhost_ifname=$lhost_ifname - pre_gateway=$gateway - - field=`expr $link_num + 1` - lhost_ifname=`echo $lhost_ifname_array | cut -d ' ' -f $field` - gateway="${IPV4_NETWORK_PRE}.${link_num}.${RHOST_IPV4_HOST}" - - case $test_type in - 1) - route add -net $dst_network netmask 255.255.255.0 gw $gateway dev $lhost_ifname - route del -net $dst_network netmask 255.255.255.0 gw $pre_gateway dev $pre_lhost_ifname - ;; - 2) - ip route change ${dst_network}/24 via $gateway dev $lhost_ifname - ;; - esac - if [ $? -ne 0 ]; then - tst_resm TFAIL "Failed to change the gateway to $gateway" - return 1 - fi - - # Rerun if udp datagram sender is dead - ps auxw | fgrep -v grep | grep ns-udpsender > /dev/null - if [ $? -ne 0 ]; then - ns-udpsender -f 4 -D $dst_addr -p $DST_PORT -b -s 1472 - if [ $? -ne 0 ]; then - tst_resm TFAIL "Failed to run a UDP datagram sender" - return 1 - fi - fi - - cnt=`expr $cnt + 1` - done - - # Kill the udp datagram sender - killall -SIGHUP ns-udpsender - - tst_resm TPASS "Test is finished correctly." - return 0 -} - - -#----------------------------------------------------------------------- -# -# Main -# -# Exit Value: -# The number of the failure -# -#----------------------------------------------------------------------- - -RC=0 -do_setup -test_body 1 || RC=`expr $RC + 1` # Case of route command -test_body 2 || RC=`expr $RC + 1` # Case of ip command -do_cleanup - -exit $RC diff --git a/testcases/network/stress/route/route6-change-if b/testcases/network/stress/route/route6-change-if deleted file mode 100644 index 051ba8bcc..000000000 --- a/testcases/network/stress/route/route6-change-if +++ /dev/null @@ -1,323 +0,0 @@ -#!/bin/sh - -################################################################################ -## ## -## Copyright (c) International Business Machines Corp., 2006 ## -## ## -## This program is free software; you can redistribute it and#or modify ## -## it under the terms of the GNU General Public License as published by ## -## the Free Software Foundation; either version 2 of the License, or ## -## (at your option) any later version. ## -## ## -## This program is distributed in the hope that it will be useful, but ## -## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ## -## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ## -## for more details. ## -## ## -## You should have received a copy of the GNU General Public License ## -## along with this program; if not, write to the Free Software ## -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ## -## ## -## ## -################################################################################ -# -# File: -# route6-change-if -# -# Description: -# Verify the kernel is not crashed when the interface of an IPv6 route is -# changed frequently -# test01 - by route command -# test02 - by ip command -# -# Setup: -# See testcases/network/stress/README -# -# Author: -# Mitsuru Chinen -# -# History: -# Mar 17 2006 - Created (Mitsuru Chinen) -# -#----------------------------------------------------------------------- -# Uncomment line below for debug output. -#trace_logic=${trace_logic:-"set -x"} -$trace_logic - -# Make sure the value of LTPROOT -LTPROOT=${LTPROOT:-`(cd ../../../../ ; pwd)`} -export LTPROOT - -# Total number of the test case -TST_TOTAL=2 -export TST_TOTAL - -# Default of the test case ID and the test case count -TCID=route6-change-if -TST_COUNT=0 -export TCID -export TST_COUNT - -# Check the environmanet variable -. check_envval || exit $TST_TOTAL - -# The number of times where route is changed -NS_TIMES=${NS_TIMES:-10000} - -# The first 2 ocnted of the Network portion of the gateway address -IPV6_NETWORK_PRE="fec0:1:1" - -# Netmask of for the gateway -IPV6_NETMASK_NUM=64 - -# Host portion of the IPv6 address -LHOST_IPV6_HOST=":2" # src -RHOST_IPV6_HOST=":1" # gateway - -# The destination network -DST_NETWORK="fd00:100:1:1" # dest network would be fd00:100:1:1:::/64 -DST_HOST=":5" -DST_PORT="7" - - -#----------------------------------------------------------------------- -# -# NAME: -# do_setup -# -# DESCRIPTION: -# Make a IPv6 connectivity -# -# SET VALUES: -# rhost_ipv6addr - IPv6 Address of the remote host -# lhost_ifname - Interface name of the local host -# rhost_ifname - Interface name of the remote host -# -#----------------------------------------------------------------------- -do_setup() -{ - TCID=route6-change-if - TST_COUNT=0 - - # Get the number of the test links - link_total=`echo $LHOST_HWADDRS | wc -w` - rhost_link_total=`echo $RHOST_HWADDRS | wc -w` - if [ $link_total -ne $rhost_link_total ]; then - tst_resm TBROK "The number of element in LHOST_HWADDRS differs from RHOST_HWADDRS" - exit $TST_TOTAL - fi - if [ $link_total -lt 2 ]; then - tst_resm TBROK "This test case requires plural Test Links" - exit $TST_TOTAL - fi - - lhost_ifname_array="" - rhost_ifname_array="" - link_num=0 - while [ $link_num -lt $link_total ]; do - # Get the Interface names of the local host - lhost_ifname=`get_ifname lhost ${link_num}` - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to get the interface name at the local host" - exit $TST_TOTAL - fi - lhost_ifname_array="$lhost_ifname_array $lhost_ifname" - - # Get the Interface names of the remote host - rhost_ifname=`get_ifname rhost ${link_num}` - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to get the interface name at the remote host" - exit $TST_TOTAL - fi - rhost_ifname_array="$rhost_ifname_array $rhost_ifname" - - # Initialize the interfaces of the remote host - initialize_if rhost ${link_num} - - # Set IPv6 address to the interface of the remote host - add_ipv6addr rhost ${link_num} "${IPV6_NETWORK_PRE}:${link_num}" ${RHOST_IPV6_HOST} - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to assign IP address to the interface $rhost_ifname at the remote host" - exit $TST_TOTAL - fi - - link_num=`expr $link_num + 1` - done -} - - -#----------------------------------------------------------------------- -# -# NAME: -# do_cleanup -# -# DESCRIPTION: -# Recover the tested interfaces -# -#----------------------------------------------------------------------- -do_cleanup() -{ - # Make sure to kill the udp datagram sender - killall -SIGHUP ns-udpsender >/dev/null 2>&1 - - # Initialize the interfaces - link_num=0 - while [ $link_num -lt $link_total ]; do - initialize_if lhost ${link_num} - initialize_if rhost ${link_num} - link_num=`expr $link_num + 1` - done -} - - -#----------------------------------------------------------------------- -# -# FUNCTION: -# test_body -# -# DESCRIPTION: -# main code of the test -# -# Arguments: -# $1: define the test type -# 1 - route command case -# 2 - ip command case -# -#----------------------------------------------------------------------- -test_body() -{ - test_type=$1 - - TCID=route6-change-if0${test_type} - TST_COUNT=$test_type - - case $test_type in - 1) - test_command="route" - ;; - 2) - test_command="ip" - ;; - *) - tst_resm TBROK "unspecified case" - return 1 - ;; - esac - - tst_resm TINFO "Verify the kernel is not crashed when the interface of an IPv6 route is changed frequently by $test_command command in $NS_TIMES times" - - link_num=0 - while [ $link_num -lt $link_total ]; do - # Initialize the interface of the local host - initialize_if lhost ${link_num} - - # Assign IPv6 address to the interface of the local host - add_ipv6addr lhost ${link_num} "${IPV6_NETWORK_PRE}:${link_num}" ${LHOST_IPV6_HOST} - if [ $? -ne 0 ]; then - tst_resm TBROK "Failed to assign an IPv6 address at the local host" - return 1 - fi - - # Check the connectivity to the gateway - field=`expr $link_num + 1` - lhost_ifname=`echo $lhost_ifname_array | cut -d ' ' -f $field` - check_icmpv6_connectivity $lhost_ifname "${IPV6_NETWORK_PRE}:${link_num}:${LHOST_IPV6_HOST}" - if [ $? -ne 0 ]; then - tst_resm TBROK "Test Link $link_num is somthing wrong." - return 1 - fi - link_num=`expr $link_num + 1` - done - - # Set the variables regarding the destination host - dst_addr=${DST_NETWORK}:${DST_HOST} - dst_network=${DST_NETWORK}:: - - # Set the first route - link_num=0 - field=`expr $link_num + 1` - lhost_ifname=`echo $lhost_ifname_array | cut -d ' ' -f $field` - gateway="${IPV6_NETWORK_PRE}:${link_num}:${RHOST_IPV6_HOST}" - case $test_type in - 1) - route -A inet6 add ${dst_network}/64 gw $gateway dev $lhost_ifname - ;; - 2) - ip -f inet6 route add ${dst_network}/64 via $gateway dev $lhost_ifname - ;; - esac - - # Load the route with UDP traffic - ns-udpsender -f 6 -D $dst_addr -p $DST_PORT -b -s 1452 - if [ $? -ne 0 ]; then - tst_resm TFAIL "Failed to run a UDP datagram sender" - return 1 - fi - - # Loop for changing the route - cnt=0 - while [ $cnt -lt $NS_TIMES ]; do - link_num=`expr $link_num + 1` - if [ $link_num -ge $link_total ]; then - link_num=0 - fi - - pre_lhost_ifname=$lhost_ifname - pre_gateway=$gateway - - field=`expr $link_num + 1` - lhost_ifname=`echo $lhost_ifname_array | cut -d ' ' -f $field` - gateway="${IPV6_NETWORK_PRE}:${link_num}:${RHOST_IPV6_HOST}" - - case $test_type in - 1) - route -A inet6 add ${dst_network}/64 gw $gateway dev $lhost_ifname - route -A inet6 del ${dst_network}/64 gw $pre_gateway dev $pre_lhost_ifname - ;; - 2) - ip -f inet6 route add ${dst_network}/64 via $gateway dev $lhost_ifname - ip -f inet6 route del ${dst_network}/64 via $pre_gateway dev $pre_lhost_ifname - ;; - esac - if [ $? -ne 0 ]; then - tst_resm TFAIL "Failed to change the gateway to $gateway" - return 1 - fi - - # Rerun if udp datagram sender is dead - ps auxw | fgrep -v grep | grep ns-udpsender > /dev/null - if [ $? -ne 0 ]; then - ns-udpsender -f 6 -D $dst_addr -p $DST_PORT -b -s 1452 - if [ $? -ne 0 ]; then - tst_resm TFAIL "Failed to run a UDP datagram sender" - return 1 - fi - fi - - cnt=`expr $cnt + 1` - done - - # Kill the udp datagram sender - killall -SIGHUP ns-udpsender - - tst_resm TPASS "Test is finished correctly." - return 0 -} - - -#----------------------------------------------------------------------- -# -# Main -# -# Exit Value: -# The number of the failure -# -#----------------------------------------------------------------------- - -RC=0 -do_setup -test_body 1 || RC=`expr $RC + 1` # Case of route command -test_body 2 || RC=`expr $RC + 1` # Case of ip command -do_cleanup - -exit $RC