From patchwork Thu Jan 31 22:35:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1034496 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="KLHlav0/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rFRm6jgjz9sDr for ; Fri, 1 Feb 2019 09:35:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728774AbfAaWfP (ORCPT ); Thu, 31 Jan 2019 17:35:15 -0500 Received: from mail-eopbgr00086.outbound.protection.outlook.com ([40.107.0.86]:27072 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727471AbfAaWfO (ORCPT ); Thu, 31 Jan 2019 17:35:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4RYL4kC/APGhhtoYqLO4ByOd6ZFUg9MglKAtr8GGNGQ=; b=KLHlav0/ToMfbvlWvgSB5gpWUqaFE+sftIFF2Mus9BHDKEwUBDKaxS8vUVM56Wl6XRLIuNSahJHL4QSbhv7qzkKk7WAo3C0REnsGzhDSLsbLBnM9+ceuctdGxaO59b5ZAFKgBcdrKTTsTubYyqLLPGVBJ4JKFFrnPHXH5a8iosU= Received: from AM6PR05MB4885.eurprd05.prod.outlook.com (20.177.34.225) by AM6PR05MB5845.eurprd05.prod.outlook.com (20.178.87.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Thu, 31 Jan 2019 22:35:10 +0000 Received: from AM6PR05MB4885.eurprd05.prod.outlook.com ([fe80::3830:b2de:562:1fe6]) by AM6PR05MB4885.eurprd05.prod.outlook.com ([fe80::3830:b2de:562:1fe6%4]) with mapi id 15.20.1558.025; Thu, 31 Jan 2019 22:35:10 +0000 From: Petr Machata To: "netdev@vger.kernel.org" CC: Ido Schimmel Subject: [PATCH net-next 01/11] selftests: forwarding: Make ping timeout configurable Thread-Topic: [PATCH net-next 01/11] selftests: forwarding: Make ping timeout configurable Thread-Index: AQHUubU5WHpSVmezQ0WP7qZvn0S1wQ== Date: Thu, 31 Jan 2019 22:35:10 +0000 Message-ID: <296ccfaff12de8056295d6fedd01cd0fbda45f13.1548973731.git.petrm@mellanox.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM5PR06CA0003.eurprd06.prod.outlook.com (2603:10a6:206:2::16) To AM6PR05MB4885.eurprd05.prod.outlook.com (2603:10a6:20b:b::33) authentication-results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [78.45.160.211] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR05MB5845; 6:puwRhak/8JR8hEMeoGLBSE08BFqg2qkF6BKAC67EeadqPB3c3OrXIjekEg5PW7JovYluEnN3l++lolA00AFRnOCWxkPD4JAmQjhysUdwXZnD8o6/oloKcJDjOaO5rPJyWaHowQIOMzwGVLd8AuJHxpZozHcJE4ywd22dwaaCtOeYYP+pdqy2FVUE3y0KAVMoHA7cT2bUjwnyBEwYOoDOw75T3hyouSPoUdbXddTvslVhO0HIc+Kig+BKgPu2CFUcy2+0Lh1Eq9VaUYraoX6egk2NW4+oCqmCO4LkbeaRZAld+ypMXlTq6RN4f/l4LLjl6tUS9SxcJjRS2jo4J4PCjv8RIzpSqCS9jNtNHCsGlEcVv0Hi85hfILIbGcJrVJn3ZwRBTXjszAwpXg0xKDm2LKRE7Ayghsx+EsTCxA7QWJWFSkydi+EM9E7xy3nyWvEGcggWaW6jf/iSVvjMSKkTaw==; 5:Yy3rt6/WQUuXcyw6pbRSjv2a6DWzvVEyh7nBdrY860zBGI8hLkd8Zs2poXyiZE9IFLxU1rKLoVvGMVd0go3ID0CxP63nL///vx+a9ezxwORYoY0xEKaDCRJwwcq7EPUwBaxZ4rXD23gFPWz5xMOYMA3dKSOti8shxB4cxMymVpvOmuDwfZrwHQtJZtnrsyUNxptwaOFyNVUuCgIRywhGyA==; 7:yh8z5Re6Iejt5mmBmTu+xMdNAICQ2O3GsBzGY2TVyrD/VX1cn3D1Rmr02IxA8ATC3eVixwKwzAslH94xxbzBniaAizUIrHfhM556z5BNx/PY7cWuuX0Ceg/pYIYwa5ny1e6HHmcTcOqTpJciYOJ+tQ== x-ms-office365-filtering-correlation-id: 428198d7-ed4d-4e36-6713-08d687cc5ba3 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB5845; x-ms-traffictypediagnostic: AM6PR05MB5845: x-microsoft-antispam-prvs: x-forefront-prvs: 09347618C4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39860400002)(396003)(136003)(376002)(189003)(199004)(4326008)(53936002)(81156014)(11346002)(8676002)(52116002)(446003)(105586002)(6916009)(2351001)(106356001)(305945005)(66066001)(1730700003)(26005)(66574012)(2906002)(36756003)(476003)(81166006)(256004)(2616005)(7736002)(102836004)(25786009)(107886003)(486006)(186003)(71190400001)(8936002)(6506007)(386003)(478600001)(71200400001)(76176011)(6486002)(6512007)(86362001)(6116002)(5640700003)(3846002)(316002)(118296001)(68736007)(99286004)(2501003)(97736004)(6436002)(14454004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB5845; H:AM6PR05MB4885.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Ans4sUb3SbnQ/8mJZTZ78CLmR8PqJlbTkCJwlrzFZ0hhQgcCXQaxaz5wl8WYVVy3sM2ABPGR8P+1Vnj0Vz7xRm7e5LElzVE3inf8BkTy0xKHeHNYtHnDNhqdTDx0wrUB42WMfXOzAEt401rJSgwp2fjVzyuCk/SmWzGiIyYsRL4YLF3fQkT2VlHcaqgS7MH11JRj3Yhhlf0LwlSQ7SMMp34UjRXUThCFirXLNwccIcnGPsh0MFhZdpr10tCjXuNz7bm74SVeogx24r8IXBm1nmBVAPDAEzYxtPyweIl9z5FlpA1SGOPhI+ZVNgNz7W23YAaJ8VXxQdaTirdPMuVz4CR1pLjrDmreVYYfIkIKDryu0Y9u4+5wJ0gLoWZP4ZLfM3qv89snwvI6zdVP2UoLY0BOC82XbFRSROICipUUl8I= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 428198d7-ed4d-4e36-6713-08d687cc5ba3 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jan 2019 22:35:09.8716 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5845 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ido Schimmel The current timeout (2 seconds) proved to be too low for some (emulated) systems where we run the tests. Make the timeout configurable and default to 5 seconds. Signed-off-by: Ido Schimmel Signed-off-by: Petr Machata --- tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh | 2 +- tools/testing/selftests/drivers/net/mlxsw/qos_dscp_router.sh | 2 +- tools/testing/selftests/net/forwarding/forwarding.config.sample | 3 +++ tools/testing/selftests/net/forwarding/lib.sh | 7 +++++-- tools/testing/selftests/net/forwarding/mirror_lib.sh | 3 ++- tools/testing/selftests/net/forwarding/router_broadcast.sh | 3 ++- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh index 1ca631d5aaba..111baedc5742 100755 --- a/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh +++ b/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh @@ -150,7 +150,7 @@ dscp_ping_test() ip vrf exec $vrf_name \ ${PING} -Q $dscp_10 ${sip:+-I $sip} $dip \ - -c 10 -i 0.1 -w 2 &> /dev/null + -c 10 -i 0.1 -w $PING_TIMEOUT &> /dev/null local -A t1s eval "t1s=($(dscp_fetch_stats $dev_10 10) diff --git a/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_router.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_router.sh index 281d90766e12..6fa717ef91ef 100755 --- a/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_router.sh +++ b/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_router.sh @@ -171,7 +171,7 @@ dscp_ping_test() ip vrf exec $vrf_name \ ${PING} -Q $dscp ${sip:+-I $sip} $dip \ - -c 10 -i 0.1 -w 2 &> /dev/null + -c 10 -i 0.1 -w $PING_TIMEOUT &> /dev/null eval "local -A dev1_t1s=($(dscp_fetch_stats $dev1 0))" eval "local -A dev2_t1s=($(dscp_fetch_stats $dev2 0))" diff --git a/tools/testing/selftests/net/forwarding/forwarding.config.sample b/tools/testing/selftests/net/forwarding/forwarding.config.sample index e819d049d9ce..e2adb533c8fc 100644 --- a/tools/testing/selftests/net/forwarding/forwarding.config.sample +++ b/tools/testing/selftests/net/forwarding/forwarding.config.sample @@ -33,3 +33,6 @@ PAUSE_ON_CLEANUP=no NETIF_TYPE=veth # Whether to create virtual interfaces (veth) or not NETIF_CREATE=yes +# Timeout (in seconds) before ping exits regardless of how many packets have +# been sent or received +PING_TIMEOUT=5 diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh index c1f16bb992dc..9385dc971269 100644 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh @@ -17,6 +17,7 @@ NETIF_TYPE=${NETIF_TYPE:=veth} NETIF_CREATE=${NETIF_CREATE:=yes} MCD=${MCD:=smcrouted} MC_CLI=${MC_CLI:=smcroutectl} +PING_TIMEOUT=${PING_TIMEOUT:=5} relative_path="${BASH_SOURCE%/*}" if [[ "$relative_path" == "${BASH_SOURCE}" ]]; then @@ -820,7 +821,8 @@ ping_do() local vrf_name vrf_name=$(master_name_get $if_name) - ip vrf exec $vrf_name $PING $args $dip -c 10 -i 0.1 -w 2 &> /dev/null + ip vrf exec $vrf_name \ + $PING $args $dip -c 10 -i 0.1 -w $PING_TIMEOUT &> /dev/null } ping_test() @@ -840,7 +842,8 @@ ping6_do() local vrf_name vrf_name=$(master_name_get $if_name) - ip vrf exec $vrf_name $PING6 $args $dip -c 10 -i 0.1 -w 2 &> /dev/null + ip vrf exec $vrf_name \ + $PING6 $args $dip -c 10 -i 0.1 -w $PING_TIMEOUT &> /dev/null } ping6_test() diff --git a/tools/testing/selftests/net/forwarding/mirror_lib.sh b/tools/testing/selftests/net/forwarding/mirror_lib.sh index 07991e1025c7..a1c0389eb049 100644 --- a/tools/testing/selftests/net/forwarding/mirror_lib.sh +++ b/tools/testing/selftests/net/forwarding/mirror_lib.sh @@ -31,7 +31,8 @@ mirror_test() local t0=$(tc_rule_stats_get $dev $pref) ip vrf exec $vrf_name \ - ${PING} ${sip:+-I $sip} $dip -c 10 -i 0.1 -w 2 &> /dev/null + ${PING} ${sip:+-I $sip} $dip -c 10 -i 0.1 -w $PING_TIMEOUT \ + &> /dev/null local t1=$(tc_rule_stats_get $dev $pref) local delta=$((t1 - t0)) # Tolerate a couple stray extra packets. diff --git a/tools/testing/selftests/net/forwarding/router_broadcast.sh b/tools/testing/selftests/net/forwarding/router_broadcast.sh index 7bd2ebb6e9de..9a678ece32b4 100755 --- a/tools/testing/selftests/net/forwarding/router_broadcast.sh +++ b/tools/testing/selftests/net/forwarding/router_broadcast.sh @@ -170,7 +170,8 @@ ping_test_from() log_info "ping $dip, expected reply from $from" ip vrf exec $(master_name_get $oif) \ - $PING -I $oif $dip -c 10 -i 0.1 -w 2 -b 2>&1 | grep $from &> /dev/null + $PING -I $oif $dip -c 10 -i 0.1 -w $PING_TIMEOUT -b 2>&1 \ + | grep $from &> /dev/null check_err_fail $fail $? }