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 $? } From patchwork Thu Jan 31 22:35:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1034497 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="Ko7TlQ0G"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rFRp3JLrz9sDX for ; Fri, 1 Feb 2019 09:35:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728854AbfAaWfR (ORCPT ); Thu, 31 Jan 2019 17:35:17 -0500 Received: from mail-eopbgr70075.outbound.protection.outlook.com ([40.107.7.75]:14830 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726172AbfAaWfQ (ORCPT ); Thu, 31 Jan 2019 17:35:16 -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=CyMMke7/Hz37xGNvo6KILN8f8WPVIydWGA/1x2DJhBg=; b=Ko7TlQ0GAvgr02aFxv/6TcI2X4vQt3MGtbHjeACVWOGH738qjlweGZHDxnF0NRT841ic/C2IZCKQ0g1cFXDCOFeUQbDMfLk7D5Lv3tZ+gx6DwLb+7rLoSttkpNzKCu0SX2wSGDEPda9NHMKRj+ZTYpA/6H2lhmqYSbF2fsZ4puQ= Received: from AM6PR05MB4885.eurprd05.prod.outlook.com (20.177.34.225) by AM6PR05MB6470.eurprd05.prod.outlook.com (20.179.7.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Thu, 31 Jan 2019 22:35:13 +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:13 +0000 From: Petr Machata To: "netdev@vger.kernel.org" CC: Ido Schimmel Subject: [PATCH net-next 02/11] selftests: forwarding: mirror_lib: Update ping limits Thread-Topic: [PATCH net-next 02/11] selftests: forwarding: mirror_lib: Update ping limits Thread-Index: AQHUubU6GaF8+lW5HUuHcHUe53+WXQ== Date: Thu, 31 Jan 2019 22:35:12 +0000 Message-ID: <366d0fc7325cf6715148f7d57ffc3ce7c9976866.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: AM6PR0102CA0030.eurprd01.prod.exchangelabs.com (2603:10a6:209:14::43) 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; AM6PR05MB6470; 6:0CvNnlE/wLQ8N4+PH52RbryOKZgHioA8+GS60SGN1MZ04ayOKNu4IesZVARt118RrtcqsKv/WrOy8mujd2SVSf2MIhIT612YUt9BQx/y3a7/STrDiowbams/tpPgbjCDy7JVNpBOoPawZmkN7EumG+qcreXbVfpFbGgCtEhlq/NyJQXc1Dvez2+dCDftKuu9k0aWXFY+sI52V5fBP4OEDYVgRNmx2mkhLKDGJIQ626p4oniw9l30Ep4maeCEnsRWUXqgLiY1Cm5ZdB5Q1/ZPtXK3MFd3+PwvwXPxurHh7XqWm5BcoxxebxWfS2VJ2JXEc7HGAmTvw6NtI192HwbiMiCy5oMmC5jhaOssUp/PmVLI/ne8DiwaChpG988tXroC3QseijfwXxlw6oGMyDvZ3uL5c/SGxAP2qDIGMEtkQOH1j7VLyOiEY+JK8dO/hld6DnwacciUVMfeJBKpGqjkYQ==; 5:/RUQgBOm2IPP3xrci7ta0DQSBJqgcNFP0/TFVrjM89NKspjbjkypPoZpU01tygt77H+3Zs4XHd5LKfiTpOIAE/4VQUVOge+o1f4fVuXy8qGvlIqUWBo6JCk1El/610uqIA7zPM/PaQZMXkfsDl0yEsgBKWzWATP/92VU4liv7hbBtunhN15UA4E3Xrzrd2vg09GAESjArUkk+KssiV4quw==; 7:V+o4gvCaSLlUdKLc7O+AcOwntC1N+3bP7yemFXwNy09qfv9LzBMqGXoy34kEDjM5GN65gSy7DOX5bTg+eD86AyE3+wtiR+A7IQOttcsAMiAyvGRwa+WDP5eO7JkL0a7daC8wZyg/myIvjqrCJ766mg== x-ms-office365-filtering-correlation-id: f49503ef-9b3c-4048-6dc2-08d687cc5d2e 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:AM6PR05MB6470; x-ms-traffictypediagnostic: AM6PR05MB6470: x-microsoft-antispam-prvs: x-forefront-prvs: 09347618C4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(136003)(346002)(376002)(396003)(39860400002)(199004)(189003)(105586002)(99286004)(6436002)(3846002)(7736002)(86362001)(6486002)(76176011)(4326008)(6116002)(305945005)(52116002)(5640700003)(36756003)(316002)(71200400001)(256004)(14444005)(71190400001)(106356001)(6916009)(25786009)(53936002)(186003)(478600001)(476003)(2616005)(118296001)(26005)(11346002)(446003)(2351001)(486006)(6512007)(107886003)(2906002)(81156014)(8936002)(1730700003)(8676002)(14454004)(2501003)(68736007)(66066001)(81166006)(6506007)(386003)(97736004)(102836004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB6470; H:AM6PR05MB4885.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: lmS/jlrPXnyiDYlTujemYiulMVv9jxN/yaDQcMTdv81gMteE4hN3N/xSO2HZsBo8SGODWn49tlxF5dTKRwmM5XBB20xAYufvxw/YkhVcA1+i64k7hL7p+J3AsNC8U/XCEpf02hmvGRQmLroycwvTALFKxCIaVeuIwp74aAOmiZoHCqjqsd7xFnaEy32//OwM4rqG4Kis43u3IZyby+8B7RuCldmEl6gJng/hS+bYswJI4wv0fuJnzC2kXeS9KF0Nr2IGvDT5Qi2EcPbyt5XKUe2SzIw1egNRlBTKcxFMMqZYh1KA2ahABP18gmSmgzM5BSlA6lxGM676ZtwPGeWmG676AVj2Ud6/N7O0Ox/X+NOoHKUxTs+OUr12qJhfLNzUr2ifzII3H1S8RhaG9RsgP9QM+Ne/URG3+YJWUin6Da0= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: f49503ef-9b3c-4048-6dc2-08d687cc5d2e X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jan 2019 22:35:12.4454 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB6470 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The current ping intervals are too short for running mirroring tests in simulator. This leads to ping sending a follow-up ping before the reply arrives, thus sending more than the requested 10 ICMP requests. Those are mirrored, and over a certain threshold the test case run is considered a failure, because too much traffic is observed. Bump interval and timeout numbers 5x in mirroring tests to address the spurious failures. Signed-off-by: Petr Machata --- tools/testing/selftests/net/forwarding/mirror_lib.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/mirror_lib.sh b/tools/testing/selftests/net/forwarding/mirror_lib.sh index a1c0389eb049..878f8d53327a 100644 --- a/tools/testing/selftests/net/forwarding/mirror_lib.sh +++ b/tools/testing/selftests/net/forwarding/mirror_lib.sh @@ -29,10 +29,11 @@ mirror_test() local pref=$1; shift local expect=$1; shift + local ping_timeout=$((PING_TIMEOUT * 5)) local t0=$(tc_rule_stats_get $dev $pref) ip vrf exec $vrf_name \ - ${PING} ${sip:+-I $sip} $dip -c 10 -i 0.1 -w $PING_TIMEOUT \ - &> /dev/null + ${PING} ${sip:+-I $sip} $dip -c 10 -i 0.5 -w $ping_timeout \ + &> /dev/null local t1=$(tc_rule_stats_get $dev $pref) local delta=$((t1 - t0)) # Tolerate a couple stray extra packets. From patchwork Thu Jan 31 22:35:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1034498 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="gLk14Ehd"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rFRs2TXcz9sDX for ; Fri, 1 Feb 2019 09:35:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729392AbfAaWfU (ORCPT ); Thu, 31 Jan 2019 17:35:20 -0500 Received: from mail-eopbgr70075.outbound.protection.outlook.com ([40.107.7.75]:14830 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727471AbfAaWfT (ORCPT ); Thu, 31 Jan 2019 17:35:19 -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=47q/bk+/5ROeBFyAbmhpvI5wb3hghSPnmtSwL7yyYuk=; b=gLk14Ehdl2uQ1k4GuMdRtcg8s8fZIHRzAvjjrLjMhe/dsNIZwYBDF2HGeZxtDna1MOVrdluNkPBerIBKRQdchtaJJ39GyiCTaUvrR5AXflynCvY5Kl01zGcIpKU1gO5nmIx6T8zqTYSopCMx+kwkP1rCFacAu44XyC7Br/YWvLw= Received: from AM6PR05MB4885.eurprd05.prod.outlook.com (20.177.34.225) by AM6PR05MB6470.eurprd05.prod.outlook.com (20.179.7.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Thu, 31 Jan 2019 22:35:14 +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:14 +0000 From: Petr Machata To: "netdev@vger.kernel.org" CC: Ido Schimmel Subject: [PATCH net-next 03/11] selftests: mlxsw: Update ping limits Thread-Topic: [PATCH net-next 03/11] selftests: mlxsw: Update ping limits Thread-Index: AQHUubU7JM9RBNkh10mHeibUjI8O1A== Date: Thu, 31 Jan 2019 22:35:14 +0000 Message-ID: <25f150899413f126a8fab3fb5de80df91a428c8a.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: AM6PR02CA0035.eurprd02.prod.outlook.com (2603:10a6:20b:6e::48) 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; AM6PR05MB6470; 6:33AUhL5mqPj+8AR4EE47JlAJ10un4FFnL9rqozCtQV4Zk2kdN4nYX4lfoD2TzWglP8D7kAJSnWvPxFH3sWZcL4yhgUR8krg1RaSpQDoE01KDA4+Tbr6R61RgXE0SdRpETPfyiFGt/TXb6xthFPnKDNVVUvSbzwi4U3Nbr7ke833mGri6n5U3tE9XysvjBnS+Vmfov1WcMJ2ZBKNZTSnL1xgakre9YDkSgaMqBRuvMo9kwYCJ4HcxcpwXNqUa03JuL6ovlAjWnvDMgk67zFgoMMVQVREBCb4dD2JxMI95KToF2K4RwwIv+BSz6qB4QigvY7AmmdifRKj1+tKC/a2X/o/oKv+eTUFm4BBMIwfPleJa8wrH3ogF9jDRfR2A4QuUvEwhTQ0E/piJtDiLzFQoG/MlVrOpHm1hg32bzvxYRqn5rMQnNP6cHROtJ6z/UNuz/V6MkvZjrAQjH6WVE5rqIg==; 5:mdys24K5RO5Vz7o/W7ousip7s2WMQd/91Wl+7PuSibAbLRw5yy3jfakHVdSuCWYYARk7kcI3FJX1+qzN/h+1CoYqQuB/XLcYzKVvD0bRtai2ZyTegYu99tAnoH9p8AJqgm2MgXvgthswvFYI5MicUt9myBB4YtOzA1U9t08nYz5LgWqGyvjddbR40SznwNwqlVfPtrWZrA2NqHmUPGf3yg==; 7:7Dx02pT9M3gSSeS5xrhLSWxGmgOkVNOjQwdTAP4rLtXSD1r8EN0JX1Hpn9UKc8Z+HwNnqDG4+YfqjyGWsxifd/Xa7mGGksgkkCKhaMiCJXaT0fCACZN2pproYM9o/EcNYM57zV34MgQ8QjU+1IrNKQ== x-ms-office365-filtering-correlation-id: c3092fe1-ee09-42a1-6169-08d687cc5e0b 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:AM6PR05MB6470; x-ms-traffictypediagnostic: AM6PR05MB6470: x-microsoft-antispam-prvs: x-forefront-prvs: 09347618C4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(136003)(346002)(376002)(396003)(39860400002)(199004)(189003)(105586002)(99286004)(6436002)(3846002)(7736002)(86362001)(6486002)(76176011)(4326008)(6116002)(305945005)(52116002)(5640700003)(36756003)(316002)(71200400001)(256004)(71190400001)(106356001)(6916009)(25786009)(53936002)(186003)(478600001)(476003)(2616005)(118296001)(26005)(11346002)(66574012)(446003)(2351001)(486006)(6512007)(107886003)(2906002)(81156014)(8936002)(1730700003)(8676002)(14454004)(2501003)(68736007)(66066001)(81166006)(6506007)(386003)(97736004)(102836004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB6470; H:AM6PR05MB4885.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: N6YAqBQYWb/EVRMYwTJvBGC7ojquVM4ADx0EIYjcxEnQTQnjpWhGt9B4LGVAXgjBeTsQifBofmlhfRYCuiaFujaIsjWD8nyPWCRypljHz1jXTP4KcYVrt+FEsrWcvNrPccJvRM/O39ecN77iTUh4lFfWmAw+afScdxRBryzcHM8cbMJsJUr/LOtvTgnRpqGCtaNsLdLHawYSrdy0bO9ZwqqrFAjjMngGHrsPF+XbxW83kAmSgFlgikJG+bPBac+Ijr+qeF2M0rLYCBjphCZFv2Q3S0Q+qMslMxCbWyX8N7sFeqXqYe6pMA9zOLP9z2D1RjMQjhoy4Wfed1BAdz9EYyS66A+lIE5RDFYZeOl4LYjgd7kLeqmeIgFZVRBXAyi4eV9BAjk039sfSI6OYRqFfv3Ou0/eqzESctRY0GoiD78= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3092fe1-ee09-42a1-6169-08d687cc5e0b X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jan 2019 22:35:13.9095 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB6470 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The current ping intervals are too short for running mirroring tests in simulator. This leads to ping sending a follow-up ping before the reply arrives, thus sending more than the requested 10 ICMP requests. This traffic is seen at the counters, and causes spurious failures. Bump interval and timeout numbers 5x in mirroring tests to address the spurious failures. Signed-off-by: Petr Machata --- tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh | 3 ++- tools/testing/selftests/drivers/net/mlxsw/qos_dscp_router.sh | 3 ++- 2 files changed, 4 insertions(+), 2 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 111baedc5742..40f16f2a3afd 100755 --- a/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh +++ b/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_bridge.sh @@ -148,9 +148,10 @@ dscp_ping_test() eval "t0s=($(dscp_fetch_stats $dev_10 10) $(dscp_fetch_stats $dev_20 20))" + local ping_timeout=$((PING_TIMEOUT * 5)) ip vrf exec $vrf_name \ ${PING} -Q $dscp_10 ${sip:+-I $sip} $dip \ - -c 10 -i 0.1 -w $PING_TIMEOUT &> /dev/null + -c 10 -i 0.5 -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 6fa717ef91ef..9faf02e32627 100755 --- a/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_router.sh +++ b/tools/testing/selftests/drivers/net/mlxsw/qos_dscp_router.sh @@ -169,9 +169,10 @@ dscp_ping_test() eval "local -A dev1_t0s=($(dscp_fetch_stats $dev1 0))" eval "local -A dev2_t0s=($(dscp_fetch_stats $dev2 0))" + local ping_timeout=$((PING_TIMEOUT * 5)) ip vrf exec $vrf_name \ ${PING} -Q $dscp ${sip:+-I $sip} $dip \ - -c 10 -i 0.1 -w $PING_TIMEOUT &> /dev/null + -c 10 -i 0.5 -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))" From patchwork Thu Jan 31 22:35:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1034499 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="lnYi1fln"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rFRt5vcmz9sDr for ; Fri, 1 Feb 2019 09:35:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729446AbfAaWfW (ORCPT ); Thu, 31 Jan 2019 17:35:22 -0500 Received: from mail-eopbgr70075.outbound.protection.outlook.com ([40.107.7.75]:14830 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726172AbfAaWfV (ORCPT ); Thu, 31 Jan 2019 17:35:21 -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=HKivL7um9b2akOqT3dear9LaIxzvarItm4ivcrcKtxo=; b=lnYi1flnBkAO+gO/GT5tMmsJpl2lX5uKtMpLmn94yfLBquHZshkd7dlC3959UsxHOjiGsV+dbua0oLXi5PV8JUlOkfOZBWPMhawWxhJWXVkJxu7auCpcEhY/8tiiJUw0lRJazvivAzeCbKRjK4w5fxqwxhiHiUz6TNmMpZiZaQM= Received: from AM6PR05MB4885.eurprd05.prod.outlook.com (20.177.34.225) by AM6PR05MB6470.eurprd05.prod.outlook.com (20.179.7.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Thu, 31 Jan 2019 22:35:15 +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:15 +0000 From: Petr Machata To: "netdev@vger.kernel.org" CC: Ido Schimmel Subject: [PATCH net-next 04/11] selftests: forwarding: mirror_gre_changes: Fix TTL test Thread-Topic: [PATCH net-next 04/11] selftests: forwarding: mirror_gre_changes: Fix TTL test Thread-Index: AQHUubU8A8sJGejJWU+8i2Id1FzQOA== Date: Thu, 31 Jan 2019 22:35:15 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR0102CA0001.eurprd01.prod.exchangelabs.com (2603:10a6:209:14::14) 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; AM6PR05MB6470; 6:uAbyVpMEQ08FXHyHVyd4SaRYX50jRrjtfFfYL2L+rKRU9OxREUMvWN++IaGDN79OQl2/6BRuikCWaiHg+3KxzwaxBY23uazSRkE9gK5yOzYvt5jpPdhlt1GQM04+JYzfLq/KhJVY+anty+S0Trn0KT9m6KAltinmDWxnsZPpD6x3o+c8DW/JPDSG9K3XlDvZULsjTMN9cNXikYqpJ97VuaewQdGPspPTYclv1fyZezPbGxdQbDO5NgbvT/xdUKJ/9V6utQzU5ojSxe8TWpMisjMT4nVe/rmOEHol9YnlF+8dxuNX3u/f69HLfLhc8UCBCdEBytshUCpsyIXFoQBHTz2+KwT6JGaD14Gb1hUf2MbPiUHh7SbBWlPCCD22SsZA7W7qDx7XZy3WQKZiCX20v1ijmIhnibKxNPwbcdN8yVx+BiO2S+GymdsWC55rrVQAlt/YdFdwLdPFs07MLosAMQ==; 5:zHFyLXF8g4AMYvBiiEwY3qG4uG8ejG4Nxn5K0pDwZ1LUgZpMGNwI+ASjkGivF+x4TWihXMeHs1vaBETt0fBpJN2qcMLkLtPpvm7Is6yKcNSSzbKNk3u9iPyfaz4Uzdtc/UK+T5yBZvxFNB+BUNYMFv0UKjkT/+FtDH3W8isbAklE5RfFgYwWD9s2lghQr339rvGM5GadBMsJUkCjr7Ipug==; 7:Cm12qmi2h3+xQL48cflgjHbua1XuCrW3wSndh7baaLYHlATBmLpK55LH4yuh4TWEFoHEjBNbbLE0kS/IDIxCDw+JO1pj2gSYGqUOGVWl54jYUcvjjw6V+8UJ8/rEA0VyxieWbrBPjswXSjnVu7W0wQ== x-ms-office365-filtering-correlation-id: cabfea61-9973-4e73-bb12-08d687cc5ef0 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:AM6PR05MB6470; x-ms-traffictypediagnostic: AM6PR05MB6470: x-microsoft-antispam-prvs: x-forefront-prvs: 09347618C4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(136003)(346002)(376002)(396003)(39860400002)(199004)(189003)(105586002)(99286004)(6436002)(3846002)(7736002)(86362001)(6486002)(76176011)(4326008)(6116002)(305945005)(52116002)(5640700003)(36756003)(316002)(71200400001)(256004)(71190400001)(106356001)(6916009)(25786009)(53936002)(186003)(478600001)(476003)(2616005)(118296001)(26005)(11346002)(446003)(2351001)(486006)(6512007)(107886003)(2906002)(81156014)(8936002)(1730700003)(8676002)(14454004)(2501003)(68736007)(66066001)(81166006)(6506007)(386003)(97736004)(102836004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB6470; H:AM6PR05MB4885.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: 6Nt+kZ7BEDhH0MQCSvkdaOJyhHx81jrT7oXgcCa39e4yu/wQ45dI4hrtxAplTJ4Hg1K9y62DPjdRF4LRntpsEz9EsPeszXkNCO5l1jifH2ccI2HFZ8NBI+hwayorrfPeFJTh7NHR4ixEkBMGEVI2a5Apnd4WB4o32fyjAO9PDKklLgTQpQZm/Z7ApP38+1nVaDLNMUt8oDBZ9qs4tAyafe2qBiAXyn/5jEPM6eOOOidusiilExjOYEs3O3sN5t2KwouvTR6RSVA04wEudoHa4fJKvHUC7xVW4L7svw1mJeDjh3MA/cgTAhKNSwrvJhZnj6+ZCxshRXOaoJYDwsoPWzWXl9jKBxK1ufFcdTRGwyEvZQPcPg3H7j8sPWyBJkqhC0eUYCvSDzHQOA+QjuM+sHATZFzEEvQ0ztSPeeH70Yw= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: cabfea61-9973-4e73-bb12-08d687cc5ef0 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jan 2019 22:35:15.3985 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB6470 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When running in a simulator, the TTL change takes a while to settle and during this time the performance of the packet processing is lowered. The resulting instability leads to ping sending more packets as it assumes some have been dropped. This then leads to regular spurious failures as more packets than expected are observed. Sleep a bit to give the system time to stabilize. Signed-off-by: Petr Machata --- tools/testing/selftests/net/forwarding/mirror_gre_changes.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_changes.sh b/tools/testing/selftests/net/forwarding/mirror_gre_changes.sh index 135902aa8b11..472bd023e2a5 100755 --- a/tools/testing/selftests/net/forwarding/mirror_gre_changes.sh +++ b/tools/testing/selftests/net/forwarding/mirror_gre_changes.sh @@ -79,6 +79,7 @@ test_span_gre_ttl() mirror_test v$h1 192.0.2.1 192.0.2.2 $h3 77 0 ip link set dev $tundev type $type ttl 50 + sleep 2 mirror_test v$h1 192.0.2.1 192.0.2.2 $h3 77 10 ip link set dev $tundev type $type ttl 100 From patchwork Thu Jan 31 22:35:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1034500 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="Ip8xn3mX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rFRx3WL3z9sDX for ; Fri, 1 Feb 2019 09:35:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729526AbfAaWfY (ORCPT ); Thu, 31 Jan 2019 17:35:24 -0500 Received: from mail-eopbgr70075.outbound.protection.outlook.com ([40.107.7.75]:14830 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729402AbfAaWfX (ORCPT ); Thu, 31 Jan 2019 17:35:23 -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=SylOWOgg+x8Hgo7HpVh6boXVrEdnRiX/F2/yQI18bnA=; b=Ip8xn3mXROBjNy6JnzUERKR8CMBvWlcY1B3xchYam22YrXPcH1sKm8PYlyWYlQcyu7bvHyMKljkpv6PplOtVwsTFT2WtCjP4wGQvcbZKdvsufGDlG3LzqxN0NjlXQHHkHIiiyn1fH9aQCcPBuGmiqMX19UuPwR1qljX4l8YsHqY= Received: from AM6PR05MB4885.eurprd05.prod.outlook.com (20.177.34.225) by AM6PR05MB6470.eurprd05.prod.outlook.com (20.179.7.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Thu, 31 Jan 2019 22:35:17 +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:17 +0000 From: Petr Machata To: "netdev@vger.kernel.org" CC: Ido Schimmel Subject: [PATCH net-next 05/11] selftests: forwarding: mirror_lib: Wait for tardy mirrored packets Thread-Topic: [PATCH net-next 05/11] selftests: forwarding: mirror_lib: Wait for tardy mirrored packets Thread-Index: AQHUubU9qc/Vaf1010y0ueuzSVtYJg== Date: Thu, 31 Jan 2019 22:35:17 +0000 Message-ID: <69fcd31bafd1d09cfd8031b9639e1881194a6bd9.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: AM6PR0102CA0014.eurprd01.prod.exchangelabs.com (2603:10a6:209:14::27) 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; AM6PR05MB6470; 6:hpsnz+JLFBvpYTWghbdf5PQEnQIv8XvwE5aQxYUidFDa6G8hxOv+9On9UwdHDIzubEi9Yqo7sqmQtw5hAdoE9IFuTpU+Kgh3U0fFDTJ8bKv/GmofAwNHFGmE9AF25wxbNz4csz3qQnoHWB4th2T/6pC9LLPAMQhPxHAwuP7wVMgMOe92Vm0DTydRKBS6ngMVRmqCeEiNv+dF1aHhavNCFFFU9UU85K+XAID1ccz+E3uB8nGYJPD3vHh8WjoDF/nI2BPWgJmBjJjbrOFvYG/Lz5RGaCC7syHDO05duqYCYCbEwl4so95zXlVbbL8hmVLGh7E7xECLLYp4GLHARq0OmM/U9T9yJuEB9OLoWkMBshANbXYmsya4YuE2hS9xO9D3i259uZY7V1qtJKIO3qbxnXD9ZdNZMIq99HJxA6RKHS7LNM3gcUj5OxPjRWQmbo1ak6sA/y2ogoqOwAMS1Lx+TA==; 5:4PZFyG84YGyy4ExOXFYGkboOJG2Pvbhuuc8S5LhpIPSiS9bz3U/d06WzFcZ3SAgcGavhoz5dOR47erCqUPsChHpLfNfEMf9bMo7xWLfi9Jrnu3zj2Z8CcUOJE7D4TUH0L0TX5PzYk0jKEJZYJkzRmquGyV76URbFw9DQ2U3Z20HLx4zZhTGSjXk/J9Z3qf2FYuyJxfn+8s6AFqs2NijSvQ==; 7:SnGfVQsmGnUfRKyGw7gfgNNPPaB0+hUzPSNGujmbIE0vufUhLudveZYMt1Ga8XKyR3cfhH9qKHsPw3gCoxNrXblEteMzNy2GCO/15CJ9ZwIBGkdyb/79c/lNDZw5K3Qo+8mk07pN2gddFz+QXxoj8w== x-ms-office365-filtering-correlation-id: df93b527-93cb-48c1-8931-08d687cc5fc2 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:AM6PR05MB6470; x-ms-traffictypediagnostic: AM6PR05MB6470: x-microsoft-antispam-prvs: x-forefront-prvs: 09347618C4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(136003)(346002)(376002)(396003)(39860400002)(199004)(189003)(105586002)(99286004)(6436002)(3846002)(7736002)(86362001)(6486002)(76176011)(4326008)(6116002)(305945005)(52116002)(5640700003)(36756003)(316002)(71200400001)(256004)(71190400001)(106356001)(6916009)(25786009)(53936002)(186003)(478600001)(476003)(2616005)(118296001)(26005)(11346002)(446003)(2351001)(486006)(6512007)(107886003)(2906002)(81156014)(8936002)(1730700003)(8676002)(14454004)(2501003)(68736007)(66066001)(81166006)(6506007)(386003)(97736004)(102836004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB6470; H:AM6PR05MB4885.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: s3Y8A/CzQd8QK4sGXNnbqQdGjL3qykbK0JwXYeSGfZKjkO4uhhIUuEctBxrUkRZKX05PUgWHsMECxNHk+UlBgxiq9M9vvbzITWcyQ5n09mmbCG2t+G0ZdpBOM6gKv8YU5jWveCjyy8K5ePg5ugsnpgiW5s/PHoTLxysePzqwfWgVhTnedz+ZEyXi5bB4R9FPSG3jgb1J7rTMlegSAP22z1PDfNJOpxr6x/pSSpgpnHK7xtr3uy9RgSzrRiuDJhgEO2eXxO5O/Q3IhnV8VIBppAA7ryiXqOjYOmIJb7JTmYjxHCyOigJfGjXAo36cd0HEOfGzLYm7f3nivumjJ0ESkfDtehvyBbqv6IfG5KK6t4G880Q9L4nxPoZ1H1XepgmjU1h5rDvx6OL6QsyZQuIDWqvSOttWLLvUMAfLxsgaj4I= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: df93b527-93cb-48c1-8931-08d687cc5fc2 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jan 2019 22:35:16.7485 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB6470 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When running in an environment with poor performance (such as a simulator), processing mirrored packets can take a while. Evaluating the condition too soon leads to spurious "seen 9, expected 10" failures as the last packet doesn't have enough time to get mirrored and the mirror to arrive and bump the observed counters. Wait for one ping interval before evaluating the test. Signed-off-by: Petr Machata --- tools/testing/selftests/net/forwarding/mirror_lib.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/forwarding/mirror_lib.sh b/tools/testing/selftests/net/forwarding/mirror_lib.sh index 878f8d53327a..00797597fcf5 100644 --- a/tools/testing/selftests/net/forwarding/mirror_lib.sh +++ b/tools/testing/selftests/net/forwarding/mirror_lib.sh @@ -34,6 +34,7 @@ mirror_test() ip vrf exec $vrf_name \ ${PING} ${sip:+-I $sip} $dip -c 10 -i 0.5 -w $ping_timeout \ &> /dev/null + sleep 0.5 local t1=$(tc_rule_stats_get $dev $pref) local delta=$((t1 - t0)) # Tolerate a couple stray extra packets. From patchwork Thu Jan 31 22:35:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1034501 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="rfZlQ6Tl"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rFS02cLNz9sDX for ; Fri, 1 Feb 2019 09:35:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729623AbfAaWf1 (ORCPT ); Thu, 31 Jan 2019 17:35:27 -0500 Received: from mail-eopbgr70075.outbound.protection.outlook.com ([40.107.7.75]:14830 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729472AbfAaWf0 (ORCPT ); Thu, 31 Jan 2019 17:35:26 -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=usOJ/rymEjtc2GZnjWhfUBGx2s9MYjfU6Kes0VV3CVc=; b=rfZlQ6Tl8KcS+rY/zY13ZU4DS9DOk/rVyJXvcbTMri+TXjUIZF2uwjp3LzwoK0BBVa2tQhm4Fk3vyvBjCmCUcHS3Xij0kD4akfciYEY4nnYef9k2OMWo4RP9ViOwfzUATl+M6cjDc8l7giefuq45/MP9aDKu6GzJ3eF8n4vlkDM= Received: from AM6PR05MB4885.eurprd05.prod.outlook.com (20.177.34.225) by AM6PR05MB6470.eurprd05.prod.outlook.com (20.179.7.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Thu, 31 Jan 2019 22:35:18 +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:18 +0000 From: Petr Machata To: "netdev@vger.kernel.org" CC: Ido Schimmel Subject: [PATCH net-next 06/11] selftests: forwarding: mirror_gre_vlan_bridge_1q: Fix untagged test Thread-Topic: [PATCH net-next 06/11] selftests: forwarding: mirror_gre_vlan_bridge_1q: Fix untagged test Thread-Index: AQHUubU+NgfbflehP0eRgyDBU3SxYQ== Date: Thu, 31 Jan 2019 22:35:18 +0000 Message-ID: <7b8afa1552197693dc2ddfb563ae1926a23fb6a9.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: AM5PR06CA0027.eurprd06.prod.outlook.com (2603:10a6:206:2::40) 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; AM6PR05MB6470; 6:75BKKixB0MuNxUVb11cPfx+qJY8z/21ERkigIZgmDfx44eFzYAiuCcePhJE4VWXUPMvloo7I9P3Xqkg40OchbAn2QtJQJU+5ckGkPuf0in00+W7a1hBiMWqAs6FAXxl0YL89LxPuz9fVXB1DdKjcwIwA/Y6bR1+qEFlZoLCIw7FRKpDCOuclgj+wrnUCiCVmHuMb9r9qJGhumqf2lj+FetE5ctgLsq1FJUMENiy92JYW3rQBjmG5iVBnhEqRn4Wvpbw+QPVdAA+dSOnAuY2A9lRZJ6Q4h9p5VG3k0uF999Q9NPEEYfVQ9Le6XqnJki5Xsc6fpnvis5Byd9xQ7GVAHf7ogvAvlwBDKInwEiNTwSiX7eu3OjTgxZg2PxMHOsbeoGvzqINETPArfAXY3FdzF1fmBH6aSojvVaGYVEy20jwdk07RbRJkmaJ6w9QYs5M0HP4fbFNXhH/VKSSRRhfnKA==; 5:ud1NOCYhOt4ymApyokD48qRUvlPCvRqChoXuZMzqVfIcuNcZQe0DJavpoDoG91FX2RRhJcgqXKAqt9bnxCjkzXJam5rKFdj+UWB91V3d/SmljciJKFWnMKhMes31kbQhKH1o8wjC6DarK4k5nQU66YcMe+PwscQmF+ljC8mv2obtgNcQ3Nt9s9kquwsLu7sML5IpHfaldqgB+6Vsj4/2IQ==; 7:vbVo4OYltW1WXmE5Z9RU7OOK+f60AQoFwlYKaN9ICz9RBq4JxCHl+qE1HySMTvATjCkZTo4L/uLVQ7FCxtJ7K8535SHHd62Is2DuwMuVKaDVaFaOjMTS6wQ45rrZzzWK+sQ3lGUVtRx7RQ1jZ71Jqw== x-ms-office365-filtering-correlation-id: 1e8515bd-a048-489b-1a14-08d687cc60b4 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:AM6PR05MB6470; x-ms-traffictypediagnostic: AM6PR05MB6470: x-microsoft-antispam-prvs: x-forefront-prvs: 09347618C4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(136003)(346002)(376002)(396003)(39860400002)(199004)(189003)(105586002)(99286004)(6436002)(3846002)(7736002)(86362001)(6486002)(76176011)(4326008)(6116002)(305945005)(52116002)(5640700003)(36756003)(316002)(71200400001)(256004)(71190400001)(106356001)(6916009)(25786009)(53936002)(186003)(478600001)(476003)(2616005)(118296001)(26005)(11346002)(446003)(2351001)(486006)(6512007)(107886003)(2906002)(81156014)(8936002)(1730700003)(8676002)(14454004)(2501003)(68736007)(66066001)(81166006)(6506007)(386003)(97736004)(102836004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB6470; H:AM6PR05MB4885.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: ZbiuChj0wR781T0WDEWbEHd2gMbhAIgneUPGLLlwn+IQYYP2K51UOjfX5MSGwnyE10yW4r87Yhj+Yr8zhXJOCnuhefr0F12uvUdXNykANzUi9NTr4Ip/dkbdVzNXtRRjKXusbnsCk19HiczManXxycUZyqx9N7sjGh5a8suSJWes6mnkD0SDkOA8W7bwZ5acTsSIuElqU+QMuql5g+t9cnVnPJQD9guRne4rjmuTdYTSlF87MRCN0SYZepiuNvqlU6fpBHUhCGQMFycb1d8iDTCLEtNKCtZPsMC+xumePDdFa2X4Kw8tN/Ov9W8pyw1LEl0z/XsvJQ0jSdFarrCZzqxyWQ80fxsazPcoUjm9MUK8dbDJXNjygy290znX2gf5KCtRB/9YztGgUv0tozzjdnysk2lfPlzqgRlwZC77qbU= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e8515bd-a048-489b-1a14-08d687cc60b4 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jan 2019 22:35:18.3606 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB6470 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The untagged egress test sets up mirroring to {,ip6}gretap such that the underlay goes through a bridge. Then VLAN flags are manipulated to test that the traffic leaves the bridge 802.1q-tagged or not, as appropriate. However, when a neighbor expires at the time that the bridge VLAN is configured as PVID and egress untagged, the following discovery process can't finish, because the IP address on H3 is still at the VLAN-tagged netdevice. This manifests by occasional failures where only several of the 10 required packets get through. Therefore, when reconfiguring the VLAN flags, move the IP address to the appropriate device in the H3 VRF. In addition to that, take this opportunity to embed an ASCII art diagram to make the topology move obvious. Signed-off-by: Petr Machata --- .../net/forwarding/mirror_gre_vlan_bridge_1q.sh | 63 +++++++++++++++++++--- 1 file changed, 57 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh b/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh index 204b25f13934..43ee505f9f71 100755 --- a/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh +++ b/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh @@ -1,11 +1,44 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 -# This test uses standard topology for testing gretap. See -# mirror_gre_topo_lib.sh for more details. -# # Test for "tc action mirred egress mirror" when the underlay route points at a # vlan device on top of a bridge device with vlan filtering (802.1q). +# +# +---------------------+ +---------------------+ +# | H1 | | H2 | +# | + $h1 | | $h2 + | +# | | 192.0.2.1/28 | | 192.0.2.2/28 | | +# +-----|---------------+ +---------------|-----+ +# | | +# +-----|-------------------------------------------------------------|-----+ +# | SW o--> mirred egress mirror dev {gt4,gt6} | | +# | | | | +# | +---|-------------------------------------------------------------|---+ | +# | | + $swp1 br1 $swp2 + | | +# | | | | +# | | + $swp3 | | +# | +---|-----------------------------------------------------------------+ | +# | | | | +# | | + br1.555 | +# | | 192.0.2.130/28 | +# | | 2001:db8:2::2/64 | +# | | | +# | | + gt6 (ip6gretap) + gt4 (gretap) | +# | | : loc=2001:db8:2::1 : loc=192.0.2.129 | +# | | : rem=2001:db8:2::2 : rem=192.0.2.130 | +# | | : ttl=100 : ttl=100 | +# | | : tos=inherit : tos=inherit | +# | | : : | +# +-----|---------------------:----------------------:----------------------+ +# | : : +# +-----|---------------------:----------------------:----------------------+ +# | H3 + $h3 + h3-gt6 (ip6gretap) + h3-gt4 (gretap) | +# | | loc=2001:db8:2::2 loc=192.0.2.130 | +# | + $h3.555 rem=2001:db8:2::1 rem=192.0.2.129 | +# | 192.0.2.130/28 ttl=100 ttl=100 | +# | 2001:db8:2::2/64 tos=inherit tos=inherit | +# | | +# +-------------------------------------------------------------------------+ ALL_TESTS=" test_gretap @@ -30,6 +63,15 @@ source mirror_gre_topo_lib.sh require_command $ARPING +h3_addr_add_del() +{ + local add_del=$1; shift + local dev=$1; shift + + ip addr $add_del dev $dev 192.0.2.130/28 + ip addr $add_del dev $dev 2001:db8:2::2/64 +} + setup_prepare() { h1=${NETIFS[p1]} @@ -55,7 +97,8 @@ setup_prepare() ip route rep 192.0.2.130/32 dev br1.555 ip -6 route rep 2001:db8:2::2/128 dev br1.555 - vlan_create $h3 555 v$h3 192.0.2.130/28 2001:db8:2::2/64 + vlan_create $h3 555 v$h3 + h3_addr_add_del add $h3.555 ip link set dev $swp3 master br1 bridge vlan add dev $swp3 vid 555 @@ -68,6 +111,8 @@ cleanup() ip link set dev $swp2 nomaster ip link set dev $swp3 nomaster + + h3_addr_add_del del $h3.555 vlan_destroy $h3 555 vlan_destroy br1 555 @@ -182,13 +227,19 @@ test_span_gre_untagged_egress() quick_test_span_gre_dir $tundev ingress quick_test_span_vlan_dir $h3 555 ingress + h3_addr_add_del del $h3.555 bridge vlan add dev $swp3 vid 555 pvid untagged - sleep 1 + h3_addr_add_del add $h3 + sleep 5 + quick_test_span_gre_dir $tundev ingress fail_test_span_vlan_dir $h3 555 ingress + h3_addr_add_del del $h3 bridge vlan add dev $swp3 vid 555 - sleep 1 + h3_addr_add_del add $h3.555 + sleep 5 + quick_test_span_gre_dir $tundev ingress quick_test_span_vlan_dir $h3 555 ingress From patchwork Thu Jan 31 22:35:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1034503 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="dwO9sAJE"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rFS42pZPz9sDX for ; Fri, 1 Feb 2019 09:35:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729693AbfAaWfa (ORCPT ); Thu, 31 Jan 2019 17:35:30 -0500 Received: from mail-eopbgr70075.outbound.protection.outlook.com ([40.107.7.75]:14830 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729402AbfAaWf3 (ORCPT ); Thu, 31 Jan 2019 17:35:29 -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=tgXeXX4jTJL2xcZnCGYD1KoeZqAUkLomVqiAZH3tT14=; b=dwO9sAJEryo+NI6qjI6BWmzsP+HlXCRe/yK/UU4tCscAOW3bNxM1hioktZpQF+pewhcnZvr65Nd3aQtHGPmrzGK8biTvfRkI6bcQm9z1Bn0lYQsrPGHvs5bYTtUVc/7TG3ppc603+dj11in1u0uKaaMlXVsmPwmCLB42F0d4mhY= Received: from AM6PR05MB4885.eurprd05.prod.outlook.com (20.177.34.225) by AM6PR05MB6470.eurprd05.prod.outlook.com (20.179.7.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Thu, 31 Jan 2019 22:35:21 +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:21 +0000 From: Petr Machata To: "netdev@vger.kernel.org" CC: Ido Schimmel Subject: [PATCH net-next 07/11] selftests: forwarding: mirror_gre_vlan_bridge_1q: Fix roaming test Thread-Topic: [PATCH net-next 07/11] selftests: forwarding: mirror_gre_vlan_bridge_1q: Fix roaming test Thread-Index: AQHUubU/6M4gQmnzr0WP1mUP32R/CA== Date: Thu, 31 Jan 2019 22:35:21 +0000 Message-ID: <8429c02445bca2d70ece7412e788da7115a69039.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: AM5PR06CA0023.eurprd06.prod.outlook.com (2603:10a6:206:2::36) 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; AM6PR05MB6470; 6:beiISih5sgL42fmtRGJ7l9qVXkViDWx1xpdl3zAYGoRFldq1aGZImIYQzpy+uGJbIf5+nfIXmgnH68vwJpeXVYnqNx3TzRscUqKAsNhrn+GkVq2abcaIDSTUU42bZblOAUE+bb+Rt4PkGL+P35fbw1jkjsAUWPbzuW0BRaHn8X3mrVj20Ly8zOFJjKt8AMwnQagoGsE6hC1rgebp4lnJssUM8meU4ywkcnOw2juMo2O38Iw4qJ4gnpJuLFYKTuzMsdMyY6VOBoF58PLbFhwPQE0uKjmEy4spLbecW6A5axpz6O4Oz3Lw6PYhwQuqeQmd0nA/1ZLcBFuRcgM1POOV+saMPOagaKQWr1Z7PoHeQsdepX4l7PgKmQ1ogeHsJcQ3xTaaRzeY6lAM493I395vF6EXs7ZaSBQ+nNAaJVRGuWGpBoTqJL0OjwOR1UxcHEDgZqyMgWz/P9fl/jYTxGfjUA==; 5:6k+NQ/YWNRHRLO+bX6Z9IuS34SkPlJ2YKiKzOJwlhQJM89EV8pdSR+/kp95b8gbc3Jujwsz9uDf0LGqSRDyqIOA6qPxdXbJG7n/OpF+dQ10yuY6IepTSRK4ny8lUeNaY81GnEKMju+s2BPbmWYF7vbN1OtT2/3ZbewsbXGGuW6J/vvXhkFiaGYy/gaSau3hntF+KcjTFQNb45azTibYHmA==; 7:9IbCg73qn0drwmKvIknWzmAgOdpWjc3cJQt+aV75NzUj3S4GkUMNKGDex7gyqqFXeD6Xf5XSKnDu28XgnPrKNtmbIcalgIIfjVAVK4NW0GPxGR0FSe1wW/ZLBFkDepZElKWiHejHl3U0sQbxrxVBhg== x-ms-office365-filtering-correlation-id: a0da6cf7-ce90-4dd7-392e-08d687cc6228 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:AM6PR05MB6470; x-ms-traffictypediagnostic: AM6PR05MB6470: x-microsoft-antispam-prvs: x-forefront-prvs: 09347618C4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(136003)(346002)(376002)(396003)(39860400002)(199004)(189003)(105586002)(99286004)(6436002)(3846002)(7736002)(86362001)(6486002)(76176011)(4326008)(6116002)(305945005)(52116002)(5640700003)(36756003)(316002)(71200400001)(256004)(14444005)(71190400001)(106356001)(6916009)(25786009)(53936002)(186003)(478600001)(476003)(2616005)(118296001)(26005)(11346002)(446003)(2351001)(486006)(6512007)(107886003)(2906002)(81156014)(8936002)(1730700003)(8676002)(14454004)(2501003)(68736007)(66066001)(81166006)(6506007)(386003)(97736004)(102836004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB6470; H:AM6PR05MB4885.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: U3FAcnQOQpGAVQEvmYowix2iyGYJhADRIOF1PZf9sXGQkP8w/G6Vtd6Jl4hrBfUVpw7prPCXHsPFmRX99LvHh0hsDDHSLCTkpf8AkMz4MgAMca27ckTE7x0UPMrrnC2WjFR8xmxNdQOe3lpfj9Y4K9jyA05ExbZzyOUO+zRIlNCicI7Tx77MvWglx40u5inOuBGotDb3dc1Fr9SshPKS6nN8hhWqkA9+swLpwyvzbPLJ48+RzB6MdMsiALwba0Du4nBMj3S47FBjqsr2uWxQUzz15xjyo90VPdbURQrnfLB9YCl3+aYt6FA4tjNDV18QoO0uJ+zTiO+Zhx12MyUenfzr+YQX0wEh2A22QKzyMD3UyOchrABdsyjoRzVq5InW52d7f1mG+5Z75BaIizy4s5+ACdoKZDOe7R1FqiElL60= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0da6cf7-ce90-4dd7-392e-08d687cc6228 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jan 2019 22:35:20.8284 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB6470 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ARP or ND traffic can cause spurious migration of FDB back to $swp3. Mirroring is then updated in accordance with the change, and mirrored packets are seen at h3, causing a failure. Detect the case of this spurious roaming, and retry the test. Signed-off-by: Petr Machata --- .../net/forwarding/mirror_gre_vlan_bridge_1q.sh | 25 ++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh b/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh index 43ee505f9f71..c02291e9841e 100755 --- a/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh +++ b/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh @@ -269,12 +269,25 @@ test_span_gre_fdb_roaming() mirror_install $swp1 ingress $tundev "matchall $tcflags" quick_test_span_gre_dir $tundev ingress - bridge fdb del dev $swp3 $h3mac vlan 555 master - bridge fdb add dev $swp2 $h3mac vlan 555 master - sleep 1 - fail_test_span_gre_dir $tundev ingress - - bridge fdb del dev $swp2 $h3mac vlan 555 master + while ((RET == 0)); do + bridge fdb del dev $swp3 $h3mac vlan 555 master 2>/dev/null + bridge fdb add dev $swp2 $h3mac vlan 555 master + sleep 1 + fail_test_span_gre_dir $tundev ingress + + if ! bridge fdb sh dev $swp2 vlan 555 master \ + | grep -q $h3mac; then + printf "TEST: %-60s [RETRY]\n" \ + "$what: MAC roaming ($tcflags)" + # ARP or ND probably reprimed the FDB while the test + # was running. We would get a spurious failure. + RET=0 + continue + fi + break + done + + bridge fdb del dev $swp2 $h3mac vlan 555 master 2>/dev/null # Re-prime FDB $ARPING -I br1.555 192.0.2.130 -fqc 1 sleep 1 From patchwork Thu Jan 31 22:35:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1034505 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="vLt37HxX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rFS95kTrz9sDX for ; Fri, 1 Feb 2019 09:35:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729711AbfAaWfg (ORCPT ); Thu, 31 Jan 2019 17:35:36 -0500 Received: from mail-eopbgr70075.outbound.protection.outlook.com ([40.107.7.75]:14830 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729676AbfAaWfc (ORCPT ); Thu, 31 Jan 2019 17:35:32 -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=NvxuYnWanQXr0a6b7hso/u8LeWmd2v19VL4C/XbHVac=; b=vLt37HxXbY+KdzdXIO4RIoRbKgLmxTmRO/Zt/PKHcleoYW5tb/J7tDMB/W6Z23im0WaJMu2LyHBO03QOa5LRmQNSEqE3r1hlefLWPgFAzFJDOiUfQs0S1UdUlQVywEtndazSCgQbBi81sETYIg/QW3T41UOKU9fzo2AUZ5//Ouk= Received: from AM6PR05MB4885.eurprd05.prod.outlook.com (20.177.34.225) by AM6PR05MB6470.eurprd05.prod.outlook.com (20.179.7.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Thu, 31 Jan 2019 22:35:22 +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:22 +0000 From: Petr Machata To: "netdev@vger.kernel.org" CC: Ido Schimmel Subject: [PATCH net-next 08/11] selftests: forwarding: mirror_gre_bridge_1q_lag: Flush neighbors Thread-Topic: [PATCH net-next 08/11] selftests: forwarding: mirror_gre_bridge_1q_lag: Flush neighbors Thread-Index: AQHUubVAoHjKywWC8kCDdYzKPPJuTQ== Date: Thu, 31 Jan 2019 22:35:22 +0000 Message-ID: <13dc53798b8021c5d7a48c27182d9383e62a87dd.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: AM5PR0402CA0013.eurprd04.prod.outlook.com (2603:10a6:203:90::23) 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; AM6PR05MB6470; 6:5AwDNiMfb8j3DsD3JoqYxwDg0iI5ZipyER6yJrwizpNCeWnWvFF+mBB0I261ox/aQ3de81mTxISkRANVFeSITrbXbBfQs9Rm/b7JiU7GprYBKBKhLqwYo4ewjUdXfmrKPmqP0sZtg2nolnjadAIn/DBD6BliDL/+JCGOB5JcWViMi3196SIHIiOP8vYENMnEY4UobnrXCEv6ZE5C29kYSHqDUZo4hFoGDzTSUdTmm3dnsZBlcbQNWi7vJ1FVVtJG6aCeqwKZlIMnUNxEZcWk+F/AsSSa4zMLsYfGuzXxfv1aG4MhgNnhDPHyr4Erd2lHa7jy2BUVyGVu5dE4n6jOwiCeQBKTkw1I1hxCqi1XIg/8WY+05Yce4MGxAo+qxkPYdREqZ8DXhf7HTOzx9A1jpva5Zwq+sYLNYGWnVg5kpS60ZYJDrj5ie/5FSWl2ZUz19UX9ZW4PfUwa+H/acnunHw==; 5:0pBHakeFicAPVnWZCx7VDx2yMjnWsTGLCOQWCmcgUP+Vw8KTNLAtvidYFUzfg8ZsY5zrpCV1GfS1UNsnZgb0xQZCyfUTRZdTmaoAjKHjQZPYATxcFbHQ+MQon5DiBbx/qAYSMSHuUG/yOO2bevnuhMctmeAPd46Hb9JEXCaYYakG0b/4y0HXGBaLxiMGQxNsONUZNbI/kYdv74RMd1E2iQ==; 7:VRkLjh8/0OR5QmvYUJS/p6k0S/ACQxmNX3iJiJBp7ncJMP45hcKGrpu5A1GwBP6KTDOELdct0ATdaDe8Tj33kVsNDs58Qpep2nCErtiyws4Fy2v5lbbi4qZgiOETlkiDVdzzo5O53o4YwJlZ0oNWLg== x-ms-office365-filtering-correlation-id: f889d824-1ecb-493f-696c-08d687cc6304 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:AM6PR05MB6470; x-ms-traffictypediagnostic: AM6PR05MB6470: x-microsoft-antispam-prvs: x-forefront-prvs: 09347618C4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(136003)(346002)(376002)(396003)(39860400002)(199004)(189003)(105586002)(99286004)(6436002)(3846002)(7736002)(86362001)(6486002)(76176011)(4326008)(6116002)(305945005)(52116002)(5640700003)(36756003)(316002)(71200400001)(256004)(14444005)(71190400001)(106356001)(6916009)(25786009)(53936002)(186003)(478600001)(476003)(2616005)(118296001)(26005)(11346002)(446003)(2351001)(486006)(6512007)(107886003)(2906002)(81156014)(8936002)(1730700003)(8676002)(14454004)(2501003)(68736007)(66066001)(81166006)(6506007)(386003)(97736004)(102836004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB6470; H:AM6PR05MB4885.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: RyKxUkByn/sC3t8MMcSnOG0vBWVnS05+8BGKvjwOxRriubUpd7sCCCtKzm7sHgp4qQ/G7MFIHgxuyYadrrYq7IUqm8dq6/Ha8J975T4R6D+cOXdtXGF94xSq2K3iYeGA1AVNhgoqc9GnUa+g9vsZGPHPEqNqqmItDBhyA41dDfqPmdVduO9LPwk63BOhib4qTe98p0tL2NbsCxN4/OY81toxkP8sGQgV9YDB5ugVnQxojKM0IFIBRGTWVLKM4G/orChsfNZXwDVnST0rWePIV2i4XORsNX8MKQTMqlJc65NNuVBfe1AGvpkiNUESbh+QXn54mf4fbZNMK4W2LgwHuyXJ6ATIG1bCtXfBSeeMrotc3Vx++yw0TGooAz5sLJ/KYUjnvVmZCyuQvgiaJTOH2wF7+B9vNGJOmiARniUcK30= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: f889d824-1ecb-493f-696c-08d687cc6304 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jan 2019 22:35:22.2584 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB6470 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org After one LAG slave is downed and another upped, it takes a while for the neighbor on a bridge to time out and get renegotiated. The test does prompt update of FDB entries by arpinging. But because the neighbor still references another address, offloading is not possible, and some packets may end up not being mirrored. To force the neighbor renegotiation, simply flush the neighbor table at the bridge. Signed-off-by: Petr Machata --- tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh b/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh index 61844caf671e..ce60e3050811 100755 --- a/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh +++ b/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh @@ -225,6 +225,7 @@ test_lag_slave() # Test connectivity through $up_dev when $down_dev is set down. ip link set dev $down_dev down + ip neigh flush dev br1 setup_wait_dev $up_dev setup_wait_dev $host_dev $ARPING -I br1 192.0.2.130 -qfc 1 From patchwork Thu Jan 31 22:35:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1034506 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="oP5VvCLr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rFSF58VKz9sDX for ; Fri, 1 Feb 2019 09:35:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729717AbfAaWfk (ORCPT ); Thu, 31 Jan 2019 17:35:40 -0500 Received: from mail-eopbgr70075.outbound.protection.outlook.com ([40.107.7.75]:14830 "EHLO EUR04-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728395AbfAaWfi (ORCPT ); Thu, 31 Jan 2019 17:35:38 -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=56EWZNPUrM6QwKXA7Thx1+KA1eXDqCBDr0YyzHGGM2E=; b=oP5VvCLrOUVIWTUSUdOevrK7MmzgvFlqYiQnBocS5FuRgN3hC6VhuX+gbQUSZ0xPg+Ow+4hfmFI6EaTl+O7WpZZzEmHLQyoew6L8UTIlxRAEFUVxzxXNhQEqNK02ELacm/XXi5FlEtvII6ljLOMnO16HD3A9MmoYfOaMc22Aue0= Received: from AM6PR05MB4885.eurprd05.prod.outlook.com (20.177.34.225) by AM6PR05MB6470.eurprd05.prod.outlook.com (20.179.7.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Thu, 31 Jan 2019 22:35:24 +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:24 +0000 From: Petr Machata To: "netdev@vger.kernel.org" CC: Ido Schimmel Subject: [PATCH net-next 09/11] selftests: forwarding: mirror_gre_bridge_1q_lag: Enable forwarding Thread-Topic: [PATCH net-next 09/11] selftests: forwarding: mirror_gre_bridge_1q_lag: Enable forwarding Thread-Index: AQHUubVBzjTx8wlSDU6hND6W9gk06g== Date: Thu, 31 Jan 2019 22:35:24 +0000 Message-ID: <3c174a6e79876bb2c8d6efb5b9416723c1a4f246.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: AM5PR0402CA0002.eurprd04.prod.outlook.com (2603:10a6:203:90::12) 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; AM6PR05MB6470; 6:znyhvrad6VPs+NJhUbIzuEzFhHu7yug+6IjQJtTJOVxf4iIeA89sb4yVMGzLdB3QxMWYZOD9UFml+CPdHGRMOsVXIJamoJUDIZgbUCUcH8kxix6zsPHgaI7SgpiM698Zhspuc7iCkcs/26l1tSWYQqIFSTZOW/NsuuIpzSlcHfHv10VDzbScixsz31u3mJXLB2bhx/QtQG6pR13DcDoUg1Ddc8hHAi6G+bxQuX68TSv33KndRpb7ki+gSCteIhodHzbCdd8acw7zdzgphKuR7jYkEmY5SkHCuNuqMPRh9vSGjhimX3+DWtZAF07W8FiLDpfJe/hel2VZtlxnp7iWwnc1U/bOSojLMiCtm3xCajyfOVZjEpYYL+zHGJOFT8e8Fo8426G/dhgDpVxhps42DXPDqrim8yjbOOBdSYvQmZ4hDynwaDaLBHBGCoquI0qS5EfR1mojWKUWj/XLPt2jIw==; 5:c6pGJNyS5I+eZEM9ho55+4ZfjiUBD3WQZqfkanYazoyZsQKfDpwpVj07QIAfKShhbOgujBTIbIRJnPkHvXwT+8jLV7vTjIfG/58bzhyyrJwbICsYpSqSA5iVFpE1eisOOnaPV6TiYnUTmjJ0hKf+Vkz9+79uYBf8VlsdHoXS77MuQutfQhqYFQXaXBHC688f6pH3tZHWe7oeiqBn7xcNmg==; 7:3MqwXhd8OE0VtgBVaBj2mJ7bqZadhg4Z8wXcHXyJlVgvZgFjDOby5xC/PGCps+ENW8WGgDSNiPnMFznyBoPs+y4EA5dRX6aFbSqUfa+xVgHp9Ege0c5ObwCRaVoG369f63AZ1d6AkTuNlB/+gvGFEg== x-ms-office365-filtering-correlation-id: f9e8002d-7a90-445d-bcee-08d687cc63e2 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:AM6PR05MB6470; x-ms-traffictypediagnostic: AM6PR05MB6470: x-microsoft-antispam-prvs: x-forefront-prvs: 09347618C4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(136003)(346002)(376002)(396003)(39860400002)(199004)(189003)(105586002)(99286004)(6436002)(3846002)(4744005)(7736002)(86362001)(6486002)(76176011)(4326008)(6116002)(305945005)(52116002)(5640700003)(36756003)(316002)(71200400001)(256004)(14444005)(71190400001)(106356001)(6916009)(25786009)(53936002)(186003)(478600001)(476003)(2616005)(118296001)(26005)(11346002)(446003)(2351001)(486006)(6512007)(107886003)(2906002)(81156014)(8936002)(1730700003)(8676002)(14454004)(2501003)(68736007)(66066001)(81166006)(6506007)(386003)(97736004)(102836004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB6470; H:AM6PR05MB4885.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: hrPkz5AD5rhqOZ9LWAIOs3Nsq5pdC5En4cbM8juf2td6VIlUCOXVKaz1UIC8vBhhWwjoY3XmvauLWBeovByKZJbAFxdGHD/NMaSw0sMJbwTvFd5LfuuFRKwRrIfWCjK1EGWtMrlXMP3zLRt6zg45UjbFDcRqu2K2kLIFa4pNKmx1nn0WUrpk904h4xV+4eYZUTSmprw+OxCHhgCbte7MyDXeXhcW8gPt52D+bzLUDL0D8+zGJo26UYoEyyrWlM3uf2DulDDVcy5Kh1EsxRKedRwy3jVVvdeV5XthNRvGQXP4k+uwv8/TgANUPw+4ELxZwxwG0sK3ZDMPr9Vo8wtPjw1h3OIm1K0SmMCyo8ZqOXyvuP2xKjMFR9pUDKxKOD+YncujIe8cO5NwXzWyAwnwMhb7VZpZoo8z84kmxy5DI6k= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9e8002d-7a90-445d-bcee-08d687cc63e2 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jan 2019 22:35:23.6964 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB6470 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This test relies on routing in the primary traffic path, but neglects to enable forwarding. Do so. Signed-off-by: Petr Machata --- tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh b/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh index ce60e3050811..1900c31e938c 100755 --- a/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh +++ b/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh @@ -190,6 +190,8 @@ setup_prepare() h4_create switch_create + forwarding_enable + trap_install $h3 ingress trap_install $h4 ingress } @@ -201,6 +203,8 @@ cleanup() trap_uninstall $h4 ingress trap_uninstall $h3 ingress + forwarding_restore + switch_destroy h4_destroy h3_destroy From patchwork Thu Jan 31 22:35:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1034502 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="OvFuiyQU"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rFS26vHqz9sDX for ; Fri, 1 Feb 2019 09:35:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729678AbfAaWf3 (ORCPT ); Thu, 31 Jan 2019 17:35:29 -0500 Received: from mail-eopbgr20087.outbound.protection.outlook.com ([40.107.2.87]:63392 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729472AbfAaWf2 (ORCPT ); Thu, 31 Jan 2019 17:35:28 -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=XEQ2jWbpHX8/B788DpvYwV5ti8w4JxDZIE/wtBnqnko=; b=OvFuiyQUtq/uD81LfwVAJhFCpamF//xwapGE86uI3n/YaV3lgGl+9Mjxwsx6v+camv2XS32+cxP7C37FYNdP48E6rz5mROnb7sfju/X1aJUltv44KcsVeO6LGrm3D8U48MO2vj301BQdCBKOn1kMYTkTtACe81lI1E+mlgbSaGc= Received: from AM6PR05MB4885.eurprd05.prod.outlook.com (20.177.34.225) by AM6PR05MB6599.eurprd05.prod.outlook.com (20.179.2.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Thu, 31 Jan 2019 22:35:25 +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:25 +0000 From: Petr Machata To: "netdev@vger.kernel.org" CC: Ido Schimmel Subject: [PATCH net-next 10/11] selftests: forwarding: mirror_gre_bridge_1q_lag: Ignore ARP Thread-Topic: [PATCH net-next 10/11] selftests: forwarding: mirror_gre_bridge_1q_lag: Ignore ARP Thread-Index: AQHUubVCY9IapJ7VwU+hAbjJd2UfVg== Date: Thu, 31 Jan 2019 22:35:25 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR02CA0023.eurprd02.prod.outlook.com (2603:10a6:20b:6e::36) 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; AM6PR05MB6599; 6:rjKtJ9hHJurSUw/MZyOoesBv8nSD+X8izJP8oHAFvOJD2pV2q9HZjrUNlmKGIFxKPxN1WzCYvxA6vTB5cmxS4M+Lcrr+xzwCRj+IqfTZAJJzIgcHaK0yBf1EIqbesyguFYRSf3bUllNeZNIiMyme2LXEwm/TSqIBnWdtzVqvOQliS9TiiTsJEUpCV0JUDsUPdQhkJ6le959cMRfSeRA6T486aQpUU8g5u0jLNsIeAG3knmddK1lq7uVWjZx8Ajiy9Ypccs2TwKoeCkg+cHi6p5Fq5OGAyjHmNjOEKuw6ayawf/dUMFXHe+Wro1n2iiypCMNH7EElk/BdIE2rNSUz7VJrPveOmYYVPKqRc4Op0AWmSRORMs4wAPcibZ64y7mlfx+mFc12BLpQem3xVAMUtTfnS1uB4aB2Mc7Svvqz03xLvfx+UooZIc/N9vvNlA4VGnOd9YFvDlcgZBGFdFSYjA==; 5:0/r7VRTWxk1rBxWeGVdXHFEOG7J9fwBfOFz/lexs/z49PZJiS93fpnqBIetmePZOwXv74XTUmZqHBr43mYcQC+njU1vUVwp5MiRy3hj3ep39Bo1GYX8X6cnrpHnBqNl4/HhJQOq9y2YLGt1ibAkg8FL3yudh9l8VB/aqejZYxVUAtH5uFwes38R5HovEPYl3C5jscq38SqC5l2b39jAV4A==; 7:qQe6cbOiKulK/11/K9JKvyZKSYEXbYkdzgnzrjgzlVqFY63XsgnAxpG0kxH+mEDlJEbpEG5Ar9isrs6jNbF5rZXCGHPGwtvBgWdSxqLugSsRL5ANoaUw3QjkFfmVEkBEj0vUl5j+wZtep9Bat8eGOQ== x-ms-office365-filtering-correlation-id: 4d2659bc-a4b5-4ea4-1817-08d687cc64bd 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:AM6PR05MB6599; x-ms-traffictypediagnostic: AM6PR05MB6599: x-microsoft-antispam-prvs: x-forefront-prvs: 09347618C4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(346002)(396003)(39860400002)(366004)(376002)(199004)(189003)(2501003)(68736007)(4326008)(8936002)(2906002)(186003)(53936002)(66066001)(25786009)(107886003)(86362001)(81156014)(81166006)(8676002)(1730700003)(7736002)(305945005)(36756003)(486006)(11346002)(446003)(476003)(2616005)(3846002)(6116002)(14454004)(316002)(256004)(99286004)(14444005)(478600001)(118296001)(6916009)(71190400001)(76176011)(6436002)(71200400001)(52116002)(6506007)(386003)(97736004)(26005)(102836004)(106356001)(2351001)(105586002)(5640700003)(6486002)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB6599; H:AM6PR05MB4885.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: 4HXfph56Gwcku49OrfPJ60lCZ+Su0ntpSoJ9JOwFKfJWOZOIAXmXPQciM9mXXB/iDSiRKmXr0qtpBXu4ZRFwNRKp3xTX/bcbZGwFuNU7oYfkMybbVZ3KClvYCl50fqXcCinSdca7a3Ub6qH6NMZdZcz2gRx5glRNCFliyqiCTzd/rtyc8Pcoq5CQxkEuNo3qXiAQnvsrKI0SDvQ5fBZeZBIcMU9f32v3zDi1iPI0Ut+PY4qa7Xp79zwUiOkgAq1yEYGy4qXLGL9yJNEd8h5cGNydNGb3CTrQOOldtRXrPl5HvJeOtyH+4R0knzN+3OBflk+dauMp0kQXxYbijZ7VMDZwxsJ6UctLiHGb7wyoApH7Ie5puROC2Z7OJ8v5zzEkLOuH48J5B/HN2yC05rH6VKf8I81KfXK1S65VSVl3vuY= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d2659bc-a4b5-4ea4-1817-08d687cc64bd X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jan 2019 22:35:25.1285 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB6599 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This test sets up mirroring such that it mirrors all overlay traffic. That includes ARP, which causes occasional miscounts and spurious failures. Ignore ARP explicitly to avoid these problems. Signed-off-by: Petr Machata --- tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh b/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh index 1900c31e938c..28d568c48a73 100755 --- a/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh +++ b/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1q_lag.sh @@ -224,8 +224,11 @@ test_lag_slave() RET=0 + tc filter add dev $swp1 ingress pref 999 \ + proto 802.1q flower vlan_ethtype arp $tcflags \ + action pass mirror_install $swp1 ingress gt4 \ - "proto 802.1q flower vlan_id 333 $tcflags" + "proto 802.1q flower vlan_id 333 $tcflags" # Test connectivity through $up_dev when $down_dev is set down. ip link set dev $down_dev down @@ -245,6 +248,7 @@ test_lag_slave() ip link set dev $up_dev up ip link set dev $down_dev up mirror_uninstall $swp1 ingress + tc filter del dev $swp1 ingress pref 999 log_test "$what ($tcflags)" } From patchwork Thu Jan 31 22:35:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1034504 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="e5nw8HYa"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rFS64PBQz9sDX for ; Fri, 1 Feb 2019 09:35:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729696AbfAaWfd (ORCPT ); Thu, 31 Jan 2019 17:35:33 -0500 Received: from mail-eopbgr20087.outbound.protection.outlook.com ([40.107.2.87]:63392 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728395AbfAaWfa (ORCPT ); Thu, 31 Jan 2019 17:35:30 -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=ESJ1Uuit49wDrNNGO3jFTzy0dZndVfRUMuwSi5fjXXc=; b=e5nw8HYaoi648DzZYP/7R/u5ejFmNZ8x3tMhY/imQutO5IvkQbGfypo3X5ekpPdXQYuNv5MS1cS0MrJgPOeDxkZNgadC47rFiSl6ysoOuiUm89mYb7ZydlEKyIbP2O5hLkn1CzzCYKt/S4zLaWzex37qsyOjxGpdl2Uju2GZC/k= Received: from AM6PR05MB4885.eurprd05.prod.outlook.com (20.177.34.225) by AM6PR05MB6599.eurprd05.prod.outlook.com (20.179.2.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Thu, 31 Jan 2019 22:35:27 +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:27 +0000 From: Petr Machata To: "netdev@vger.kernel.org" CC: Ido Schimmel Subject: [PATCH net-next 11/11] selftests: forwarding: mirror_gre_flower: Fix test result handling Thread-Topic: [PATCH net-next 11/11] selftests: forwarding: mirror_gre_flower: Fix test result handling Thread-Index: AQHUubVD5DVCRxzerk2Al1UD3O21lw== Date: Thu, 31 Jan 2019 22:35:27 +0000 Message-ID: <79643a7d23a5d55468a65c3d7bddaaa8785e7fd0.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: AM6P192CA0100.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:8d::41) 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; AM6PR05MB6599; 6:Foj61apMo/iNQlT5EmjGD6RljiWd3V1CD2WakzYWnl3cxxDUXt8+wqKFznzTlACvQlOKUt+6woFYYlD69Ycr9X48bW+NX9hHEA914TxMgKA+XAP7FhtOI4twYJFk2q0c1ZjXv2d6dMN99t9IxCFcYfwxqxX0IotslyqCIwxBUqJPdSA/3W7wEjrd2LX08uIWOXz1Ln+5JBfMLMvJ+WYzXj9lEumiqxr1fSCwXlgkBAMwP2M6QYR0YnC3o4KoOEOQX7heUoi/QeBBTih4xQquyewcbg1bPfDD0lGkvk++epO3aWe3ShDRabOfvg7fDmm4k4wCKHzNbZfl1siRZe1OEU0uafB+D5qPtRGZOwrqge9qwH/m204FBN+d4Wb6/oF5Q0Y5Ndhr8yqjmdCQ/tC9UmPQZ8Rqax5wVYjZ093WchkEKZnhwL3SXL74ZYpvfAFDoku7Yg44qnO2GTD/4y+pAQ==; 5:aISLAd6n/DgXNXFTnpBuC01W+HVpkOznlVFUv0IgXXmw44HkYZadcoGnrpSZ1uLMndkoB/v9V4ZTU9ACKGsnbm6MIMKfp9p9ehLHdZITWR4V/iyL4qPeakrDRssznJNZ+xW+IO7VqAyMZRDnxWRZ8PFD68B3pr8pf8dAUzjEnPq8KWiyus6d8WwBRXSie+AFHZbWmm/Yq9hc3rSw1AXP3w==; 7:MXlaNcKoLQhDeDj2cqtTbW4zH2qfR+ldGA3pBafQ4v6m1V2ZWl52air17Pftd1t1xPck8JdQwF5jT1qzoCZXYBZxu5pa2NSUB7HskWsoX2FBXaN0FVfHApypuRlaO9mb0H46cCUScc/OsFlBIEuzbA== x-ms-office365-filtering-correlation-id: 64e9251c-bb57-4657-c9ec-08d687cc65a7 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:AM6PR05MB6599; x-ms-traffictypediagnostic: AM6PR05MB6599: x-microsoft-antispam-prvs: x-forefront-prvs: 09347618C4 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(346002)(396003)(39860400002)(366004)(376002)(199004)(189003)(2501003)(68736007)(4326008)(8936002)(2906002)(186003)(53936002)(66066001)(25786009)(107886003)(86362001)(81156014)(81166006)(8676002)(1730700003)(7736002)(305945005)(36756003)(486006)(11346002)(446003)(476003)(2616005)(3846002)(6116002)(14454004)(316002)(256004)(99286004)(14444005)(478600001)(118296001)(6916009)(71190400001)(76176011)(6436002)(71200400001)(52116002)(6506007)(386003)(97736004)(26005)(102836004)(106356001)(2351001)(105586002)(5640700003)(6486002)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB6599; H:AM6PR05MB4885.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: aPbpdog42fDCcbVZq1gI6WUVbOQU2d2xEn04YXUY8zBT9ZoFNoBahBiTPDwy9AQiGfEO68MUha74E8D5hTeP7L/TmGcTS8DHMMwGutd2DsRVRKdAPL3Z5aFcUcufihnK8ew0Eugb6C92ZEad0xrKZPZhTbd8jzVs1JswCli26s6SzmrtoYxIPtiENDPbzI4Z5JgrTZt7uofMV0shVEndl8vOlQ7WkH/9mJGHXBQ1qOgMYeL5AOjPZGLABaKzG1ZVqhVpMvEuk10RQgJUkdz2yMShL4a/PNODerLh2Hmo69pWmaV5r3cOghxMTCIPtuQu3bSFdlhskAhtUAcqBTC+weaESBmDYdfYNUyzMV9K1nJRmnr7QEd9zwgWgab8mIEbWqR4sVWAFmuGWF4xmeGjHq0JcMWwcbyTJ8ygCKx/g/k= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 64e9251c-bb57-4657-c9ec-08d687cc65a7 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jan 2019 22:35:26.6656 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB6599 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The global variable RET needs to be initialized before each call to log_test. This test case sets it once before running the tests, but then calls log_tests for every individual test. Thus a failure in one of the tests causes spurious failures in follow-up tests as well. Fix by moving the initialization of RET from test_all() to full_test_span_gre_dir_acl(), a function that implements the test. Signed-off-by: Petr Machata --- tools/testing/selftests/net/forwarding/mirror_gre_flower.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_flower.sh b/tools/testing/selftests/net/forwarding/mirror_gre_flower.sh index 12914f40612d..09389f3b9369 100755 --- a/tools/testing/selftests/net/forwarding/mirror_gre_flower.sh +++ b/tools/testing/selftests/net/forwarding/mirror_gre_flower.sh @@ -81,6 +81,8 @@ full_test_span_gre_dir_acl() local match_dip=$1; shift local what=$1; shift + RET=0 + mirror_install $swp1 $direction $tundev \ "protocol ip flower $tcflags dst_ip $match_dip" fail_test_span_gre_dir $tundev $direction @@ -108,8 +110,6 @@ test_ip6gretap() test_all() { - RET=0 - slow_path_trap_install $swp1 ingress slow_path_trap_install $swp1 egress