From patchwork Thu May 24 14:27:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 919891 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="qWEgR6/Z"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40sBY871yNz9s08 for ; Fri, 25 May 2018 00:27:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033271AbeEXO1W (ORCPT ); Thu, 24 May 2018 10:27:22 -0400 Received: from mail-eopbgr40061.outbound.protection.outlook.com ([40.107.4.61]:60152 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1030254AbeEXO1T (ORCPT ); Thu, 24 May 2018 10:27:19 -0400 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=ev9kNML98h/zx5b+p5YeSAlMS7ufOJHueq2tts66kiw=; b=qWEgR6/ZAUg561/MeeSHjxE074rlel/KCmYb4hlxXFjjheCSq7DfYkTaD+IiuRbB1H0pwGg2AXuFbUrvGRpVCyf6um263ocOYAIyqGby3mZY3ddo527UoKp2Xgzx6h5htXa5NLTVo7InGWRkV739EvqSMaVQKrCNk22bA6L5IyQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from t540p (78.45.160.211) by VI1PR05MB4191.eurprd05.prod.outlook.com (2603:10a6:803:4e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Thu, 24 May 2018 14:27:15 +0000 From: Petr Machata To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: davem@davemloft.net, shuah@kernel.org, idosch@mellanox.com, jiri@mellanox.com Subject: [PATCH net-next 01/10] selftests: forwarding: Split mirror_gre_topo_lib.sh In-Reply-To: References: Message-Id: Date: Thu, 24 May 2018 16:27:10 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 X-Originating-IP: [78.45.160.211] X-ClientProxiedBy: LO2P265CA0077.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:8::17) To VI1PR05MB4191.eurprd05.prod.outlook.com (2603:10a6:803:4e::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(2017052603328)(7153060)(7193020); SRVR:VI1PR05MB4191; X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 3:/bZPc3PPN8+mJIFhJzJGwlcBT6Dp15GmOY6J2fMEu0lUF3WKelLbdbBH5LutkRS0BuO9518Q2XraanWUSEaR4E55+4lKw1R5/PEQJjODxIGb+gNbaGz9dlvDFjv8k7+rwYeM5UrSj6Gju2W/vF2pK4br8NzcI3iV+gNw7Emr1msgdkwvAk444yBUGmdvt07Rvg/2grvGyUU2Pe6NDSyjxS4ha96qJBbLyzYhnnCFKtJor3+IsszGJdZjyFF7mnvI; 25:by2UUwPaaTLgCnv8ZK3VBzov9MXfBmdL1H8jyOY/53PE5XVgLIxqgms27nhDU2h2o1RI7eRMvqtSelCIc0uAXJtC09SJPcEmUa/nEyA8igMOqiOmhiMmGU5r/9lk/j/3rajJgcm90b8W2XPWythLbcwXSGDbgvMBZoGqUn3kDqo29/M+XBVO0e7CoFx3SXcrZ8i9Wtpb3SI9SElWyx33zG/m2clWfgbdNT4WUwfJeGPzG0/N0MjK67BGrkeO6P7vjcImtYbwZgiTDFw83XjwyzhIQJQoh/PMDAU5A/LStqCl0sFdB9NzI72ZM24BZdQMktvRV1n7sQBjE5NKFoZz0A==; 31:Iwqi28DUliY3WwDwl4Dk1tjVKnSnQnvB4NfmZyl2ubSlO9LrK2XhQjUWgw1o3w/+zVsXZXjp+JHMS3uh+4ZdcqEEEN6+daJHhSEpEN32ZPDY6BgmYIKcip4v+0RF5cAVCaCJY35xOdqeqWJF5bytvRWPa3Om/TO6GjBNlLZzTJ/SMSPn/qFLgpSzvEjOaxPXXOY5l0M0vYT0UIGdsJWcwtUmzBr0WMdppWe83gVJSiA= X-MS-TrafficTypeDiagnostic: VI1PR05MB4191: X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 20:qlPrAWC5GDrJp3Pls6kYrS8K+AoHhv3afLgDSTGUziytdEADKVqt9FA0xhoXzDAhUFXhMWw84q5eR10SEpxUGvVAnW8e0WSzpdurUPBaH3FcFYy7LSnFDRo711vL7IRXshV0bbaVs6FiWK/tgW7KyNGE1gETDDagj+ZUUwXUYzB6zmcPDLlWKab6QdNj6CLO9scVIZNv55oRjAlawEkAOZTckQqX0Fl3iFZNvxURKg+AsSo+IbC1cLMlYHWQQAdW5efNf+gtT8+Tx0795qQF2tlNfZjv/GdvP+N3e+kobYfZ+HDOzN8Ibmi2Kgmpj/J25TVzVmsVBsanSIUx57+WvYpgq+q62ToBrqZxH38mIX1A2O6dWN3G40xuCcZdzLEwGrI0mRHfH4i5UJzq3llhR59M3xa2cDqbSI0uXMYMKG+pVqEJE6+WzsR/6fGug87iRW9fz9VFS1PbgbI7SfLfeop/gN4/PKM8X1fzhw6y3j0LMydxJ6gouptXEa8Va/hB; 4:3b9/3aAgFH5JgAw7GtZGYkZ2UlyHmxF40h/+L+UY9SJLp6tBF7CpXNQaL9xW9ufthSQ5yhw4wDLM91gbcMGhRW5FCwQ2qU4phqTrKag4+yHPFmsSZ54cPfrLRuv8sGJTB7mLgi8pjhjTY3WVLZjpVCNnyOy8XWVnVOwIYuyOd9ak2S3qc6ocCYqh9UWTqxJRb11Vt4pzZef1ElmwnqRbU/AIYLbBmrDnmYE1um+Jm/mxXkX5lCOEzUWbv/NZRFTc4GaPiv3jdH0XhGz+BWlMtg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231254)(944501410)(52105095)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:VI1PR05MB4191; BCL:0; PCL:0; RULEID:; SRVR:VI1PR05MB4191; X-Forefront-PRVS: 0682FC00E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(376002)(39860400002)(346002)(366004)(396003)(199004)(189003)(478600001)(86362001)(2616005)(476003)(36756003)(956004)(11346002)(8676002)(118296001)(6486002)(81156014)(81166006)(8936002)(58126008)(16526019)(4326008)(107886003)(486006)(446003)(53936002)(386003)(6666003)(52116002)(51416003)(26005)(105586002)(16586007)(316002)(106356001)(97736004)(305945005)(25786009)(2906002)(7736002)(6116002)(3846002)(5660300001)(48376002)(68736007)(47776003)(50466002)(66066001)(6496006)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR05MB4191; H:t540p; 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-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 23:I/gp2+lmTh9GVkMJx6M9xmcBnWepTAD/E5fGCK6kDSsUTuS/OyjqgOMpiekIRJCf2DmUcuqL2LnzPE3GXYtNnLYftXrqM59eKiLXm7oX8RZoGsN3EtgtR8pkvr45IJLQRUbLG7ZotOzJR9NtdCPFqW1M3NFyvLug8FJS2TrCZ8f5vMCUIFUU7dRdspqmtS180SAtpoQy+//U1dlqwvrhBQ/8lpKpD4TvRZDkuSxKGB6fNtTge/5MZQHFSQxb+Lw45lt+izF9Q06WXZxqAobJIIhksV+0/QioZK82G+5tUy5tqTkV6vaJuFIZs6RqgGV+pJ70eFWLoZydlL2wMxrIizJH5Fi5CllqffkbCDe2QcSAAHtdTLv22McyEyTue0U/G21wq1E2ANL7mwKk01g7iD5/tSb25+iSBu+vlv+PSf/XlIY2fS6XKzxLONMXbwwxGJZmtY5B1AIzZ6FiJEYlG8rThq29ZM2Ee8mvS9d5EkG1/Zy66GxQ6+91n/vcQWknljwrDz/USY5m3BrfB6+xVW4QkXq3mt7y/0t1b/GcXTkDfB0XYHxO7PPDWfZeh1w6yw/K7YBzZcL5P/Kf1GV1dACFCemUD8d7A8RJqm6pVnjNIlUoz+ijqv6leN2pyFkSwrdMfsfMfXJw1koZWMCar6m7i7DfAU5ccXaY1lL6yZ7y3Qm6e4YbWZK1BwLvaW2acIQZmwGr3NETsctv/DTBsDvDAXlGRXWbwsN4lV95TEX1Pn2wyYRqCEYHrKxDXyAvG7X+FanNEPoSfo2imvNJbn5G+eIryj48TyxRtgap4LOfPvum3a6dmilOLcMwbEprcLtpKEkHP8YAf0eiWEcamKjoLB58/THhiPdkOb1fUS6Pf8GRnzePQVcOXe+CvBV2kDHkcLgxoEfyux/d3xdkn9tBSvDfYzpvtSasnaBch/VRbqnaq/rei75UVddFkZ4CFitegafQf+xJW0Wdt9zDjQcL8BxmajqDPizMxr9maqWqQMLn3OTJKmpBF6Rxjuy0NVZ4fgujorm4lwfDHAzUIODYLErmC1U/YKop9LPRvG9S6IUs7Vb23z4wMN8i/1YG9OPscaZbBcY/xR3ismBZW9XUT16WECG/MwsyADY1CIVcaPe2awDgDkIHO5QYzuaRkkBbCbQOqB0aDFZV92iU8Q== X-Microsoft-Antispam-Message-Info: aVWkIrcss9ya8y7eEqdR3tML3NcHz7KX4yiznS52ZBvzmiU8r3tF8xnMoEebGkyoedSJINKyAS2gOKHJw9kRqfCImtGF5D7gSs3I8Kxbl9vvz8DlvHckGfPT/W2OUP7tK//qM7xqX0127E1LodxC8ylRNfMPkWPAY6QRu+yEPhWcTpLE69Rpbt3armdewSdy X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 6:7caJu95rJAXyMHsKC1RecrQ+Qo6KeaSy2qv/Q9COp+g7JpZhTYgdnTsP64n5Fhc8H3bBWlykgEqGZTYSu6zAKFa9bgGaXgtb0m4+SrQN2cIZt80sS0M5zZHGdPH5KtetnaRlGSL8Ta1raM/cbilJIijY/MVE2gOvmLLDGLTxmDcfUcddWdHj0V9z27mDV+bBfDdjbEGoF/wjiNzg9difHCA3OQftiu5Q6vZt9A5Dkwt1GlXilLiXyW25miqheeIzJH7jTD0o4aB3oKum3xKd5IklNs0laMK2dX4zGy3Fyszt1TaNRazqlL0B7Ev1n3GhTR1Up82N7hVgYtX3RqzbS+KCLTpyO3K7X3+efqQ6oFqq4xeZfaSYkSPx1vnyCG/85ibgy8DyuCGHpE+Xu8+CI4WzVhcsT3C2W8YXyw19TfkEyd8HoarwnFbYoNtkqfILGw2RUTEMFB8D5UjTqxYg/w==; 5:wmXx60Js6TIccjm6iTP8yfGpu4nr+GUlAcZJTutdB81i7PxFl4v2LZdJwTd1qidHNDEPqtM02N6BXXV5ey/WY9IvNay88CK49unQPN8eXyZsYIvVjNuCiOW4sWgsiaY5mJ9cuxJ2hnp0X49JU0k8fv0Vw2iHGz+3m+G5AbnGxpY=; 24:kkgHXzi1DG82x8fETSyqVM8iV8aXKzbmPEWQ1/IMLaUhU05n4PYb7SU+5R+LvjtqQ0RQz9v/LO7xw8KO2flebLcUR+W+YpzBwamuKMuRgzc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 7:Ybytb4DgGMs7eN55fSAz3OAeSFjaAaRsP15o6JjzUc1AIjGnAe0q9s4apgzMGtmgLhcpQL2Mb4TU0Oqz30ExGpmqRLlritbBOBYjbaP/5ds14NdoK//Bvzn0IKg75xXnakjDG0ACCoztBka3DT6iDnsTYrZGMuqUglAdIoLPzryIAazTNtT1uNg8SLwNyNceScmX5A/93gXiJvI1iT0aec106Sck4Ic0rLG6Zwh22ZwHAauqtb1iQxTx2zoK2ixB X-MS-Office365-Filtering-Correlation-Id: 528adc48-4905-4e74-0dfd-08d5c18272fd X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2018 14:27:15.6420 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 528adc48-4905-4e74-0dfd-08d5c18272fd X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB4191 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move generic parts of mirror_gre_topo_lib.sh into a new file mirror_topo_lib.sh. Reuse the functions in GRE topo, adding the tunnel devices as necessary. Signed-off-by: Petr Machata --- .../net/forwarding/mirror_gre_topo_lib.sh | 53 ++---------- .../selftests/net/forwarding/mirror_topo_lib.sh | 99 ++++++++++++++++++++++ 2 files changed, 108 insertions(+), 44 deletions(-) create mode 100644 tools/testing/selftests/net/forwarding/mirror_topo_lib.sh diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_topo_lib.sh b/tools/testing/selftests/net/forwarding/mirror_gre_topo_lib.sh index b3ceda2..2534195 100644 --- a/tools/testing/selftests/net/forwarding/mirror_gre_topo_lib.sh +++ b/tools/testing/selftests/net/forwarding/mirror_gre_topo_lib.sh @@ -33,29 +33,11 @@ # | | # +-------------------------------------------------------------------------+ -mirror_gre_topo_h1_create() -{ - simple_if_init $h1 192.0.2.1/28 -} - -mirror_gre_topo_h1_destroy() -{ - simple_if_fini $h1 192.0.2.1/28 -} - -mirror_gre_topo_h2_create() -{ - simple_if_init $h2 192.0.2.2/28 -} - -mirror_gre_topo_h2_destroy() -{ - simple_if_fini $h2 192.0.2.2/28 -} +source mirror_topo_lib.sh mirror_gre_topo_h3_create() { - simple_if_init $h3 + mirror_topo_h3_create tunnel_create h3-gt4 gretap 192.0.2.130 192.0.2.129 ip link set h3-gt4 vrf v$h3 @@ -71,49 +53,32 @@ mirror_gre_topo_h3_destroy() tunnel_destroy h3-gt6 tunnel_destroy h3-gt4 - simple_if_fini $h3 + mirror_topo_h3_destroy } mirror_gre_topo_switch_create() { - ip link set dev $swp3 up - - ip link add name br1 type bridge vlan_filtering 1 - ip link set dev br1 up - - ip link set dev $swp1 master br1 - ip link set dev $swp1 up - - ip link set dev $swp2 master br1 - ip link set dev $swp2 up + mirror_topo_switch_create tunnel_create gt4 gretap 192.0.2.129 192.0.2.130 \ ttl 100 tos inherit tunnel_create gt6 ip6gretap 2001:db8:2::1 2001:db8:2::2 \ ttl 100 tos inherit allow-localremote - - tc qdisc add dev $swp1 clsact } mirror_gre_topo_switch_destroy() { - tc qdisc del dev $swp1 clsact - tunnel_destroy gt6 tunnel_destroy gt4 - ip link set dev $swp1 down - ip link set dev $swp2 down - ip link del dev br1 - - ip link set dev $swp3 down + mirror_topo_switch_destroy } mirror_gre_topo_create() { - mirror_gre_topo_h1_create - mirror_gre_topo_h2_create + mirror_topo_h1_create + mirror_topo_h2_create mirror_gre_topo_h3_create mirror_gre_topo_switch_create @@ -124,6 +89,6 @@ mirror_gre_topo_destroy() mirror_gre_topo_switch_destroy mirror_gre_topo_h3_destroy - mirror_gre_topo_h2_destroy - mirror_gre_topo_h1_destroy + mirror_topo_h2_destroy + mirror_topo_h1_destroy } diff --git a/tools/testing/selftests/net/forwarding/mirror_topo_lib.sh b/tools/testing/selftests/net/forwarding/mirror_topo_lib.sh new file mode 100644 index 0000000..5b787972 --- /dev/null +++ b/tools/testing/selftests/net/forwarding/mirror_topo_lib.sh @@ -0,0 +1,99 @@ +# SPDX-License-Identifier: GPL-2.0 + +# This is the standard topology for testing mirroring. The tests that use it +# tweak it in one way or another--typically add more devices to the topology. +# +# +---------------------+ +---------------------+ +# | H1 | | H2 | +# | + $h1 | | $h2 + | +# | | 192.0.2.1/28 | | 192.0.2.2/28 | | +# +-----|---------------+ +---------------|-----+ +# | | +# +-----|-------------------------------------------------------------|-----+ +# | SW o--> mirror | | +# | +---|-------------------------------------------------------------|---+ | +# | | + $swp1 BR $swp2 + | | +# | +---------------------------------------------------------------------+ | +# | | +# | + $swp3 | +# +-----|-------------------------------------------------------------------+ +# | +# +-----|-------------------------------------------------------------------+ +# | H3 + $h3 | +# | | +# +-------------------------------------------------------------------------+ + +mirror_topo_h1_create() +{ + simple_if_init $h1 192.0.2.1/28 +} + +mirror_topo_h1_destroy() +{ + simple_if_fini $h1 192.0.2.1/28 +} + +mirror_topo_h2_create() +{ + simple_if_init $h2 192.0.2.2/28 +} + +mirror_topo_h2_destroy() +{ + simple_if_fini $h2 192.0.2.2/28 +} + +mirror_topo_h3_create() +{ + simple_if_init $h3 +} + +mirror_topo_h3_destroy() +{ + simple_if_fini $h3 +} + +mirror_topo_switch_create() +{ + ip link set dev $swp3 up + + ip link add name br1 type bridge vlan_filtering 1 + ip link set dev br1 up + + ip link set dev $swp1 master br1 + ip link set dev $swp1 up + + ip link set dev $swp2 master br1 + ip link set dev $swp2 up + + tc qdisc add dev $swp1 clsact +} + +mirror_topo_switch_destroy() +{ + tc qdisc del dev $swp1 clsact + + ip link set dev $swp1 down + ip link set dev $swp2 down + ip link del dev br1 + + ip link set dev $swp3 down +} + +mirror_topo_create() +{ + mirror_topo_h1_create + mirror_topo_h2_create + mirror_topo_h3_create + + mirror_topo_switch_create +} + +mirror_topo_destroy() +{ + mirror_topo_switch_destroy + + mirror_topo_h3_destroy + mirror_topo_h2_destroy + mirror_topo_h1_destroy +} From patchwork Thu May 24 14:27:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 919892 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="ddwN+6pH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40sBYH02Xwz9s08 for ; Fri, 25 May 2018 00:27:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033279AbeEXO12 (ORCPT ); Thu, 24 May 2018 10:27:28 -0400 Received: from mail-ve1eur01on0063.outbound.protection.outlook.com ([104.47.1.63]:8603 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1033272AbeEXO1Y (ORCPT ); Thu, 24 May 2018 10:27:24 -0400 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=sMHiGgF8rNzNQq71f16v84a1oLQv5DKnku5OX88vQYI=; b=ddwN+6pHY8cwx9xjfmz6LKl0faWJHIF1PyC0ATfWpxISo5BGvAllU4dAmBwnO+QenkVdtDJzCdqyvvhNFDh/2yW8oPKSIUJaF//oEOY3CmMFRAkWwgL9wwM9RwFZhGXoqC1ognjxMhVN3Yaw1AfBSMlrZenQTiNFr99coFoMT+A= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from t540p (78.45.160.211) by DB7PR05MB4188.eurprd05.prod.outlook.com (2603:10a6:5:18::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Thu, 24 May 2018 14:27:20 +0000 From: Petr Machata To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: davem@davemloft.net, shuah@kernel.org, idosch@mellanox.com, jiri@mellanox.com Subject: [PATCH net-next 02/10] selftests: forwarding: mirror_gre_lib: Extract generic functions In-Reply-To: References: Message-Id: <2f771a18324d9d904fc3e50600dcf8793fb6bd68.1527171860.git.petrm@mellanox.com> Date: Thu, 24 May 2018 16:27:16 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 X-Originating-IP: [78.45.160.211] X-ClientProxiedBy: LO2P265CA0037.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:61::25) To DB7PR05MB4188.eurprd05.prod.outlook.com (2603:10a6:5:18::29) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB4188; X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4188; 3:YquklcpHMhr0mwM02/rH4zgn7bBo0Z09Uj0yCgNMrZB+4n42MHzJeMQ2Ds53yIREmxLlZVvhg0LShpE60sBb4QDZG7/TuRUtpNNZcz/Xpp1yYemDxzQoFAiuQHdU09Thb82dk2Kyd1cotzss+VlkK5swTiBpXvFvVjqWRRILRusgMdzW4m2wqHSyOqCfcoe1CIoUrwi4U2+CHGJ5+UxaLEMTog7yND7AJ/JWmsGmK9aMvb61spaIpvuwsu+SUVxf; 25:TybLIRDJKxqqCPkBeDrHzbgioZq08eta6gK2uJnzfBphr/jL7dkSTXhz2E7tY59F9uuhRvhW1LwfhnxOuF9pWoq/iOIi3fi9etNmNeD4buYkDTW/r8KejadJ63/f3T/fgSM8Hn3EEugYCTBjfpdzuOu9iTI10ed/mRTtgbVa1d8hpbbDOi8jrgBymnIxquycrX5h6L/Z4fHcxYi1Zjg7t8CW7q6ObvMmRBo0Ruo9W4LKu+G/CL+7uI2OOKjgCTgEqOv6c/P5iomDZjuE0itc9btyH/j/MskzICKZPyVT3ZkkPqX3zGh/4kkdX4vyG8T2T3LUN89lEwDmloipmNFLtw==; 31:/+Dj0yMCE+hCQdoz78njVgqFqxwG80NmLyRfiwbeR7nzAdzBGI5Mk+0qqlE2KUktwhW55ar1cGt0TL9Srod3aqC4MJJkWNp1LidZXYYCzkjchat7CvKvnEpVNTleWB9LFzK9MWe/E30zB/oHVVb9ZcdzW5iMwqHSVdtwLuek52qxXvNOJAW0XsU/tjdiyOZIKZKojSoPZM8gdKC+v4Wh4Wc61COU3nH4f+OvPHH9W1Y= X-MS-TrafficTypeDiagnostic: DB7PR05MB4188: X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4188; 20:zSVi3JQC6knN+lS22XWyGS8/neXsoQOAHW8EnX8xWjDGoXx+EUef05blDdysY1Dkx6wmNIG+XzEukIj1ZZ3VokwohywrhkKK2GGW7vD90CmZGHlB5Yt+4gLHaAlBwxvx8rhxj1JOJMojRJ02e8I7aylzVke0zvB/Fv2iwTTgmTVYwdTtEBBFPrHfPdDXbKkw+a1Zqskg0C2uHiz5ouVrLLVOvvdzZRbcGmXbW9Nsx5FoYzjOU9gxCjj3XCXfZPDkj8T3DLEgc0rjbE9TrgSDKHAzSB6wdHfoqlijilLv68F9wgoUym3vvrL/dhAr6vfHLQaaoAMLiRIw6crPVAWCTRznVjex8XyK+8uMbaAeue1OXLv2EkPdGeApi3jaQkZKDBkFLg6XvwSYwZ1oKkHTIqGd6iSrmay6zxOg3sHLTMm0FJIl+zu/r16myjWDMMI984gpHULTO/zcINPLlQbKscZ8oh70Cj2Tj3ptHiQVuPd21UHh5zw1U9cywtefDKb4; 4:oQaWUHkt2czH79nmidGHrz+o6Sdadn1zK2j9Gf5ZP39qUUR7fgKM1NFfdan4kOdR6wdJoXMzhmllva+1OpFQ/ryObQ3O67HMu9EJVYf2nPggCQ8VfJRV+QjJk9NQVwRsWS8Io1E7jVjSg8b8yGNeni2YQiVyiYKtjaTZSZgokh6eBUexTjkmwCPx2chJLADqpGswteYaGnT4Ov3fVqvAZBB4Yeo/QnuxHUDOc/zDp5i+ITKdXYJp/TP9mwvonRFkSLebQXGJtUukbx8alb174Q== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB7PR05MB4188; BCL:0; PCL:0; RULEID:; SRVR:DB7PR05MB4188; X-Forefront-PRVS: 0682FC00E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(366004)(396003)(346002)(376002)(199004)(189003)(6666003)(386003)(97736004)(86362001)(4326008)(6496006)(47776003)(6486002)(2906002)(36756003)(26005)(76176011)(5660300001)(51416003)(52116002)(478600001)(107886003)(3846002)(6116002)(16526019)(25786009)(2616005)(956004)(476003)(58126008)(486006)(316002)(53936002)(16586007)(8936002)(68736007)(446003)(66066001)(11346002)(8676002)(48376002)(118296001)(81166006)(50466002)(81156014)(105586002)(106356001)(7736002)(305945005)(41533002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB4188; H:t540p; 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-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4188; 23:85W4Vr8+wN0FTlwdFFuBUbSfTGYGQU5FSO5ecMnhTxo0672hCVqGedSar4ZocwmCx9SvV5C+JlOj5c1TzuBvFqxWMvhJ7Wp63ss2PugNNvIsQ2NzyKqBy2tZHKYAxIy5i/NrXyTw8PqQG2W3KV0irA3S0iwAV8QxsJIdETSPyNoR1Ls7OscVYP5d2s92bvoA6MrTCxrYpDoHCu8+lj19sgTiQOhI7YwF0qOITDuMmnI72ZGhYZdVIiLZYk+burL9Utmrfu1Jl5onkJeop9NpoWA3iR8vhAmhk3KXUyQYhQhadIU0FQubpJGRMK2SLmAo5ZgJL4KLYmk8CKnAjcbHhdtywIN2S/ygGmu5UnKiXACQ2Nw4ZMAm4S607FKvPS6yXvCRdunfl9yb9HI8w7ckXsUiwKRZfpE4rOuXVg0bvEy4IiB7TD0gFr6/DM0B8SE0nG9Cd+1KEq7q8KLxoEOFnW3lKC0XgINGqxPKdaw3U7f9Qv1Z7wKc8c4fGQb7XU7WHAIa1Ycc1Rl7TwQ1xv5OsYbFCVyPVbHEYwZhgmUwz265rmBo0BCT8DzqVpHijSCwLsFcPzA4IJiYWgHyUJx9POoBbWlpcd6qqXbGu9q+gjoteWSph5Ly0czKmmx17k9UJTZpB10ZSnIsXMkCIqbt/lIo7OA4gj3XjD2ebn9OizmcgqrNJT35Ui3MVd1W7w3oN6v/bduIL04xt8ojNETPtbZzL6guhklfORGT9KIehfxb/0UaCywvmagNi5j3fdsh8lwtFhXeE23McF4xkg9iEd0k5JXnimhrzg/NPXooKc3AStg2RkEKlG0Rc1voir+UqonvCqeVLvcmSv8UTbY9amLlTX5ZP4arwbL0pJOZwSkCDR9fS77WZZPbQOFWNxPcyFkVF3vFwn3wxGhgbQ8cIIXvpLH1RruyrzhN03tj/1sTjx5jKD+bG77DTE9yaKJmGzcioTSlX+8WXYwR+OJfxRxiDebQi95VCD0JWpBFSUvMyAuQTYRm5r8fVMF4quRTI0KjKRznEePdZxF8GXwDBHWqQSV8eyhCaX+uR4g1BZlyRmOJ9zXt0GVuZ2v7MZFdLrafsV709haA07/4+7EFLTOGDrJ6TGpLtEZ8VB7Az1qxpyrq7z9Qp0HmMjbENuXbpI/VsFvAs310upzX5Si7vZUbo+tRVPgm3DjzBTX/2gQ= X-Microsoft-Antispam-Message-Info: kTsINDQHloiWEEOTlddB13gMkQ8g1vSPv3gp3zk7U+CZsqmn1P9TMgLXA8S6z5QiRiLXxeW26huhJrfDMxTqV4DxBR38aYuTUAqa9M0ia7Ni5RLL8MMSAybTPjwb25CzdLYhT3RnOdoL4rRuZDkLTvKj/DV5qAzo/323VnNgCO9r8tTYIQz9QoP9Q7mirh9N X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4188; 6:BxwxHW+KwxB66eQdCL0P5zLi4mi+ZnzpoEYofsRFsczNvaynkATTe55cbCaZFixOIY4S7JkNFLfzj+uhHi8hVqk9ThKcRVhYYuY2HYRw1OpoH6iHRkXrgB0XK6zEEcdseAv0y1SAKBnVRS2i/Yo/ejadMZaAl7ZlQva2VtpHmRkstZQKwinAZgzYqV2Rpnu/D/niXjV5j1lr9Sw3Yz28Vhnz1Lvl/DymCeaYulam8XjGBiTKPX6XK63jSZSECtDg//69D5UpVzZq7IQXU2HPv/d8YQsgRkF9VLLPsvToOtQB5QGRvdr4RuBqlZXE/BmvnrLlOVh1n2aHB2/7tUBIuiyDnVovDNmsvMeqo9SUCMc9otBlGU8faUpGYmt5xe5A6gT1N3nMda+o+l9m+LCZeMbhkiu7aTbxko6/EHC/fAYLQFbPXcHTDpxXOyjSqTf7cgD7AvmvFXWzNBTAvWdoyg==; 5:oCjSlXbDQir353r4b7lv7+l4so8vxYDeKghXzsP1m2uoSmUY8ukGnF4Eh9lv4fxKkrELUiFBzPRI1KNHEmaGLBXOEYbspeX+BykKCKiNFyJUU/7QMawCto0K7dSZnlnV7NzIn+cc4AlF1YhwteXqF6RbNz6oAQ5aMoMnl5eedsQ=; 24:1ls94qCe7sxuhI5wc1tD/W7HTI7MkEakyxxJy+sEHYQ8oaJ/6DAHZexy38NY5etp9zSZD7Iw1eD9fGi4R04BOd/a70tF4FcY0EFbF9MeVQQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4188; 7:HqLkJeSPq62SyNdFmAPcCTDRg5fxBHYnm8LKnJmfWXdw5aRJkl36Lg9RPjXr5TaxQCxTlwGnfYcx48DbVcV+VEtGzaDLQojTTzCVLO3S2FhULCZw2thXRK9P514BE/0uBFVoxZj5r8M0jwsK6UDO1QYtuV7mQk20m37PcMfPu0GUv8VGxOVXvGTaxr1nFAEu33YHidZoBlcIPfv2Pu/PGz2Pny0sukEhZ7OhiVVcuGEdHoMzbjoXmrk3YCRqGcfh X-MS-Office365-Filtering-Correlation-Id: 3e00f34c-c422-49a7-aa8d-08d5c18275cb X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2018 14:27:20.5234 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3e00f34c-c422-49a7-aa8d-08d5c18275cb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB4188 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org For non-GRE mirroring tests, a functions along the lines of do_test_span_gre_dir_ips() and test_span_gre_dir_ips() are necessary, but such that they don't assume tunnels are involved. Extract the code from mirror_gre_lib.sh to mirror_lib.sh and convert to just use a given device without assuming it's named "h3-$tundev". Convert the two above-mentioned functions to wrappers that pass along the correct device name. Add test_span_dir() and fail_test_span_dir() to round up the API for use by following patches. Signed-off-by: Petr Machata --- .../selftests/net/forwarding/mirror_gre_lib.sh | 41 ++++------------ .../testing/selftests/net/forwarding/mirror_lib.sh | 54 ++++++++++++++++++++++ 2 files changed, 64 insertions(+), 31 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_lib.sh b/tools/testing/selftests/net/forwarding/mirror_gre_lib.sh index 207ffd1..c7b2cdc 100644 --- a/tools/testing/selftests/net/forwarding/mirror_gre_lib.sh +++ b/tools/testing/selftests/net/forwarding/mirror_gre_lib.sh @@ -1,47 +1,26 @@ # SPDX-License-Identifier: GPL-2.0 -do_test_span_gre_dir_ips() -{ - local expect=$1; shift - local tundev=$1; shift - local direction=$1; shift - local ip1=$1; shift - local ip2=$1; shift - - icmp_capture_install h3-$tundev - mirror_test v$h1 $ip1 $ip2 h3-$tundev 100 $expect - mirror_test v$h2 $ip2 $ip1 h3-$tundev 100 $expect - icmp_capture_uninstall h3-$tundev -} +source mirror_lib.sh quick_test_span_gre_dir_ips() { - do_test_span_gre_dir_ips 10 "$@" + local tundev=$1; shift + + do_test_span_dir_ips 10 h3-$tundev "$@" } fail_test_span_gre_dir_ips() { - do_test_span_gre_dir_ips 0 "$@" + local tundev=$1; shift + + do_test_span_dir_ips 0 h3-$tundev "$@" } test_span_gre_dir_ips() { local tundev=$1; shift - local direction=$1; shift - local forward_type=$1; shift - local backward_type=$1; shift - local ip1=$1; shift - local ip2=$1; shift - - quick_test_span_gre_dir_ips "$tundev" "$direction" "$ip1" "$ip2" - - icmp_capture_install h3-$tundev "type $forward_type" - mirror_test v$h1 $ip1 $ip2 h3-$tundev 100 10 - icmp_capture_uninstall h3-$tundev - icmp_capture_install h3-$tundev "type $backward_type" - mirror_test v$h2 $ip2 $ip1 h3-$tundev 100 10 - icmp_capture_uninstall h3-$tundev + test_span_dir_ips h3-$tundev "$@" } full_test_span_gre_dir_ips() @@ -57,8 +36,8 @@ full_test_span_gre_dir_ips() RET=0 mirror_install $swp1 $direction $tundev "matchall $tcflags" - test_span_gre_dir_ips "$tundev" "$direction" "$forward_type" \ - "$backward_type" "$ip1" "$ip2" + test_span_dir_ips "h3-$tundev" "$direction" "$forward_type" \ + "$backward_type" "$ip1" "$ip2" mirror_uninstall $swp1 $direction log_test "$direction $what ($tcflags)" diff --git a/tools/testing/selftests/net/forwarding/mirror_lib.sh b/tools/testing/selftests/net/forwarding/mirror_lib.sh index e5028a5..04cbc38 100644 --- a/tools/testing/selftests/net/forwarding/mirror_lib.sh +++ b/tools/testing/selftests/net/forwarding/mirror_lib.sh @@ -38,3 +38,57 @@ mirror_test() ((expect <= delta && delta <= expect + 2)) check_err $? "Expected to capture $expect packets, got $delta." } + +do_test_span_dir_ips() +{ + local expect=$1; shift + local dev=$1; shift + local direction=$1; shift + local ip1=$1; shift + local ip2=$1; shift + + icmp_capture_install $dev + mirror_test v$h1 $ip1 $ip2 $dev 100 $expect + mirror_test v$h2 $ip2 $ip1 $dev 100 $expect + icmp_capture_uninstall $dev +} + +quick_test_span_dir_ips() +{ + do_test_span_dir_ips 10 "$@" +} + +fail_test_span_dir_ips() +{ + do_test_span_dir_ips 0 "$@" +} + +test_span_dir_ips() +{ + local dev=$1; shift + local direction=$1; shift + local forward_type=$1; shift + local backward_type=$1; shift + local ip1=$1; shift + local ip2=$1; shift + + quick_test_span_dir_ips "$dev" "$direction" "$ip1" "$ip2" + + icmp_capture_install $dev "type $forward_type" + mirror_test v$h1 $ip1 $ip2 $dev 100 10 + icmp_capture_uninstall $dev + + icmp_capture_install $dev "type $backward_type" + mirror_test v$h2 $ip2 $ip1 $dev 100 10 + icmp_capture_uninstall $dev +} + +fail_test_span_dir() +{ + fail_test_span_dir_ips "$@" 192.0.2.1 192.0.2.2 +} + +test_span_dir() +{ + test_span_dir_ips "$@" 192.0.2.1 192.0.2.2 +} From patchwork Thu May 24 14:27:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 919893 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="JTBQLuDL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40sBYL5RBnz9s08 for ; Fri, 25 May 2018 00:27:34 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033284AbeEXO1c (ORCPT ); Thu, 24 May 2018 10:27:32 -0400 Received: from mail-eopbgr50048.outbound.protection.outlook.com ([40.107.5.48]:23929 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1033277AbeEXO12 (ORCPT ); Thu, 24 May 2018 10:27:28 -0400 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=emkh9/wXAXo0HYupmymXkIJg/NAb0J0jNw1vu16ie6U=; b=JTBQLuDL4/OC3fTEl1JuVv3YTJaqcm5E0yJqH0O1UgsLDj3CjzU09UGDUTsb7YPHQIEEr8+ZLLQDp7Xir29TQrR+AZ5VuO3b6T8uhsNLFVMijNmNaeauRaBDNAOYNsytH7ZEE21CrFgsAyXe1WTYYCzkJHSv0oi6YhHRZLqjFQc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from t540p (78.45.160.211) by AM6PR05MB4184.eurprd05.prod.outlook.com (2603:10a6:209:40::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Thu, 24 May 2018 14:27:25 +0000 From: Petr Machata To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: davem@davemloft.net, shuah@kernel.org, idosch@mellanox.com, jiri@mellanox.com Subject: [PATCH net-next 03/10] selftests: forwarding: Add $h3's clsact to mirror_topo_lib.sh In-Reply-To: References: Message-Id: <4119543d66caca1a06e70d55bb41c7748c36d28a.1527171860.git.petrm@mellanox.com> Date: Thu, 24 May 2018 16:27:21 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 X-Originating-IP: [78.45.160.211] X-ClientProxiedBy: LO2P265CA0227.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:b::23) To AM6PR05MB4184.eurprd05.prod.outlook.com (2603:10a6:209:40::29) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB4184; X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4184; 3:ov/FhjzynlaazsbOBZPHHjVPtKoUVSPZDkUoFPI/Npu87Dqw0ExadnblMko90Z4426qCdyE2aA86XXu6Ifcw5bEs6SngiqrC6/XIBez9P1MR+UO0u88BT/1bL8JYiO4dDinUFWsZoOIi4PuwrMoGbylYocXbFecrePPRv7XaaQomUZ5e5Q/5mfSEeIl2jmtMhlMiMv21jZuRBJ8EQ85uSApU1dbfnwrXbpLafWveXSFkAYvqJ9kWCdFj5dvUGj2b; 25:HP3H9jKRthg8gg0WzLAnu7w4Qhk6zzJjuYjiGKjy3Q1BcstQJeSQ926wyb17P0HdPszf95VIIvMZiCJsHnY8YTjMgvraLIojauxsTrGFp7L4+lvgsYIbqaKb6XdE1DOf7l30heL77czMnRG2pwRkPPD3jb80G1FFDB33u4wixr48glxSFHdrQ9Tm30z8uWIA4M81wIxMFQCO1VO6bVZCoWRHVrfmSQcfXD7pw6pPH3EBo84VtQ7neJS4E8j6CGhworKrbser7n4sSVM/FIJ8My+C6C9EEf9Cuml9oSStBvgvdFczRDNz56KviHYRMVtEzjUrskuEQyclyQYhmwJXDg==; 31:7M3cBMurdTlJpsuJ5EtppR/MDh2QZI+iZX3q7+Hxpgf4Kgz3rTiuRmmaISjPi6JaI2ebnXOd8tvxbYYjKQdWt/FzKF7P3wXgJlxIK9y6o0awl3Qo5DTcQ9H2SeyjgXuvSd6IxzRGGRe3rYRrX6BrYXkmkf8RlasAJdUbz2p8OR4wnR0jc3T+BdwIh04KkIT5rqTqnU7rqdt2U768G06sQLLt/wjcOpV6f0OEFwZl0y8= X-MS-TrafficTypeDiagnostic: AM6PR05MB4184: X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4184; 20:DJ5ns5kjQmV40Rp5/w9jAkJRraRGWxKTdbh+z8c332mCAn8b4zWu/9/HpnTwTAKlsH2n6ncS7RGPI2i3n9mafgNS8p3PBahysDx2NsT2tk3X+gvgOF9PcEZHn6h1sh0fgGv0TjsuFvQ26WB6phOFpwrc9mcDrhixXBh60qRniHg2ChIOe2fsS1VP/q0bIfeBV4zd4tRDZhKuSw5PkmzpzSS7DDpIxDEoWhMFtYtKTCbIF7BY0B24A+XCFc/B+nJNt6dGxcZzJfNv4s1hBq9MefHWQJ+MapN8CSjRH/hRv/TML+57BXBsK2IhwxdrFNIO8tPk67QkvBwY8zZ0dRZvP93SIo9VAhRjLAB8Yf6SDEUzcX+O7CsD+/IS12se6QF0Ph548mQ4ngNEFsUfFmTPMCK554Kru2rP1OQSmLzDjx6KAWCKfdxLTT/DDem63NXEd1/PdEPY54CUJqjfmE3QVqHe7qL+qzVGMazJ19FhkTUqdyzX3eOAWwDs8Cg1u0bV; 4:nKH8/RRQatzWP094EX8Rjs5iEJUNH32GiXutzDR1C43kUtTM1Qu1eo0yuq10wUw3TBeLiw9rZxw5PcDpjmJJ/cpkK3bJSGJxxsQwbfGeCuqVEzb5N9OfPxlwFwpqK36fUOUlipBn7uWQrNe6qYqWErtDWy85/o6km8OBh46QaDbYj0WwQWXPlGIYmR7yWKypXg1/6fk/nXAQ5QZYi9NbrLujo4DGhpKfYxQ1s2pP7K/ZReGpRYHeN5T8xpEPsyfPnNWI4efPF1oo3XCYhjqdQQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231254)(944501410)(52105095)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:AM6PR05MB4184; BCL:0; PCL:0; RULEID:; SRVR:AM6PR05MB4184; X-Forefront-PRVS: 0682FC00E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(396003)(366004)(39380400002)(39860400002)(199004)(189003)(956004)(6116002)(53936002)(3846002)(4326008)(2616005)(36756003)(446003)(97736004)(11346002)(5660300001)(66066001)(16526019)(47776003)(6666003)(107886003)(6486002)(86362001)(16586007)(26005)(478600001)(2906002)(76176011)(51416003)(58126008)(68736007)(118296001)(50466002)(25786009)(476003)(52116002)(6496006)(48376002)(7736002)(305945005)(106356001)(386003)(316002)(486006)(81166006)(81156014)(8676002)(105586002)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB4184; H:t540p; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:3; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4184; 23:S0OI73nAZE716yF3EpfY569rJEuHcNcxirAYz0FkOTP+4gtXCk+We88PvdbmcDBn0QpKvdQE53BvEioFzUvuz02EDilqKqQILiCY8AONvcrjRpKagq5g/ZjWa48x19K3jwbn1ODGyHjohOpjMLlZ6WPH8pvZ4vXrRBz4wNc/POqJnKdjb0cJEmWVkZOTsWPHADrzBdCATglmOnzS9VNtCaSiH03ZmVvuQAGiNSVqIHnVfOW2llqL6tDhV3cbrZSgiO2ZFQwA6yR9z153uBFl7NtCRWLSTF1K4VU1EKRZaL/TlXPYtZ6iIJeFr94uRL9BcMRaiUs3oNrXTKcdcEWPbsv1Aca99+vIJ017UxtBo/sefiuIS0bRPAJclrgII8mewJkPpskUpCEOtkN48rXfUqS5cN0oNF8Sv6sJAhsKIA91KHnoabwqpLpl4uw6OBvSdczuy5I+E+nOb6zx627WPkJeoUrmtOuKWRRxc/hev16fVLxL1ICtSvj+TRtsbSAqR/j+0YJNLjjk2XCtDl/cdGixT/lhkat1Qa1GeJKZe8KNGUGoe4DZbz0ps5bDCkwTuMGvLrThgATI3hy89J2n0/YXhQ8GB+PcRTrFpDsWpnMptbkQBcCm38+P4PxzyeMed7smBXU2WEMaDKz2tORezPkCmEsrebMPb4c6EK2V8g+OwnZNcmFCBEuD9+j1t7ChIu8csntPMFs9gCUGvTzqjV7bUIISLNkEOvfZhuVRQXr+PMBO6YWInGvLLE+7ZLbmVAWzHZ2UzDCWVXRQ3m/kpbvKeKL0WQdOR2uPqFqlVAyvi+HXjLCqGF4/1q8Bs92+ztwCYUUm1XJDWQCBzO8PSdchQdgZpgOEi7goyrEdacsqm8DJphfdi9DRRQONdSgz72Zcd2Jjd1UOJ8b3D+LlJY7T7ZGG+8MPM1yiKdDLZL5Z0i32P1aL9IvFnR0nGkLOb0TCmhq98IQlNIzJ6iX7coDCf4qYqWkC1s7ixJC0xCCyu6pvZQdks7DNW6gHsxzZGewGV0+VFmYjZWzU3qYY+sR8NdEXBvkhNt02MbMqJIp9pYmFoiI4CAcwIdsp/9KkRX8EAJ5SoffeGa6RK17RBblIlPHsa+MJT/h6oAAE73cKMrELHEeuJQRHkRwtCG+yPdWCWm+rKywnjNImc70LIQ== X-Microsoft-Antispam-Message-Info: tjXHeWZt7uyRNvu/Y5mIG2l4c0/RwMspm/D7lHfX5+3geajHmAkmxnqH7jypy2o5O7XtJJ5riejYaKHXJ0hvU5VMSJR4sVhBAjAJluQbn4ZAYs0MDuAKaxIIkYbhit61WlNDTo4dD58lh4zCZ6qRXQTMSDn76x4fPYh5/q5FN5cOouKniRnpDyqssJeFsKj5 X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4184; 6:izoPiPAsSECJUFrvdQtdIHlvRHZp1wrIUlBzafttKDKEeekld14BCa9W+J5opJdXX71M0PalQquLTOslG4TBzcCQ5IjJs03i2+w8vjxDTmCU9JDz3Snv2FnA9xWzZAZfZHs2UxjimEETquKCzyHDXsWDCmTV/tNuV26iETjcxHbcsfZFuUOguQGQh044fpYIdL5uiuSfeQMyIoW8kbXgrYvK6jgh5KPNB+2/2jh5EOGGWBCgIEo4HzgIZCKRR32Tn3sLD2+E3XIYDJOxNPc8hjvWi6zZLRm9TYBtD7VVP8pqwaH7iGHb9G2LHi35BgE1M5qcoU+9rHsRjYK/EAZyKrmzYlkEVpU2XoCiSv4WDBVO+Zq5XfDTIorm5mQOj3OJb9ZYvQzbyJ44RxW8Qi5SKO9h+SO8vOWKRxKi3KjPxVu8Hj3e34kztd/oeTgBH5pl0OsXLJsv2JG45PIqAr0MTQ==; 5:XXlrQBMAhHZO7sP8GUXAIqbnh3dUfxrwSRKMsce/zxXVI+kkfDpR3WTI2sBxGta0G+38TzGMfA9hw5BU3FKuiyq2F2NZmiPDQohHW7NY2YZPTbPy8BcF3KCtHj7AXcli08rxovGofiKOjWcCb5ODz4vOCuWKiuHDW2jU9Sy1pw4=; 24:8gGpEj2AD7YfdOrVA2QLgJCLFesEuNAyf5SlxAuYHVl2RntBVDd9pPYWxJ9XLi2cuEcdZelx5r0cFdjKyxasyxAjoem4WXQzNjWUyqodVug= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4184; 7:wrhLwXRBqX7GJlQe38xdI6zoWL3bUkpaDK/s45K9WLTJNTALnLjhXGrZ3x9k+Eoari16n+yBRWf6afiYNjtVoXXibtrzh/3CMt2Tu4Ch0ZQz2NMW2Wc7qd3z6iCG8YHWDGvJxIxxD/EJPqKKpdMChPJeKjj0NLCVcN4k/Riy/np3UAqEC7fckvCtlTtP+GKmZRxC2Gqw6uB/JgVTe4NDXSn2IuixZ4lq5FdZsyGKzx7netaGNOf5oWm+6aw2KQiS X-MS-Office365-Filtering-Correlation-Id: 7376e979-0c5d-4166-9116-08d5c182789a X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2018 14:27:25.2348 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7376e979-0c5d-4166-9116-08d5c182789a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4184 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Having a clsact qdisc on $h3 is useful in several tests, and will be useful in more tests to come. Move the registration from all the tests that need it into the topology file itself. Signed-off-by: Petr Machata --- tools/testing/selftests/net/forwarding/mirror_gre.sh | 2 -- tools/testing/selftests/net/forwarding/mirror_gre_changes.sh | 2 -- tools/testing/selftests/net/forwarding/mirror_topo_lib.sh | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/mirror_gre.sh b/tools/testing/selftests/net/forwarding/mirror_gre.sh index c6786d1..e6fd7a1 100755 --- a/tools/testing/selftests/net/forwarding/mirror_gre.sh +++ b/tools/testing/selftests/net/forwarding/mirror_gre.sh @@ -72,7 +72,6 @@ test_span_gre_mac() RET=0 mirror_install $swp1 $direction $tundev "matchall $tcflags" - tc qdisc add dev $h3 clsact tc filter add dev $h3 ingress pref 77 prot $prot \ flower ip_proto 0x2f src_mac $swp3mac dst_mac $h3mac \ action pass @@ -80,7 +79,6 @@ test_span_gre_mac() mirror_test v$h1 192.0.2.1 192.0.2.2 $h3 77 10 tc filter del dev $h3 ingress pref 77 - tc qdisc del dev $h3 clsact mirror_uninstall $swp1 $direction log_test "$direction $what: envelope MAC ($tcflags)" diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_changes.sh b/tools/testing/selftests/net/forwarding/mirror_gre_changes.sh index e22a9e4..aa29d46 100755 --- a/tools/testing/selftests/net/forwarding/mirror_gre_changes.sh +++ b/tools/testing/selftests/net/forwarding/mirror_gre_changes.sh @@ -73,7 +73,6 @@ test_span_gre_ttl() RET=0 mirror_install $swp1 ingress $tundev "matchall $tcflags" - tc qdisc add dev $h3 clsact tc filter add dev $h3 ingress pref 77 prot $prot \ flower ip_ttl 50 action pass @@ -84,7 +83,6 @@ test_span_gre_ttl() ip link set dev $tundev type $type ttl 100 tc filter del dev $h3 ingress pref 77 - tc qdisc del dev $h3 clsact mirror_uninstall $swp1 ingress log_test "$what: TTL change ($tcflags)" diff --git a/tools/testing/selftests/net/forwarding/mirror_topo_lib.sh b/tools/testing/selftests/net/forwarding/mirror_topo_lib.sh index 5b787972..04979e5 100644 --- a/tools/testing/selftests/net/forwarding/mirror_topo_lib.sh +++ b/tools/testing/selftests/net/forwarding/mirror_topo_lib.sh @@ -46,10 +46,12 @@ mirror_topo_h2_destroy() mirror_topo_h3_create() { simple_if_init $h3 + tc qdisc add dev $h3 clsact } mirror_topo_h3_destroy() { + tc qdisc del dev $h3 clsact simple_if_fini $h3 } From patchwork Thu May 24 14:27:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 919894 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="yOpeF70+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40sBYR6Xmwz9s08 for ; Fri, 25 May 2018 00:27:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033289AbeEXO1h (ORCPT ); Thu, 24 May 2018 10:27:37 -0400 Received: from mail-ve1eur01on0057.outbound.protection.outlook.com ([104.47.1.57]:1868 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1033285AbeEXO1d (ORCPT ); Thu, 24 May 2018 10:27:33 -0400 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=cYd35k1Di6pQprigPgdq3BA3lxudFloIMd8G30RRG1o=; b=yOpeF70+xDzGy5cluXyEXsP/b33nOBCWj1c2XbV8ucXvOXbUxY6ss7tJP8uWqQ3aGcYjLMCqnsTN3eUt+tu1rK4QQqkqpfK/4n0Z9+Lb04BUNLcbPxOasK0p1BqURas+KbZIX1Mx3P5PHRSh3uSUrh4INPrCGBf231ilE8RqW38= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from t540p (78.45.160.211) by DB7PR05MB4188.eurprd05.prod.outlook.com (2603:10a6:5:18::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Thu, 24 May 2018 14:27:30 +0000 From: Petr Machata To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: davem@davemloft.net, shuah@kernel.org, idosch@mellanox.com, jiri@mellanox.com Subject: [PATCH net-next 04/10] selftests: forwarding: lib: Support VLAN devices In-Reply-To: References: Message-Id: <8f2315290ed342c054168a424962219b151a990c.1527171860.git.petrm@mellanox.com> Date: Thu, 24 May 2018 16:27:26 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 X-Originating-IP: [78.45.160.211] X-ClientProxiedBy: LO2P265CA0149.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9::17) To DB7PR05MB4188.eurprd05.prod.outlook.com (2603:10a6:5:18::29) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB4188; X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4188; 3:LeznbBORt+JwASNWgiJfeOEJUsu5FyglcgEBi59RW7fEidEPEAP8Iy+F18pcrDvmVrjOnepY0/WxDkE4kedSyBzlrpJCKCEfr/gnBr4Pj1uLXgjzjb8P6nTvekDt2KLKrsrLkgw5Ef+jsrH5sQIAvttKDQziSn9HbCwGTywyXXf58LHF6olmP2njYg1eUuu2Nd1DM2+vuHkkisJUONOvzDIFaPJDAHu6I7Fd5+dqDBPNOJgZjfM16R98Dc1ztBRy; 25:rmhZOutS3U9CxQkwAjFhWQBMpuCzSBTdtB8Cn2vPYrMFEsS2pOOM1wRfiV+7o3hb3372DgLzBaZfn/42BUFkpR+rwl2Mn7fBacCZwujdtkHGmB7HNb94jOTJ8gPlAwPZgJWFRHBGi13GZyoYL1xLTnPhvU+GVfxPG2m2AsyXnafHf8Fr9SGgo26sXHJYU7fpi7r1zSzy3ADhsQo4hW7EUKrfCs9BxaVObgf8ytGgqlqxEY2VS6gnMxj3wNU9dmz3fKoI+v8sK6VjE1FsoHWqy+lEKQ3mqSUM6iQp/qR5mGMgSHS/r7R8MsBc/bf4g12A5oVEbhQp0pPcw9DmmwdSNg==; 31:nxQcXo+JOmZB11jPHsSWcC4qylve6Yp6CfZyIM2JItTta5Q7hOOkAblZHdDYyQVAAwsQJZ1XrpOBJgJrTQQE9Y2lWEhqCYQ9B24+g6Ay2sHkE9aoVpbw6G1mTmJowVlZsj1uUWO2cLGzof1dnvNrmryFo1qhVdKTCuf//xzwE8oHe5vPSGILNHx0ApCaJd40rA1bRTdmCtuKbihfA+kx7Pde8f8U+S7WtaTjJiPuzwA= X-MS-TrafficTypeDiagnostic: DB7PR05MB4188: X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4188; 20:SvCcyVOz5R3T0HjjZYOdr9I45Fey+pGziNcgA2KgI4hMEe2jvvl9sNfxjOJmi3QhFK6CcuiPIgUXHJT/V5KPTAcuHGX7gQap1zWe5geIfRMqesP0/rWxx1auGemIABwCXuprn6N/7beWOgetdrZy/+LJ1hKQ1VFJZOpcC5WWFFNuxESOAZLoj9ptRTDQpgJQxTqDMirm5LPDfsTFOGzrkSDOodeqZM+J891mHrjoE/Z7NPshdW48a1Rgaz5UGmOR53RaCfvy7zvVdUY+oiFCn8ye2ALKCia4QBCgTGZT/ddU3EXVVtai7GFd7BRS3Tq9oiRIS+bqJctSHfjocKCrHO7tsBkIaNy8ll0bI1pDPxIWKfV17Wcp30mmFgYuyAuCt3dHjsAR0iKM9sa+b0UnU7hTmvPDfhUG3Af+FmTzh6W6XBpGF0mvVDZHyF5wxJbevNqAbeAxbBgTAsmUWJVEC91KSl0ZH0PVUygsiGsyG//ntHBX/EJFaZhKv2q3Fz7K; 4:WB2TFRR/QCowNijpR/sRSUUFdt1QAMQs7aFZMEdXaa2NUgutVJPf5UFHG00NRCdM1JHf3iJ9n1rsZ1z+762ujSMFc0iJzjBFkNfRW7GjKT0s8U7Iz1zwPbBHmnACwj5/TMLAcTJtqR6FAWQLiSs4/8xiLD2zhH2d/WfREocbWQIhxiAp4eRLAHo5doo/yezkvFgLuZBfEYP72DLcg9TEYwhlN+ckLavvS0fV0z8dH8ql9q2zg8hOrDOaeG42lbuoyizehhM8qftcFg9G6HoF/g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB7PR05MB4188; BCL:0; PCL:0; RULEID:; SRVR:DB7PR05MB4188; X-Forefront-PRVS: 0682FC00E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(366004)(396003)(346002)(376002)(199004)(189003)(6666003)(386003)(97736004)(86362001)(4326008)(6496006)(47776003)(6486002)(2906002)(36756003)(26005)(76176011)(5660300001)(51416003)(52116002)(478600001)(107886003)(3846002)(6116002)(16526019)(25786009)(2616005)(956004)(476003)(58126008)(486006)(316002)(53936002)(16586007)(8936002)(68736007)(446003)(66066001)(11346002)(8676002)(48376002)(118296001)(81166006)(50466002)(81156014)(105586002)(106356001)(7736002)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB4188; H:t540p; 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-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4188; 23:gu8+4N3mOapQglmlTw+Wvob/2utfgp/SlE9701uU11HI47/N5S3MI2u2covpsw01mcpBEZYLjkWyqLFQDmbpizskw3bwaKWWXO1ncMyKKaqEWaiiulA6Hiuf/H32JPLb5ue2JIPQlhcP9xLj0X4jDBSc5aBiQlqGcdAnzBNERH0gpyy6HZ+bUB3u7l+ujVMTVAjLt745LiWiVo56F6xseJNoxUcQv6hfEo6/xo64bhXZ6XRDm0KktI5ql+TnL3Q/EwGv3fGjBddAmevequieyswTJkE2xf1tRkVlzTvGFsje576weX4EomRR/OE8XLicUX/MDbvsDMxQaxR3B8+a8pEe/O1GrLsrxUKfUmhOJgBzWx/Q4+Pgr/vhdJ/gn1rWBxTAjuEAGS1v1+odOnz5jmpbDjI2qFkr3Hjt5XAUxmQrPHuEYySRrcmtQbUDU20s2LywMWmr37+3upMc8oRqJfWdqc1wUk/zlNNLfu0OMViIPl3IqOuScxZ3bPXFrpbalFDwYtsSYGqWor6lhfJ/qP9DJSMNDb4GT7/OvN2ISdTltmw5T0LSDfaKW1TrQNc8eFcoLx1f3fmd43/RXnwwi5OWFVL+Qjq6HleNtqsdsHl8r26jlR2sPjV3X2F3e/YnjTc8Q8dEb6HswJTTUNh9casZZBkdNRtTYGNVx2tmU1QVnZ1N0dTf9kalQfFXOwpJpjVz+PD5DNYL99NYpYgPkOuR1Ks9oBNb2E4UHW7p/AEY6s6VDXNtFVCBMlzyPZ5tFwa7IROj7eqI8eA7cyvOe51cHjGp5Phlu37VE/Bi11FEz9G+c01Kv75i5WM3XI7rhzOroWuoZ56sl19e7JXmKjvbOd5QesO35DTGH5eKfVM55K5cD4gBrjSS80KSewtM1dsRYttNKLLckW0fHdaq3c7H27mPZLETKK2VFHjUXMQJLyfxyE3JrKK5If7gojWtOAr0qX3vIZyB/dKVxfNiiuPGRUA9a+OGTDviab4WoRooq+XP1Oid83A2PKWwT8p73/D5PONJ/mfhuOMZuLNC8S7TYBA4VgLFpf5cqBlGD0N/eMidFfmmuCUuGbR+Vs4BQQSk79bOsmAsSgprYWpuTf8XgUCkpOLWTySxo8V3yU8KL0zDAs9C9f/e1fshkiJI80HFcV4RR0jEZ3lZ9Ho7CQ== X-Microsoft-Antispam-Message-Info: /0+h4OiMEwbdxzIJ3t1Ipi2DG5b56UcFNbIHfHYXcCWY49sO6CbzZkXQzOOYaVHs5V9G2OQegG24Am1FfDEBnDah7cjI50L/tGs2FDwEsdkSpNB/qhJaMgOpxv9duAbG69QlbmtQ+h/EtXLRZHFvo5BvM879Ob1DHiTxuSjWilVERhoQ5eMchaxEqNETGKka X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4188; 6:3Q54zr7aU/gtLUxYl3B617Z+fusP+9sPcAuzwlzie+fwBXqCp019C9rrWRocAnxnpJrAn3BnfrpNaAHp2asqfC6fLxBhKjJdovS9qpqmV5GhOVMctiWs/e+fOJ5ddNZVn1EVYylNVA6jAY2GpAIQU0/zclbaVyDlw3knRaUQyv9NnhAfOhu2T1XfrTmHsSkEShXg8M5YX4gLpfygBrPPcAaLFm+wJzua3uX78ncMIaAFWkZ5xOlZEeflAtmn2Af8PhjguYE+PAVIR6m3Ar67wZbnmi4FuZ3fgUbTRmvWOoE1wL7TG8qI2bf9Qs3fpYecxEKI4pqbCMWLg8a1RxbNvUyUAwBWpfSoIifhpiKDjsPJX8FaohUZFITXzZriV9urqM5SO0BPWh9rNBo2GFbyBm9h+Uue1S334+d7p7hqNTm3pmjCz/EthI0Y1BsMWxZVD+KVT9V4Zt6sEzLlhaLhDQ==; 5:glxaiV7wVW2B3l4pz+y0M8RYR3MzwaQMqDzhygALuS8C1zSo75zK1DUZkxYD1jwFWdZ1WnxOd4m6Zzo+EeBldfQg6eiWigbpchg0dgH9HSMWaLyXzrt9+lgJV+8kiO5//15CCVfwPyCN7+s6xu85eUCzAbd/s8Jl74QIT+rK/9I=; 24:dgoXw546O9wU7HShHj7a/nULaEcmqDumwr5C3Ue4PVbvkBuSwEKPONO1J6EDx7ASjuJFDHBWMzBWSM901qM5Tht5QqyY/Uy4SjcAEQE+uEY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4188; 7:YtMVTmAvO+leQtXRY0VD/bEvbiOshWSvcKOw8sJai/SnEslGg3tfiSUZNx0raWkj+65yrfLjmjeM+DMkv9QbCfC8dcE7zbwACp4IYK+pJ2iZlwyCOFaRNL9JjFF4Jf0PHmUM4yI8TpwdxjpgRdGSwRGipBBJiFSUzyfjGXG1Tl15CDBYe2udWLXyC2ROPk+7o1ATolyZSDOa286cy5t5LgKwXuKhkrLQ3ZFl5HfvyEkvWxcqn+PWMxW/yIcQg4gk X-MS-Office365-Filtering-Correlation-Id: 1ccc7ffa-e8f6-4d0b-1a8b-08d5c1827bcb X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2018 14:27:30.6016 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1ccc7ffa-e8f6-4d0b-1a8b-08d5c1827bcb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB4188 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add vlan_create() and vlan_destroy() to manage VLAN netdevices. Signed-off-by: Petr Machata --- tools/testing/selftests/net/forwarding/lib.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh index d5aa864..11c481c 100644 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh @@ -362,6 +362,31 @@ tunnel_destroy() ip link del dev $name } +vlan_create() +{ + local if_name=$1; shift + local vid=$1; shift + local vrf=$1; shift + local ips=("${@}") + local name=$if_name.$vid + + ip link add name $name link $if_name type vlan id $vid + if [ "$vrf" != "" ]; then + ip link set dev $name master $vrf + fi + ip link set dev $name up + __addr_add_del $name add "${ips[@]}" +} + +vlan_destroy() +{ + local if_name=$1; shift + local vid=$1; shift + local name=$if_name.$vid + + ip link del dev $name +} + master_name_get() { local if_name=$1 From patchwork Thu May 24 14:27:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 919895 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="J7CCC9Ze"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40sBYY6JxRz9s08 for ; Fri, 25 May 2018 00:27:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033295AbeEXO1o (ORCPT ); Thu, 24 May 2018 10:27:44 -0400 Received: from mail-db5eur01on0052.outbound.protection.outlook.com ([104.47.2.52]:8415 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1033285AbeEXO1j (ORCPT ); Thu, 24 May 2018 10:27:39 -0400 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=krGahAkK5a0WMvzRe8+Jhxw+IyjdHlNQtQYJA3TVTJY=; b=J7CCC9ZefwyqnruS/TusSpNloL9U7k9lsobp8PFENjvBqRzK5wyWWgbj66l+MNiw23Ho4NMZFtCOHih3yut0ukujBxkDKXsZ03WhE7c/qVBe/FNEqrRZu5Bbk8fKp2ScM1U62ExqAAPFwhhpZORRplGEfgfdsPhQ1cu+Rgf8xWE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from t540p (78.45.160.211) by AM6PR05MB4181.eurprd05.prod.outlook.com (2603:10a6:209:40::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Thu, 24 May 2018 14:27:34 +0000 From: Petr Machata To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: davem@davemloft.net, shuah@kernel.org, idosch@mellanox.com, jiri@mellanox.com Subject: [PATCH net-next 05/10] selftests: forwarding: mirror_gre_lib: Support VLAN In-Reply-To: References: Message-Id: <65a48688c3c8c87cea558830b9fd1931137c011a.1527171860.git.petrm@mellanox.com> Date: Thu, 24 May 2018 16:27:31 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 X-Originating-IP: [78.45.160.211] X-ClientProxiedBy: LO2P265CA0227.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:b::23) To AM6PR05MB4181.eurprd05.prod.outlook.com (2603:10a6:209:40::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB4181; X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4181; 3:I/TOWwdAA2Lby8Z+750IXGoGEP9PtXNJ589G52a1a0BtuDf8L1mSuPsJPupJfbvt7GzXfCeouWgBNg6VaYu7FrtwLSTn4ZQNPcb5ht4+f3Pj2JaWMqNmyGfqIKywGP6dfJ96deHSPCAi2TiBBAMDSJAhMTDj1lXpcb3HaAPDlNT+RUflVpSPf/zzAbBfCNZWZLxadGEEfaWi1bzeatxdEjTJ38R9++6k4Nd+kAE1PxgO0ZoTV6XuimEuTfirS+Iy; 25:PF2fpCLFWWWNYpbneMMusdyMx2jYyJDB6uz8rYcuY4dR7HH+oHs+JS/mQC3W3cFfJtzEoy/iUebvIbxJIMhL8HyH509XJ6ML2dKx6DppQsQ39qRErOhu5kBTfyX+HBTPBjoH5+uVouToku7zif3RImDi27dS8HmmkHVTIQyXpdP2n0XlI5NLAb4zTEjgBXZ/n9S8z1zDwy5QdAwB6carQWfaqQuDhbLTQzxv3KiCe37E9TWH2ys5weR+cbwOzeMqUaSH8l4Q7XMuIm947YrC7yg7YjKkEesSNVJZqn3D5r4rzK/l36CRBno/Y1jKAiqGxpaggXdziCKBNLOPPKiTaw==; 31:7stVmLP+MZqT440XHTI7Cp3FAKPyVdkxPJhooTPkXKh+LhAWv40r/dOO3Ub5tk64PcjLrOrGSYAQU/BX+bIe/hmBjxjeaNKYXF3Jpg41RXfERzlJQXw+t5WxSwuAKXC1zQUZyjPY8asW3nO7QKPSGOtOMveUMKUKiVb5ZpGW+MJNs2jjK0N0llmJSxP1CZkcVZMJqt5oKylrhB8MeHYUEbHRYIT0/N878LxDdQVWAZc= X-MS-TrafficTypeDiagnostic: AM6PR05MB4181: X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4181; 20:znUR13mQAmystp7vPncf0+7cA9K2GIR2LCexx+HrKxfRQ+HIeJy+2GH4Y/uUdO73B1q6YGZHnkmqS2UfIfROPGl99/bCO1VIRNgRGqu38NYJ1W0VHx5BfZhTqlBAYRiICQFEqPSUyDjq2aFH06396cyIcdU0J6zTrHT3NHc69lwgmyl/tvkAfnTQwfjCQWY/vDLWn0votr0/lzRB60XUGVoO3zqX3fuF9n1xEIoPQ62Fl8jNEuttFKXHO8kRhwIIM0zcOIKYoUxkl0oy6MunciYFeZmzvlvEGvz5BIkxn3THdo4e5/q8TeSBsKyLMNQCKIfuiLiMMBPsgVbVcaG/eu8GeRbNrtW1NbmAbPLyG3Iio8Gn6x1MKXOhFz63d+sxEgnSzcYXP5hRX/gQ06+c8rfTJGJQX/3v2kBRCT87biEI962u50uWxEqvjwXMrwZBwkjTVAQiiA+6GQiNmCd4u3Npk9U3956W220y9hn2PMilQMFRts3uJen8bKvbbry5; 4:nwUv+0p/QE8P6kzR4ixGD1ZYkoU5AXaZprFGCxdeREL5iXxpJhPB/MyIOycFm/Sycw3q7Y57y4EBA8gtWyresTLP1DtDQYHR5+vp/pEpQSFFCpIUwAgHr98YCNpqNwt9+36pAIDNn0bwuKRLyy8SfS0uJNmW///LYYaHt6CnSUvxp+gHPSOrNp9HTpDp8UVshxEPnxsMM57JeUwRRhmfIMPGgG5hfhNf2KoDneqRX6GWxdlAzlkRRbsXQSh5uNo05+aNrqi85dMDn5oPk1Kqcg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:AM6PR05MB4181; BCL:0; PCL:0; RULEID:; SRVR:AM6PR05MB4181; X-Forefront-PRVS: 0682FC00E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(396003)(39860400002)(39380400002)(366004)(346002)(376002)(199004)(189003)(66066001)(47776003)(118296001)(25786009)(97736004)(107886003)(4326008)(53936002)(6486002)(58126008)(316002)(16586007)(386003)(26005)(2616005)(476003)(956004)(11346002)(446003)(486006)(50466002)(86362001)(478600001)(48376002)(36756003)(3846002)(6116002)(5660300001)(81166006)(81156014)(8676002)(8936002)(68736007)(16526019)(305945005)(7736002)(2906002)(106356001)(105586002)(6666003)(6496006)(51416003)(76176011)(52116002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB4181; H:t540p; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:3; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4181; 23:fNYJHk2nk+rEnNA2RlYAhz8SBabVy/XjIwSMsvgV23RiaTJb9C2ruRV5j5hu0CP6sYLZJmroEbxQpYneZEw33MJ7it9bqkpdlBhR5pJEzxVyr8+3AIxaaBb+gM50KxjzDwsbWTfm7oI1yYAzMAzGXl4jli4sYi6PPEavDNqKrgEj1CPOBEo3TVaTgrlqA25plQk7E3azslZeIb8xHlbN3FA8GNr+L6cAn41alSPAB2E7mK09jKdv/CQtUZhAnJn5NRvIXOVrm6RlehYbF3SKjiyfpydkmA0fsBr7How68c82z0kwleDY/TIGZBbcAnFopT5xtnRnDIaE1ZPWwdKvuTd+Wk33Ttf1fLRjgJTufVyAq7a/E8yVjNruczESGaQnebbYI7nywWqrQwcUk/1ClOju+WnN7dHAekpoiNjirz41lHCGmbnFUhY12NbWA7x7DilT8mYIHAIbANGOxKE35qbMi+8VEos+tuUZE1GSPpS+8CaNnfSPxg03vv/9iv7myFThNXaedh+CgKG5e29pD4IeC2dyi9WqTMpZznBj/lspUM4EvCdwWB9S0IZ7iqSv0tsNFzxG8h/o8l4NKrbupaD3uQ3BKmGWYqOpc2wnhZ/naTIUXeeRakt1ht3FSNLjI+s5sYpaP5QDDmaL8byzNQaMIF/ssWaxIk1+WO1DyzK7XtTspSLCKgSU7MQYgE7XQ5VPu3evOgJRPMg8BE+cbiJ6yidYyD4FKX8HAoFjUfK4z2poe3tenF+nCJs0Szw2TkbB31OT7reQyhv1TcoTDdZq099PWy1ZfK5n49TffrSqPk2mclbFUDl/ABxcXGDWZe9YC9so2PPj+CHOviVOanY+2lz5ry+dcMgtjBhVUWMkJA7MSWDxeua1dvK5GRPN8XPr2x+kI4o+nSWcKVGxLN96biKe/Ex3pdczw8z/a9W2fkHZEvRpOD85NcDeDi72nQNWIlFNDvmA74/9r1xzy/zXvoIamBOe3h4vJ9dPXPNlvUBs58ho0QlFVpferxoaa2edI1tj1E5jJ23ScrA9vyryBNkK/YgCBETCUqyBx2vn7YPiCi12sWIsPQJLGYse0Nx74NjOz9DH7ewobwFi3nlTz57tSO2j8mUPrpH7qEoICFpkWvnHC3bR1IW1DBNTVGMYz6DEVqs2lMdoFhYLOr0UiUGwtq6/tB+a2IFj7P7gn94jtbPabA1M1XAgWdxQuw2J9W+q3PVO1T6V9XSNLazImqOWn/seUbOaAuG8FhaMMSXb2hVgxqQd84LLURim X-Microsoft-Antispam-Message-Info: log0Z2Lp+YNDEmu5UcB+3slS5uBs1pSpYpTxd/X2pvycEQLbaAXe8DKmWnHgw4lmxIsRg1DwOUUL9A6uy4CycsqTdoLEVLT/vGNl0oNt/q2516asqYZyjFtU6JeoJX80ubblcyRb4jMIH02Ukxsb9nQbkMoPdz3JlIhjmZ1fbcO4vAH3Bnv1x0Ki8p0u6bNZ X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4181; 6:3hD/ftzr4wSlX1hUWNTZWnFkWYrB99JY+jEusRuri63PUDWPh5J8jTP07CmNV9wgWvPhpzEoRZlV8Xbc7jeaic3MPWPttbAoFF2XKnHS/UlHfbEMA49M9gDs2QmyAbuzu+XQgbJ69uVNdsgTN7dCTCZ+0tDPZD1XYC6oFOrGMG6wk185gQQU8o7b3GhmlVkHEbppPhUGFz6uPUUN1Llp04YfwZDv/tVlp9Dq1CAOo+WEtB9XGKiM8ibzzH14mAQJ9OimJYXd6qafS+a0Q7m68jlPtF53nJkwWG1nt1yHB2jjbCmE8HbYSsqKd/oKLMx/WJkvE+sgGDJDRSFC28t16XRXERiKlmdcYFSgxYfVvF6E6EtGCZ1WDZ0Cmq+TrdzIMtkwRuBcJPwcVXzX3LxA3DIPppXovjtz35ZP15ng++R/5CgqXQvqnOGnJJDDRwPkfuojspzuz71WSg4ue5Imug==; 5:dz1kb2P7w/fqK3OQ8P0hsPdliM+d1m0BFc98WnJcSbjIoy4VnrsUWZPR9dSz94yjVQD4Y+ZOU15UxYBwLU9T3sfkRNGw4jpgaxP7EKIE+LBKltbOgx+hb8yCscJxC/qx5cfpeM9AUR+ErG3TUikJW49kG2DjpCD0zp/WkfuTEjs=; 24:WD/J7nhE5Jz0HhGtq2tmGb160nKK1eeb6SMdhy/MSfBwqeiLdJtdcpBqrZznVAMkhnkQsXPEEHCjCmBbPUhZ7WfdBfPc8RgWq9XAKxTj2xM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4181; 7:KKt8LrFTi7TzH0duUKYjtoOEU3UNdtuvXw8OZq854OOcM1U2ONX4R8xReqUvq8VpwFu0jZ1s2P9c66Xn2praDH/hD1VWhL4xzot37K5JfOSAODRWdbh/mGv4L9Y1f5mY5wMwVGlzTcnZkIlkE5OWvw+55+jzQLRg3u96Crc5dWZyqPcDCyGHfpFCqXWqH0jY+vw+bPjjU6w4B5r21eSfjXMwA0kImnyNl8wseBO1aFiBUdhBIlTDhlPHX0Rj3Nqj X-MS-Office365-Filtering-Correlation-Id: 72d773c1-a5d2-43ed-92d4-08d5c1827e61 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2018 14:27:34.9119 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 72d773c1-a5d2-43ed-92d4-08d5c1827e61 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4181 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add full_test_span_gre_dir_vlan_ips() and full_test_span_gre_dir_vlan() to support mirror-to-gre tests that involve VLAN. Signed-off-by: Petr Machata --- .../selftests/net/forwarding/mirror_gre_lib.sh | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_lib.sh b/tools/testing/selftests/net/forwarding/mirror_gre_lib.sh index c7b2cdc..92ef6dd 100644 --- a/tools/testing/selftests/net/forwarding/mirror_gre_lib.sh +++ b/tools/testing/selftests/net/forwarding/mirror_gre_lib.sh @@ -43,6 +43,35 @@ full_test_span_gre_dir_ips() log_test "$direction $what ($tcflags)" } +full_test_span_gre_dir_vlan_ips() +{ + local tundev=$1; shift + local direction=$1; shift + local vlan_match=$1; shift + local forward_type=$1; shift + local backward_type=$1; shift + local what=$1; shift + local ip1=$1; shift + local ip2=$1; shift + + RET=0 + + mirror_install $swp1 $direction $tundev "matchall $tcflags" + + test_span_dir_ips "h3-$tundev" "$direction" "$forward_type" \ + "$backward_type" "$ip1" "$ip2" + + tc filter add dev $h3 ingress pref 77 prot 802.1q \ + flower $vlan_match ip_proto 0x2f \ + action pass + mirror_test v$h1 $ip1 $ip2 $h3 77 10 + tc filter del dev $h3 ingress pref 77 + + mirror_uninstall $swp1 $direction + + log_test "$direction $what ($tcflags)" +} + quick_test_span_gre_dir() { quick_test_span_gre_dir_ips "$@" 192.0.2.1 192.0.2.2 @@ -62,3 +91,8 @@ full_test_span_gre_dir() { full_test_span_gre_dir_ips "$@" 192.0.2.1 192.0.2.2 } + +full_test_span_gre_dir_vlan() +{ + full_test_span_gre_dir_vlan_ips "$@" 192.0.2.1 192.0.2.2 +} From patchwork Thu May 24 14:27:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 919896 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="mDFFfsFv"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40sBYl0lSCz9s1R for ; Fri, 25 May 2018 00:27:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033300AbeEXO1x (ORCPT ); Thu, 24 May 2018 10:27:53 -0400 Received: from mail-eopbgr30048.outbound.protection.outlook.com ([40.107.3.48]:10908 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1031005AbeEXO1v (ORCPT ); Thu, 24 May 2018 10:27:51 -0400 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=WnDpXvgxHdQDUzGyl5DeYeL3cOA98iukVVT74VavQuQ=; b=mDFFfsFvdKFYYrtMoI4fYMnEEdHvxesNPdxZ857PzcDGr+cxrzwkOvk7vgScIekJpjtFYKsfD7SjatUK8LDUZ3QF3XQaeoIIw3JbzapStBe8KVvEmUcGh2Pb9Vi2cmAIKm0Q5x4kxLnBH6uoIQFVIOvwI3llCXCZpLvTUhFXz2E= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from t540p (78.45.160.211) by VI1PR05MB4190.eurprd05.prod.outlook.com (2603:10a6:803:4e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Thu, 24 May 2018 14:27:47 +0000 From: Petr Machata To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: davem@davemloft.net, shuah@kernel.org, idosch@mellanox.com, jiri@mellanox.com Subject: [PATCH net-next 06/10] selftests: forwarding: lib: Extract trap_{,un}install() In-Reply-To: References: Message-Id: <62e6587e5459918306bda15380ac6b5e37024b4f.1527171860.git.petrm@mellanox.com> Date: Thu, 24 May 2018 16:27:35 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 X-Originating-IP: [78.45.160.211] X-ClientProxiedBy: LO2P265CA0128.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9f::20) To VI1PR05MB4190.eurprd05.prod.outlook.com (2603:10a6:803:4e::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(2017052603328)(7153060)(7193020); SRVR:VI1PR05MB4190; X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4190; 3:dVwrUYvN7/B4vaFFog+K0rLvHpS/jet9/7jVfC55bw2aFDXLIYRfbM/pJYfnWxQCQJzak5v22jycPp/6nmJhxOEvw3XhnslbM6IhXyrWVJ4v2JvdfLh12BRO99WQqn1xhkp85gaM3ReZhjiThRE3vhMp2kNdfsIkbGf6pStV4jHjqqF+4jbY2XagY9ZLhSEH7lbxCMmhKJf2goXyFzY61dmZI0s2c4CoWnmr3kwmvu3qxBuF7uADbhTHAnb1X68m; 25:SC9WJxbKHnKcKLSyjADCzcigzT7PhTwtRoC6fl3E3C53dewGoxUGBgCtQBmnpXEZ/1Xu2naUtCKH8tF1Vll74+hGY90wFKJBGNiIRZKX13MWNrVm5e73ZvbuMu9Y4JHMqPu63ozpc4Y49ExpGq5AFgtEOIqy9QRTpBWL+ANx0xfQ9HP2YiSN9qUb7Kxc4GrBH5cHMtO9T2EjPaF3OD9nFnsE6VY0zi3UePDRnXhGzz4+h1gL43g+QEu5LIrZnhZBVe/toRAEZdhKuZbJIhS3qAkQtrhmvjk5/KsaRByVLXf9ApDkis/Ro9n1jPyRu0VslDzeSRDg5n7DEDhsC7NKRw==; 31:w3ricMAabSZJzrFUbn4GCkSHqpRSCbo6mTB9I94iwXNfuZOP4FKFOEZhMLQMMl1Sd3VgPGt2q6dWmVEpW174pEVdtP1nzDPnJ4q/OJD2wZmY2WAAsbq5nW5iCVQwZLC1mMadvA9FZUTTI6s1w4cP5++Huw+oNip1099HSIGKzLHwy4s+Vm23dsy/FFMkdOfSoureVOG/wzqTAysOcNH/qUa2Vwj6oMQwTmZr6ALVCII= X-MS-TrafficTypeDiagnostic: VI1PR05MB4190: X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4190; 20:DC8ZtlHDOHuC0uC0RHKWkTpLF2od33wrpF9tm57w8Pc9jjrDHMLaABSxQ1NOjUNJUvBnInInGLnAeb9b7JhtSJHvPT4EahKETAKaM+TtQZMnh81YTzxs+dwR/eN9NQkkz/z5e+b6Fdc+QBM/Q6CpLPoWiE3iMkmB4UEtjPBhS6j5updvgWfwEckQ1Lz3knLDQ4JtW63E3pg6lFTswAjNaT8f3CofazMJO8ZaiGkl0ZRZmxR6G3r9UpYUInun0R3UvmgrnOl+Re24A/YSEjOaF3BBUki6MJ7ZjMeM9eHJbwdaVJCZNzwvzQrpNVwwNcPj/blKp4LpBxdf60AFC5V5h8Yd230yw1jYhge9W2Rj3U6+gkcK2/UU3BTVwSw3AV98PSQCHUO8cErO9W5cRIuvrciREv1d4efJY0yECU8uwoznSK7+KD1EHy3kwuhp0+3cCbVkK5Fb7N3WIxe+C6APoNXLa5ZAiEDnJhBXxbU9FtmayOk29MvREnuj0OqneqfF; 4:iDLXDuwVMOVTcSeaFAsRZdDTQqdVRs2adwF14LsoPxmVf+dgEuxxWt/7KI2n3RtihM7jGOZ0GSlAlsINPmWvlK59EKy6c0WWeCinm56nlwnxgM2uQx8Cq7U/ogcVuFREdyBzTLlDTljRFrDP58i7jIN/mY4+qNt40gLpjJonno/yYY32/jORFkpkewt25vlOgOTzkN/z5ZXlrsYH8JTfpsEZRnSn0k98R6rhmnM3rgrYT28oLAK9IVXCTo91pr9X4QdwQRr+mcJZ0DKgjd4ZHw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:VI1PR05MB4190; BCL:0; PCL:0; RULEID:; SRVR:VI1PR05MB4190; X-Forefront-PRVS: 0682FC00E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(39860400002)(39380400002)(396003)(199004)(189003)(118296001)(6486002)(68736007)(8936002)(53936002)(4326008)(81156014)(81166006)(8676002)(7736002)(106356001)(305945005)(16526019)(47776003)(97736004)(107886003)(66066001)(26005)(486006)(5660300001)(476003)(6496006)(51416003)(76176011)(52116002)(48376002)(2616005)(11346002)(6666003)(86362001)(2906002)(25786009)(956004)(446003)(50466002)(478600001)(386003)(36756003)(3846002)(6116002)(16586007)(316002)(105586002)(58126008); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR05MB4190; H:t540p; 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-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4190; 23:BJkd3rCt+HER5X+cNMIKG7U0R1C9/1C3HRPVmPkcxWAF7NKIw/yOR3wzD3MWiPJdLW5AFy7hqLgcp59Bxd6QGD9/pK38i89MvJ176h+EVPfOS2kFQ80Uq82DTqakw/7tcUUznCbWyRUrGPYT3hz1LEcHvU+RTRvm6shAWqzGvBaZ65FiZJQX+RrwXwJfVZ8p1Ql5hQIolkGvDJ+/FUmacT5gbxWku8Xot1FNfx308yogEDVk2vFFHh73pehDL3wQj7hQ79G8c4FDjKqz1A7ebSuApqzxovDjrtLbuNN17lVamR79wANoqKVNa6gr0jTZEQR9nN2v9JGbNK8L3xkeaNKGIsh47m5iAcNu+KpBKcwyVRfKvADm8EiNtnQR7aSouaME2uXF19/ZSVbM6F5mQhYJ4r+OfIDG+BTo3aLND5c2JYJFQ7FJxbeFkaWj5+mKmJ8ja65gdPKSfSQyKAQgX6FUpX69zaMbRvhAc292Bd4g8r+HCmdie83ON2YAfhyvQfAn5NQ/xmo56jNS8jTp0gNmk6hcMveh8dN+yG7z4+SZgKi+m5aUIEKfMZrHqz7uzu2gMKY+/q/RpWMaQlaXAyyjsbue1otVpQDi3YC9fFqPxC3KP2lN48np0nx7Z9AS+5HMpE99rQ35e7QCfIIBlGW8ooUqvPOxUSCoXnbGxoaa5TH0iCXKM1J8HOgl87Thiit9p3FOX5f+XrbFiHYwZ4sP9jT35K+8qMhPn5I1SXQ1lHUyWcVi2TJ0jrXd7z4aDKY4mYCn02O81Sc7bTGLBZLKx0PrgYzZuCt2vYKOnEZY7gkMhdkPFXA0izuuPnghIWw/D8duwXqg67CsXXddFGN1UYz8gVhkb0+cxRxBIg1/M2wApQNYhcYAJvHphb4XGBlWJOcmMgEFq0X3p/ygC2VtU+qBAfet8r7wbHY3AXIp5oXMt+newYUZlKfWCL/3NpEJ17GS9+r55PP4KE9Mq8WN6dq5rcn6Rw1UA/3+0MlHe8IC27GS87pcXPzHmTlGXWwLPGjVskV/9UVpmCyHMwaTt1F1JH4x0P6S1ZuywlPlE3Y5o3I89mhkA+/kC6m6swITNf6y5hSFQCmBZ7/ZfIk+giMFTSEcFz3Z4tS4zhHh4OPt0cOLSCl6yNU+QdJc0/1ynMU/ZkgePmNuogA1AA== X-Microsoft-Antispam-Message-Info: bdLmhPFCFMM666xQoUcbHdTDie8sabLXHstUUCupjlau804m8t55QxP6Y8E8R2mpuhkVT90246nhspQktVWo7ZbDyg2TFs93wkiVgsmLhXhB8mbiCZEr3R7tz3cu/Ff1DDRlYmgdjCJMMZIvTUCWRtaRTWTxVUOhF0A8uiA8a4tSYuzlbEpR3ZNuwy4DvGIF X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4190; 6:C5uhWH9m5FmblLEUKGgFT6acT1dHX6TQb6Nk1BZhgYmP80z9xRLRTfAFUHnfkcc/0a3EFDyMDHGyg22SR49OTr3Y8Cx0g3hS7P/jwPqVaFnmNyJCEALMWXNjR+VxtAkGTYlMJOOu8wRgxqt9A2mxwnNKss78HvvJVjIvHe4p+lw+4FW8py0dLTK33xETzYvjNU9dRo2abPj+vco8s62g0NHiRTe/TWlvveqgGSwDTBMc72UC0NdJrrWzh4+JBG1auXr0ew4YZdF7enxXvnY6lkW1niAEgH7Q2bOPMsV7aLZ0jvENneq906WT4lAOv6ds1sLM8tBtKvgfmvadtTZdVA1edJBCpPj1/0C/RrMFKH69MzBKu9dSlPm6+j/Bn4/zmKOYBPDm/uVxglaZqGBlCaE52gS48v0DNZEPUPHVAmEEhD4R0x7aVj6ThMUlGJsjzoqzhP4YR2eqBpOLViPJZg==; 5:ATvlbZtWwJGFM6FU9tGX/nY/UVtdQ0QfkLYEiTaG0dWPxVlU/oyL4t4x3b3rv0uaEZBOTgi5erUBx960hzU/JZnS/buEAUXW4GN0VHqprEwJaFnCI5NaJU8t6/UdTTwr6NiHXI1MvH7wA9XGJNGIUJEv0iDQTaIbFlHbsdca/Tk=; 24:NRacpOl4pPCJZQ1AnPsKoqCkn5Xi5vHmhabO6w53dF8ohYm5V343aF1isDy18h31AIla7FzT3BzlyBdtyWrYEHY9SQzsW3o0X8YrDOtKB5o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4190; 7:FQ8hDpp4GL6ufdJh1lxSaXuV0J3tW5Bf5pOAPRuY5y39S7CZM49+Mr/7pGKglWPalHwfRkVsxOWmiK4KvDOz7WPFu1idUQ9m+q9srTZQQTOsW26odgDnUjdxbQxJy7soLD95Xf+90mjJcV5nfrkuqyZ9+R/2wvh7r8ZZubjJHk2QL2DnABwoXZrWOnVyP2BdjINvrS3tuzwOs4deZZtP06x4OZ3AY8JDG57s0+VrMKi5pzfYsWdE3qfrNCz/uPta X-MS-Office365-Filtering-Correlation-Id: df8dfeb0-20de-4036-9d14-08d5c182863c X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2018 14:27:47.9352 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: df8dfeb0-20de-4036-9d14-08d5c182863c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB4190 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A mirror-to-vlan test that's coming next needs to install the trap unconditionally. Therefore extract from slow_path_trap_{,un}install() a more generic functions trap_install() and trap_uninstall(), and covert the former two to conditional wrappers around these. Signed-off-by: Petr Machata --- tools/testing/selftests/net/forwarding/lib.sh | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh index 11c481c..e78ee7e 100644 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh @@ -472,26 +472,35 @@ tc_offload_check() return 0 } -slow_path_trap_install() +trap_install() { local dev=$1; shift local direction=$1; shift - if [ "${tcflags/skip_hw}" != "$tcflags" ]; then - # For slow-path testing, we need to install a trap to get to - # slow path the packets that would otherwise be switched in HW. - tc filter add dev $dev $direction pref 1 \ - flower skip_sw action trap - fi + # For slow-path testing, we need to install a trap to get to + # slow path the packets that would otherwise be switched in HW. + tc filter add dev $dev $direction pref 1 flower skip_sw action trap } -slow_path_trap_uninstall() +trap_uninstall() { local dev=$1; shift local direction=$1; shift + tc filter del dev $dev $direction pref 1 flower skip_sw +} + +slow_path_trap_install() +{ + if [ "${tcflags/skip_hw}" != "$tcflags" ]; then + trap_install "$@" + fi +} + +slow_path_trap_uninstall() +{ if [ "${tcflags/skip_hw}" != "$tcflags" ]; then - tc filter del dev $dev $direction pref 1 flower skip_sw + trap_uninstall "$@" fi } From patchwork Thu May 24 14:27:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 919897 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="izPvSTKf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40sBYt1m0zz9s08 for ; Fri, 25 May 2018 00:28:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033305AbeEXO2A (ORCPT ); Thu, 24 May 2018 10:28:00 -0400 Received: from mail-ve1eur01on0077.outbound.protection.outlook.com ([104.47.1.77]:55308 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1031005AbeEXO15 (ORCPT ); Thu, 24 May 2018 10:27:57 -0400 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=1JG5dlQ9bLHCuPdI3gOg1IAsRA4CR/uS/xJxry8oo/4=; b=izPvSTKfSSgIKYzv0eh08a2L3RwM2mzvHQB22e9serBKLHaKdH00tlgg8NrzbS+omIViZXMKR5wvuZ/7cdwD9vPOlRGtRDUGIVxVguM9DxxBGro8EwhfgoozsiJgJFObUYOrDNHPwnrQRiR6OigxQupiJYxi2Ozv6M8G7V6rWWQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from t540p (78.45.160.211) by VI1PR05MB4191.eurprd05.prod.outlook.com (2603:10a6:803:4e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Thu, 24 May 2018 14:27:53 +0000 From: Petr Machata To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: davem@davemloft.net, shuah@kernel.org, idosch@mellanox.com, jiri@mellanox.com Subject: [PATCH net-next 07/10] selftests: forwarding: Test mirror-to-vlan In-Reply-To: References: Message-Id: Date: Thu, 24 May 2018 16:27:48 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 X-Originating-IP: [78.45.160.211] X-ClientProxiedBy: LO2P265CA0034.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:61::22) To VI1PR05MB4191.eurprd05.prod.outlook.com (2603:10a6:803:4e::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(2017052603328)(7153060)(7193020); SRVR:VI1PR05MB4191; X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 3:nQ9PEWShdSfjR2C8Jb10Byl3jj8JfDPafpuHjE1mqwbqfND2nSRg7QI7VKQx3OFalr5kmnEdn5Kt7VeO8+KQtn+BCFr9McwtgNDSSTgd56Vc076xNEeKm1s64RFRtg6BMVV/jaGRt+6YU/fRrqRKYK5yPK6I3Ov2e4lFvciiTs8gcA685y+KeW9LqJcSsasxX6kq7Jp2EEhKmQ2ydrXelK/icZKlMpd+qoI/OLd89W1IhREFuFUYpcN3dgUqGycZ; 25:qmeUlIXP+mMBW6Lbw9DvxkbNIsjkm+ynBvwH0xbPkWjgO+HXTY3By9u89cWeDuskH/5PMowMFIWfISRG7M/SZEIjEph5kzXT0UhhM1Z5GHjU2f6e7rt4vAUSg+KnUP3WVTvnwKjNMhBKqbVaDGGtNSs1H8jbTIhT7SVqQxv+94MSEU9bagccUChCwiClQrSUIiLFhedmIy2liepX8HGYmvLgD4VK8hEXdtRfqmJSba8uGGLLmFL7DETWyCOShXYiY7VnmSRoiCZS3cK9HlvREe97c1aA//5O2oOeYehPtaJQ08GvRQG0WKwb/tUVL0PFw8GxykuBlopCFlEs60p4Lg==; 31:JeouqzrkzSGZzp6Oi3WeU6KnKvYQaLlO8dxpFIweagt50Fdke+OqwajwMvF+u23V2wBNVe7Qiy97jwO0bpTcXzuLEwwYWVbLgPLl/CMmvnVqGICzhsvVPsSvxksIyPTsbJVoLT9XfJYSDs9N0Or+W0wY0A/beoBP4rJdE/CPbeAnc+zXps18hF16At8qCfK2wPv5C8yqiGe7PLlLHzGM5FVL+kBRytt+aeUJyWTwH6Q= X-MS-TrafficTypeDiagnostic: VI1PR05MB4191: X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 20:3vpx8J+M+XwD5Ccj/vMxceaWPfH2xov+eyAN6yh0a6TWqA5wEBFRs2Wj9l0L93K37bm0UpdLat3BPJgHYRRxCw0G/YoVw04eI0NSuqnCTH3mwsIL3eEg+70ZfYkO1dBoLqBJm4j1AxNmMuyW6jlXLJXYMVtjV5LIkjfGBgM4x26AhNx9wHnC589fBknCcHlbI232KxXvL3U7TrPTJTvOW4G8PfkuFPbMA7tp/MoD4srHJ2FQCpzIlpbQSjjHXErDYa8bEwzz5YXNumIoiq479KF2yHT/PAlC/GacjYhgDE5k1v9Kvak4/v6CwOENs0gTYkgopnIHRD0ZTGdDZhR1TDg7sPD7zGO8GB3ts8GqoCKyIQ6Z4xPfNAd64jMNHMbKwH76H8LSIaF0AVgGDh9x9FDT8AAWBrh+escTvICRCALVMWKxNWYTAykYHmOp9SjVgy/+JWlOe6TISY8dJFyPGduqKlw7t2qi/1TUCbag7CCkigVX3NcHn6mDHXEbYMoR; 4:0NDVHE1FJLJpvZr7HBQaMX+vAk2k1Fgv3utKqRVkq7BiCvAVSMTcchVq0qzNvxXRRK9n9QNmSSQVy10Lvhcd7ikno+Mdmsja2mD1Erw7HoDFs/j7fzP7UE/pfb3pY9RpfF5eOC905vwlwFr+hhlNWsSEeiIP1bsKfBJyTwjkF2m+iCgHUTKgRD+944Au9GCRxWcZhnlgbZA3QsHdQfBnl/ydbQIz6ZtdVeIBev+18PNw2hGxkKwnhDUYWR6lVVTdQoZTrzyd+2U2MXn08i/UMw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231254)(944501410)(52105095)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:VI1PR05MB4191; BCL:0; PCL:0; RULEID:; SRVR:VI1PR05MB4191; X-Forefront-PRVS: 0682FC00E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(376002)(39860400002)(346002)(366004)(396003)(199004)(189003)(478600001)(86362001)(2616005)(476003)(36756003)(956004)(11346002)(8676002)(118296001)(6486002)(81156014)(81166006)(8936002)(58126008)(16526019)(4326008)(107886003)(486006)(446003)(53936002)(386003)(6666003)(52116002)(51416003)(26005)(105586002)(16586007)(316002)(106356001)(97736004)(305945005)(25786009)(2906002)(7736002)(6116002)(3846002)(5660300001)(48376002)(68736007)(47776003)(50466002)(66066001)(6496006)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR05MB4191; H:t540p; 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-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 23:S08AxFiMmsW9cPcPqM1v+YdbRyhdkdIhbfRo097PGZV4p9YdJg5aUTYnt1xmPoWqr03p2wACIDP9en5oAhKQ+vp55S/OrMZSC8+JOjQxJKwJWcuVJYbADG4vyp3fALtl7dY8FRfEZAVaUQMkJe1KXCfD8EJZ2Rzs+9DaKfmhYh5vz95oK0f9IspCGLQ+GjAVi4QAtPHvmooHkES0cwTteVSTLtskvhnF6d66luyN7Gr74hqM6Fj2bgg28jJbYoNe8Pfm6QRikLzG6rL3JY7oaI7vF/BXi8yM0mIW//wm9U5lXXM8yyGxqNHGYYL8XTQ1x/0ldqUR3kwyLboEZJQelzHtFtSAeYCcChiSZ2hM40nM+hCfwVZbN60xDBqVm8/wTvYAsIYm0QiK5FxmcmWW/kG3y5GbN98jRmudP1xyEFSN1CbUefe34wi79hRGWXdaABOuDKKOSGJlCVOChG8r/wRiERYL/bWwG8ir7isz4cv5VnwMhCLuuTf5QmdmjkZDXJRKF67CcAGCsq08ZxP93bZrAJZHbXyqLVAWsfsCk/GxwmbI351iBync1Ed/VNqMw/+k73XFVv8b/GUyzJzIB1rpe198LwZFq1gskidQY7OeehG6JH2xbj0hsINhY4FjRI+JVbz7e2fCfSoEZgJKXs8bJAEFC9KrTWExNanB9XVmoH8lTBaTV65Xskv7BVVuOTvYGQKLigH/F4IfY57mSEIeCeRrNHT2qwreonHcqYRegU6MZR7OXTEXys1OYlC2FRA66nsflM/ubL1b5yueKSIBnDWr7GblX2CAr2CIJd3skwAMmHfzIGQhoPAzJ4qo0NP63ESmcVvBMFD6Sb37t5GDIZXJIEskZPb7ahJVczwCnCEj07dXignKKCF5DMVmtw2UhV1YZTOSDJyi2HMd+ECpplm+pKBx77QI1FMXA99z6X3lwh+/peBXJt5wh6XVG36Q9q8+NYXafY0UQe5bt3TXESbO7JTiClujl8CK9gbcNqnalgFdrvhTA9cDH2TF6MzE8+xlzf5kSVSeGyZ6f979zzGxK830PmDGeFs1U5yf+k2a1eHrNLHZuF6PPbXTOE3RrQ/yEN5RLPkJzqx+sFvN21NQkMoYVShiD4sapLr1vtnaJVAhRuhUoWhCgoa+7D8DbS99WMoxOb3wSWoGCA== X-Microsoft-Antispam-Message-Info: HX+8KjKYoPAgV9nMfPke8nvsUBvEYhrYRcKu2oRi+Wjlqhz/zadprg4hm1vdlRDMpgi2Cz1wjK1cA5mkA7XbnvWov6aPnQwhnkss4FGvRskLnSP6276euEEiFop4inPoUzSQUFZ7WamqojG3wmlPbecmk6oVWgj5StgorU2+ERP64qOdfNbGnOjSFKiDerK5 X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 6:C5j2Rf1YjErAUComAA6Ilo9OlRbawt69DfOjLJ+fKDQopNd4Nz3RY6FAyIOG4ch8A7DfUuGgEP0gS3sgfaS76JY8GsSci024ElX7oDic3V7tboQ6eVYqpDVVXAfESc8tW3NIejxa7e2qCMlIbUBnQDQY88DVFeo8ry3TeT/mquHNg9EW80Nw4XJLxx3/pQmBhlOgvQupZPajbj+zBv8ExNdGk+6JtokAW71OsJJA4HmayNnP8apWTbEDvrjABXz0KZ2yWse4R8+TQfU29SYMr2te09fEQo2rXcGHzNYFi0Ze/8xh9k3bsScUH57VlNHG/v185kZLT23eIzxlxpsx63H7nRKxb7iePdgTL4Ygfdgqes3N7SOa+5FEKnuAFlkHNBhZPsMcVFlm/g5KMFTj7UopBpL0iYACr/qpmzCoGLTrmM45wbFpgx7khScqhMEsnz6UsWp3xyFQMsgeE7Fm+g==; 5:YcZJL9eaw74SW1eZFLpl3/wMXyKRx1q3GoFRD+Cmw5F7qqgnCSNSODtSi7OSXula/KuIh6yaOv0TcgXdJWx6n9wh0eQVQ8U/S+7GfQNAeFfxUZzmj6znZfOl1wR9ziLnh94Tu89iyjFwgviE0iRvvr5uEaHYCMqRR6o17n7p6Ho=; 24:9sBSJnVDEXwFnKGxIaEBCJ1Ro6Ibgtk7RKWZtwNVpQpEFPrcXxRtAB6+qObXF3e62edoVJv4u8lNL51k7RJ5In57f/3HZqnhBmRr8P1e/mc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 7:8pqv2KpMFRQxd/hl2UeFM9MWSeet/HioFK1g19MQHwOs0sb9J1W/Ee6g2ErzlUqD6C5gy6x/R4qTAdAnxGBEiV0ar7/0XTqui180yNfb2JCB6dRCY6d6LfKBr9J0K1LKsS4+aRqwDwrXOW7s1Jktkxvvw51pQmWiPQ/7TzktnoOGKV40PTZJ0TrhCrNnLLNcgiR39D5dkkb8YQKaEhNQuwvxSWlGdOHagKoEhSt2TmrY0SVSfirqb6LqdEOo3u/Q X-MS-Office365-Filtering-Correlation-Id: d0eb8552-adb7-4c33-5159-08d5c18289ce X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2018 14:27:53.9546 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d0eb8552-adb7-4c33-5159-08d5c18289ce X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB4191 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Test for "tc action mirred egress mirror" that mirrors to a vlan device. - test_vlan() tests that the packets get mirrored - test_tagged_vlan() tests that the mirrored packets have correct inner VLAN tag. Signed-off-by: Petr Machata --- .../selftests/net/forwarding/mirror_vlan.sh | 169 +++++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100755 tools/testing/selftests/net/forwarding/mirror_vlan.sh diff --git a/tools/testing/selftests/net/forwarding/mirror_vlan.sh b/tools/testing/selftests/net/forwarding/mirror_vlan.sh new file mode 100755 index 0000000..1e10520 --- /dev/null +++ b/tools/testing/selftests/net/forwarding/mirror_vlan.sh @@ -0,0 +1,169 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +# This test uses standard topology for testing mirroring. See mirror_topo_lib.sh +# for more details. +# +# Test for "tc action mirred egress mirror" that mirrors to a vlan device. + +ALL_TESTS=" + test_vlan + test_tagged_vlan +" + +NUM_NETIFS=6 +source lib.sh +source mirror_lib.sh +source mirror_topo_lib.sh + +setup_prepare() +{ + h1=${NETIFS[p1]} + swp1=${NETIFS[p2]} + + swp2=${NETIFS[p3]} + h2=${NETIFS[p4]} + + swp3=${NETIFS[p5]} + h3=${NETIFS[p6]} + + vrf_prepare + mirror_topo_create + + vlan_create $swp3 555 + + vlan_create $h3 555 v$h3 + matchall_sink_create $h3.555 + + vlan_create $h1 111 v$h1 192.0.2.17/28 + bridge vlan add dev $swp1 vid 111 + + vlan_create $h2 111 v$h2 192.0.2.18/28 + bridge vlan add dev $swp2 vid 111 +} + +cleanup() +{ + pre_cleanup + + vlan_destroy $h2 111 + vlan_destroy $h1 111 + vlan_destroy $h3 555 + vlan_destroy $swp3 555 + + mirror_topo_destroy + vrf_cleanup +} + +test_vlan_dir() +{ + local direction=$1; shift + local forward_type=$1; shift + local backward_type=$1; shift + + RET=0 + + mirror_install $swp1 $direction $swp3.555 "matchall $tcflags" + test_span_dir "$h3.555" "$direction" "$forward_type" "$backward_type" + mirror_uninstall $swp1 $direction + + log_test "$direction mirror to vlan ($tcflags)" +} + +test_vlan() +{ + test_vlan_dir ingress 8 0 + test_vlan_dir egress 0 8 +} + +vlan_capture_add_del() +{ + local add_del=$1; shift + local pref=$1; shift + local dev=$1; shift + local filter=$1; shift + + tc filter $add_del dev "$dev" ingress \ + proto 802.1q pref $pref \ + flower $filter \ + action pass +} + +vlan_capture_install() +{ + vlan_capture_add_del add 100 "$@" +} + +vlan_capture_uninstall() +{ + vlan_capture_add_del del 100 "$@" +} + +do_test_span_vlan_dir_ips() +{ + local expect=$1; shift + local dev=$1; shift + local vid=$1; shift + local direction=$1; shift + local ip1=$1; shift + local ip2=$1; shift + + vlan_capture_install $dev "vlan_id $vid" + mirror_test v$h1 $ip1 $ip2 $dev 100 $expect + mirror_test v$h2 $ip2 $ip1 $dev 100 $expect + vlan_capture_uninstall $dev +} + +test_tagged_vlan_dir() +{ + local direction=$1; shift + local forward_type=$1; shift + local backward_type=$1; shift + + RET=0 + + mirror_install $swp1 $direction $swp3.555 "matchall $tcflags" + do_test_span_vlan_dir_ips 10 "$h3.555" 111 "$direction" \ + 192.0.2.17 192.0.2.18 + do_test_span_vlan_dir_ips 0 "$h3.555" 555 "$direction" \ + 192.0.2.17 192.0.2.18 + mirror_uninstall $swp1 $direction + + log_test "$direction mirror to vlan ($tcflags)" +} + +test_tagged_vlan() +{ + test_tagged_vlan_dir ingress 8 0 + test_tagged_vlan_dir egress 0 8 +} + +test_all() +{ + slow_path_trap_install $swp1 ingress + slow_path_trap_install $swp1 egress + trap_install $h3 ingress + + tests_run + + trap_install $h3 ingress + slow_path_trap_uninstall $swp1 egress + slow_path_trap_uninstall $swp1 ingress +} + +trap cleanup EXIT + +setup_prepare +setup_wait + +tcflags="skip_hw" +test_all + +if ! tc_offload_check; then + echo "WARN: Could not test offloaded functionality" +else + tcflags="skip_sw" + test_all +fi + +exit $EXIT_STATUS From patchwork Thu May 24 14:27:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 919898 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="VuP8dcmh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40sBZ01BbJz9s08 for ; Fri, 25 May 2018 00:28:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033311AbeEXO2G (ORCPT ); Thu, 24 May 2018 10:28:06 -0400 Received: from mail-ve1eur01on0051.outbound.protection.outlook.com ([104.47.1.51]:63552 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1031005AbeEXO2E (ORCPT ); Thu, 24 May 2018 10:28:04 -0400 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=RO5K2S6qHnONviQd0ZHtuCqu1zgsWyBCBDQ4tNgDd/c=; b=VuP8dcmhLHEEBXohszLgIVmXkrJbWTFMPwv2Ee5W4Etumwn6iBxlJWHOy3zoZR4G3lufOZU464ILgP2rJcq2ScYNrPImMNgV2xr8cVpluR5EFBPZQnF18jfCZ7hC6+1ZuYDdiXOulRP/vRkaODoEqwktPjlvKprBEz8nZi5rT98= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from t540p (78.45.160.211) by VI1PR05MB4191.eurprd05.prod.outlook.com (2603:10a6:803:4e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Thu, 24 May 2018 14:27:59 +0000 From: Petr Machata To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: davem@davemloft.net, shuah@kernel.org, idosch@mellanox.com, jiri@mellanox.com Subject: [PATCH net-next 08/10] selftests: forwarding: Test mirror-to-gre w/ UL VLAN+802.1q In-Reply-To: References: Message-Id: <0d431918534794d3ebadb15c3938808808b0bc45.1527171860.git.petrm@mellanox.com> Date: Thu, 24 May 2018 16:27:55 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 X-Originating-IP: [78.45.160.211] X-ClientProxiedBy: LO2P265CA0034.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:61::22) To VI1PR05MB4191.eurprd05.prod.outlook.com (2603:10a6:803:4e::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(2017052603328)(7153060)(7193020); SRVR:VI1PR05MB4191; X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 3:w/XBrhUOKDFBz4UBLqx5v9FPpXPCTo6YYhM3Yglo2SBq3CN/ZuVoIpT9MPa3qbg3tTfXI78IahAFr5BZjO2kGMdq0N47OXqiafd16Yfr+XQtWduaQSPveLKF/Juzd+GDPlwaxFl43exIUtDsanFS4wZUX6nQw0oH314av8mSPUHej7PPFBfNkEzAcKQyqpRQ6NdPV16OBVIwVMq8439B7nlzgRgGdwVrxzBtUPbe5AFCX9SAxCgWlJgPe8+qdSnw; 25:NhVfCmNiUNJSLASApDzQYhw1B3SOVNwx47IsNQ77+Hn21CNMPvBkZbQm/Hp+Hk9/dyQPWrp8WbprWw8Tz0haDPy4Ata1swJdGs14VSwfW37WQq0VrpKd/o/bPHAvdwwKWKSh3gZJZqYoWfhtQCKjUti0zgKNOA4dgrH2TKMWJb5t0UafwudbthKQXAkSJmoZP8hJPJKYtW5qSEq1d0EL+ociBx1CS9Sfvna+Zs/bXULYbnrNFROdnnv0klFU7A/8X8j7ZZZ2952dqRArh2kLXHSDSR29nbLyMi7wJOrRUE44/pHi9Ccj21/VnHJ93GVizlIE1uWdTylURSWxpIm31w==; 31:j6uJi7Es0m6J05eWPz4pi7cegqB5GxgNdSoxqWb4OfRsFcfO5F3bZzYXc9lWy46JnaevV2xDb7Yv3j1LaI/wxRPpevxDcz7ZbI0vQOX5cecKUYQEp7yk8irZCalFgE3HNutKU5jhFsvSZaOSEm30bCTekMQdEKwlDwTe8BnzUuhkmhn8+E3BXkMlCSqmD+vBt9TT5Coz3BPRt8yVnTdciw7NthPtR+WIg9asrArQRdk= X-MS-TrafficTypeDiagnostic: VI1PR05MB4191: X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 20:9NdxxTWSxFbopeW5ecupGvloHJIXJb0v1TRd6BiWzrii6stdtb4q/8RsvaKqvjNICtslgsWswuaDaLs3y2Y8XmpxCPCJp2iR+Sodbj4Rxllu6YONk1Vkh1mp6eK55NjB8fX3a+tAX1uU8CTrm3knIS1jEEmhVDMAXg6rS/RqG2pv0YCHHaYecndiUOiyFlU2KX9EIskVxEiNCIlYLgnlZLPOgdEN3v9sx8MCIP2Zq8s5YC+cYAffBOr/WyCUpgyHKl+qRpl1QcwlKA01kCzMfQB83BynetIbysSOMBKPayfbBE7Avvv4hIDCoEkg8IsVRfu7BDnSjNVGIRvw7xbr8zLrUwQhrC987CgChARtFZYwTzR6ADdj4pvS4/qPkr50aquJ7Hxv9opKBl68I2SyKRfyvsFrFds3+VaFbjHPdCJUNTUknH76gnRtl8hvyWl3sw2oAI+6ypxOpYsUdVXYS8vlN1+Iy32uyBOfdfU9eDjjcyOWzQ6ILwn+Xhh0WfCN; 4:35OZlQ4QFDBteMflht8GBfuOrkKAM5PcfFkVRMcGblMH40dTdivgy9R02V3LGpYt39j+4clt6EGLCaPjuTNdpyNld8kx86DSdeLGmrByaTauDf1ushLURGWJyj3EsE6MMuh3ubRVvuMb4EnUwq1o98cI0rHuAel1vTiY5JwTZsab9gET2W+sF8pzjwp+hANkSbv29gvib0mcQ9M6ZIbimB1+rQ0a2znue/jh6jsn1poYyq16ybheqWfRlb3DEA34dysyFHKpzOEhI9coMm9srA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231254)(944501410)(52105095)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:VI1PR05MB4191; BCL:0; PCL:0; RULEID:; SRVR:VI1PR05MB4191; X-Forefront-PRVS: 0682FC00E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(376002)(39860400002)(346002)(366004)(396003)(199004)(189003)(478600001)(86362001)(2616005)(476003)(36756003)(956004)(11346002)(8676002)(118296001)(6486002)(81156014)(81166006)(8936002)(58126008)(16526019)(4326008)(107886003)(486006)(446003)(53936002)(386003)(6666003)(52116002)(51416003)(26005)(105586002)(16586007)(316002)(106356001)(97736004)(305945005)(25786009)(2906002)(7736002)(6116002)(3846002)(5660300001)(48376002)(68736007)(47776003)(50466002)(66066001)(6496006)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR05MB4191; H:t540p; 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-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 23:AE36AgW7cz4bn6F8XPoO1kB3S0UH3JhSr6EvDuQ3A8eS5zwUR5N8Q9WcW5iKLPUtQ98Pv1UOBiRgiNr3ZuPo3vDqerTAzi8HPltbTPw9QDaw9iVA9ocYsuAgeUiApniqVaaCnwtSiLmJDuPdbSl0DI86jTWrRMSZiSSeqFqElTbkcy6bfiYx9kcrKEQA+7StzxjxAKXVb17hCZWa5gOk1kzS54HEB3228//XYYQozdoNuUy0sdU62ZzrjoT3hC0fKBgrafycqDDtI+5SbZylic6G5gscjKnZZCCCITewX7Zf9UbPs5UOSoOEOMCK5jxGNsX2fdBMA89DaK5AyztAdjslT+OF0CB0EQYCB9n7qqlYJX66XC7w8oY1yXy3vtY5k7mx+Xj5P5al94lKCUgLRLQXLzrmsoLQuKaYBvwLDRjAZ8vSctFptXekRQ5eQ7AgYcu6nuZI86s3zrEN15g0yznbPY/q4v2XIc9+3NTTexMBJrkaWuevPY6BiYCn6zsFZa/PJmCHDi6lQZC1V5eU9T+jpe5IuE5YbuN+9HY589x5PFqnjADnh3I44kING3XauEB6SM7en7DNeYP7Butnq9uCBYA9uyBN2RYryRqdXMQMx5lcFcNbeaNq+z6T8hUwZJtaaTbRSQd1XnNHk6qNgw2PqsTutmIFX7AX44PrfSzDjNhgAEtTkHbW+9EqS1c310TX5lY9xa5BejiAeukojaTMTQRP+UzoF7iREgKeKjdDTMU5By4uUp9dGfQda+7xZTe0zwVukfTZ19Khj3MmYnQoWEUYDLJ9iKEvmmUggdbE3P+Bls4gv9LGc1AAcdse1CCzgb5UcPO5u9QOw/xm5+qHiMj2h4ugn4dRpV2QaHZY4IubZPs5AraTcOAU1vF2XJD3F2QfZ1R63jq/AWuL/7M1qhIIrKq+jQ5CAG0tIY1HdikUKPggfbPYWN19HmmWooDERr3teHiEBiDRlsqQC23FVIwIfNwR/pudf7K0PG87I2QNHD6ikiQvmQjiP8gIaNKI04GL86M2xbT750cI7PQ/AslyuyaIUwLImBF/RJAOTSmagyxJK0KEnOCfbSw8NML22eZZ3HD89VMhnB352Pbn6zRUBCrFysWxy2A7kZaeSw3H3VqoldkwHRshWo3JIgDUCX1KQ4YZcmY7RY4RNA== X-Microsoft-Antispam-Message-Info: WEH2WdM6Xh8XgBB7AHtOj6AniFVwCd/4xSedDJrcCzijYFx9U1s323kn3YHrX2EM9Kt0nFhi6zJpdK7RcwPKo9iG0VoxnZOdYWXCfLdohgbmqQ8H9p5Ofp1RTbTukeSjr/ZUXdTuT/2E1t7oNM+f6FnGZESKAC/f2AfVZqbSkSq3V13CxsY7fna5Je+W1SM9 X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 6:+lNIlTQYQhKm1+lJIkbUwTd9zbjS/PA9uxQUOUDbW5653V1ZCAx08jwo9hniKnmYUUUxWL2v6/oArXF5JEvajzN2cokdgSyMTwx2Ig62U3Q6iE5w/YEGtcdPEpyxSPw/1+bRMfE2+Sioz0NSYAo92abLMUEGBJfIHw6cxTlNXIAe8mNqYKq6IBPzEmj9r8HUd+TLp1ZM52oCVrhjlLMUiVIOxbIJ8v6Il9KsP47rt/+tx9l2AEaFtDbgmwlv+10QeS2go5NLais5ypPL1BsKKYNmEU5bhN3wS4PI/1weoqaOsruXoCsczjwa3+d2vZ7ZdVHJ7E34VUv3rsRnkqPT/NiWbl2tcDLih3SF+oKd3p439jvHnnO5WjIBE/W6nbW6v6wGrD185WuXDLtdD8Cskl9PzRpeJt748jE/i7oYxuTsOjHYFB0pj1lx6cU/A638zmePLeQL8SltzkUuM6ZY4A==; 5:oZAmaA0vuwbPV3ttprzNR80mSdC9CvPyc73RHA1PZTxDsZoxOsp1QiP+RABlOCCUSpxFuirHwVjWxg9PIBHtGVbC7nO0Ish7CcXMXrKx6zCPA+d03hSrmZLfUgUE4ilmhNGWsl4zON52vG75cepIJSVg2mXhECQGYIQqZt0+Bck=; 24:EWEMhV8oIb3WjaE8dz5sbnY7xS7QCcJNsIV9wGw0opOjZnnc995cX1J74bxB6Aztc7vSt+nzMH43s3O1f+bdFphp/I+bzR7wtin4TYudtMw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 7:qtgLoLNcvZjCzgw/qO9e0sac//DppGxPc78StzBko9Lq9UoLXzVaxRwXeD5hP1gS15EpFG7apeLLDlolW3biJtbELCMCEoztsOItrGqOVuHmEUxZdqdQtPT6hhPCDNTEfPjv6IKfeluXSQszAGXCoa5uYksH2T1r59Hhhg63o/LKhIGMvuWkiazlwd30uPi8RNOyNkmt6+2PAkh3EN9KKU7Z7nWnk04V3SKKKD0BRbSd3utVChh9YUiq7FgY8cWU X-MS-Office365-Filtering-Correlation-Id: 6db988a8-b6f6-4989-b2fd-08d5c1828d3b X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2018 14:27:59.6889 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6db988a8-b6f6-4989-b2fd-08d5c1828d3b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB4191 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Test for "tc action mirred egress mirror" that mirrors to GRE when the underlay route points at a vlan device on top of a bridge device with vlan filtering (802.1q). Signed-off-by: Petr Machata --- .../net/forwarding/mirror_gre_vlan_bridge_1q.sh | 140 +++++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh 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 new file mode 100755 index 0000000..01ec28a --- /dev/null +++ b/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh @@ -0,0 +1,140 @@ +#!/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). + +ALL_TESTS=" + test_gretap + test_ip6gretap + test_gretap_forbidden + test_ip6gretap_forbidden +" + +NUM_NETIFS=6 +source lib.sh +source mirror_lib.sh +source mirror_gre_lib.sh +source mirror_gre_topo_lib.sh + +setup_prepare() +{ + h1=${NETIFS[p1]} + swp1=${NETIFS[p2]} + + swp2=${NETIFS[p3]} + h2=${NETIFS[p4]} + + swp3=${NETIFS[p5]} + h3=${NETIFS[p6]} + + vrf_prepare + mirror_gre_topo_create + + vlan_create br1 555 "" 192.0.2.129/32 2001:db8:2::1/128 + bridge vlan add dev br1 vid 555 self + 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 + + ip link set dev $swp3 master br1 + bridge vlan add dev $swp3 vid 555 +} + +cleanup() +{ + pre_cleanup + + ip link set dev $swp3 nomaster + vlan_destroy $h3 555 + vlan_destroy br1 555 + + mirror_gre_topo_destroy + vrf_cleanup +} + +test_vlan_match() +{ + local tundev=$1; shift + local vlan_match=$1; shift + local what=$1; shift + + full_test_span_gre_dir_vlan $tundev ingress "$vlan_match" 8 0 "$what" + full_test_span_gre_dir_vlan $tundev egress "$vlan_match" 0 8 "$what" +} + +test_gretap() +{ + test_vlan_match gt4 'vlan_id 555 vlan_ethtype ip' "mirror to gretap" +} + +test_ip6gretap() +{ + test_vlan_match gt6 'vlan_id 555 vlan_ethtype ipv6' "mirror to ip6gretap" +} + +test_span_gre_forbidden() +{ + local tundev=$1; shift + local what=$1; shift + + RET=0 + + # Run the pass-test first, to prime neighbor table. + mirror_install $swp1 ingress $tundev "matchall $tcflags" + quick_test_span_gre_dir $tundev ingress + + # Now forbid the VLAN at the bridge and see it fail. + bridge vlan del dev br1 vid 555 self + sleep 1 + + fail_test_span_gre_dir $tundev ingress + mirror_uninstall $swp1 ingress + + bridge vlan add dev br1 vid 555 self + sleep 1 + + log_test "$what: vlan forbidden at a bridge ($tcflags)" +} + +test_gretap_forbidden() +{ + test_span_gre_forbidden gt4 "mirror to gretap" +} + +test_ip6gretap_forbidden() +{ + test_span_gre_forbidden gt4 "mirror to ip6gretap" +} + +test_all() +{ + slow_path_trap_install $swp1 ingress + slow_path_trap_install $swp1 egress + + tests_run + + slow_path_trap_uninstall $swp1 egress + slow_path_trap_uninstall $swp1 ingress +} + +trap cleanup EXIT + +setup_prepare +setup_wait + +tcflags="skip_hw" +test_all + +if ! tc_offload_check; then + echo "WARN: Could not test offloaded functionality" +else + tcflags="skip_sw" + test_all +fi + +exit $EXIT_STATUS From patchwork Thu May 24 14:28:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 919899 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="vxwbhz4Z"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40sBZ61Q2pz9s08 for ; Fri, 25 May 2018 00:28:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033317AbeEXO2L (ORCPT ); Thu, 24 May 2018 10:28:11 -0400 Received: from mail-ve1eur01on0063.outbound.protection.outlook.com ([104.47.1.63]:45493 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1031005AbeEXO2I (ORCPT ); Thu, 24 May 2018 10:28:08 -0400 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=p3EttWzQMS+zSiUWbUH2LKVNW4VNwkkFNXht4FuAcVs=; b=vxwbhz4ZrMwcGPvS/3krNYC2j94ox7W7VvrDstjJnwb1/ZLKqSZrFSeQHcnNcJosuGi8HR6VvvSB+ul/vJYlXJC5m3F92cXGZE2PKwUIjplXwAlmGuUzL0y1J93Q+EFaQ+KLG9Ni8dl7WsmcmSBUO7ezMZZIDMMt/oO+KwU/9O8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from t540p (78.45.160.211) by DB7PR05MB4188.eurprd05.prod.outlook.com (2603:10a6:5:18::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Thu, 24 May 2018 14:28:05 +0000 From: Petr Machata To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: davem@davemloft.net, shuah@kernel.org, idosch@mellanox.com, jiri@mellanox.com Subject: [PATCH net-next 09/10] selftests: forwarding: Test mirror-to-gre w/ UL VLAN In-Reply-To: References: Message-Id: Date: Thu, 24 May 2018 16:28:01 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 X-Originating-IP: [78.45.160.211] X-ClientProxiedBy: LO2P265CA0146.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9::14) To DB7PR05MB4188.eurprd05.prod.outlook.com (2603:10a6:5:18::29) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB4188; X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4188; 3:av5O8neRQ5mvwrtQCloADCAcr2icGKh4hIrWNG92IB8LpPaBcVdXJ3JCks7ySzKtOH/lYyHwa+YUI73adliIf8XWBLIpzjc1mxXSDLMR1aExPS2FOuYlwYLxVUGYFkYrwE++JIPjbYX76oKhYX1sKsdeZ8YmRywd82UMHgI5IGcakLh++CXQPfdqZYURrG1oUHFvZfyrMud/7fj+lm8kjIgb5c7YhMSRjLB+kiaCw3KC1CzFPsXkOlb7OBYMdrHt; 25:XLACdIRRGFYkKSGKl3mtRP/FMQGzQbqXlEI7Z/q0dfcHEAvX6AOjaIZuoEUoI/80VquNTOaVYXPhtFjiMKPq33I0bnCp5btr/mQT+p8TYz2CcBotlt+0DJnrHm4nFOYPU1m3x/UQrdNMPUN1qsVKnfxjyINoBcAjXnOqkWl4Jgd35rkzckMs+F9gxoCZDedY/BCGvlBqBDGF42AyHJq8uAOezuiqARU3ugkNBwO8L8Hougip2vSoNHIUtCnu7iYpY5JjPddMj3D2p1HZUSw0pgl3R0BVOrFrHNHYJPbbLe6f+DGV0d3t8dQX051u5XeMGJWArOeuKhK9ejiD38DUKg==; 31:wQN026It3klwmLuEG+w1emA9kClshBWa91wh90XOCyDuGr35MCkDh1F9A0G8as/jWQwP3/oWQXhFsA+gr56AHDoZ3KQbiItY4YNuQ7vtXmifYFw4TAWeB4uVK1gVf6WfvLggSNkPU0BMkZeGWa4ybr8/E8i8FtBkUpf1IuLcwOcSXCmyMbE6nij7iERQD8vymW37fF1e+11Ez/SPRFxWbCHnBqvl1SWrb6jFLHGL0hA= X-MS-TrafficTypeDiagnostic: DB7PR05MB4188: X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4188; 20:lAGvQhkyTkaFCgR9v/BHv7YVC4qjvNEZ0crIXkV/17l0YNq1TJBAnWd3THU9Ca3aNcZnfuk/UrXzUYvBdaAyJHfij8PlPNoiz4HCvkACQfEoha68QAk6z0xPFI9bZgIH4E3sfQkKcMSYrW/+wk95QV8S8gQJzUmit5IJfA84uHZcajXmjTkIuDtOEvWzGRUGG0LPDVhQeXmgM5JIwPzZ35+FsIcwk/A7+9hQRUfkegJb2Z+aUwILKmiz3B7cg+1Vy5tDNjbVq0WhDtG8CnoLD9Ki/3XhuJ+d44JXb7PtHj6kHx8NsreLYnzi5HJX4PEWsYC+iYMuwOR9UwRUVcyS6/b7urpN+KiZEgrBWfonJpATK47JljxGcZkW4oy3Z/NIV6Wkdyap3bOt+H9+b9ATI2mg+fdDPtTmCFwGWjYqnkLUy2rmBIoN98HZoi9Pk+UKgPk3e0IBvEq8tN581yurpSrdjniy9G24zQVzK+xi6K0cBV7w4rhexq203+7rVkWD; 4:skEqwXm1gkTcA2LtAW0Zslscx8tZj+oJGqRCKFTgZYYBKmCXC0ycPkVW+P/3b7efdrMIsiu2pKzMHwHg+Ta3o0hi7crzHBxW73lDi4VkC8WmJFQdEHvegnaBku4qxw+ekoCzEwZtACu28ysIcG9DkWcQ+0tENo0Mxib9lI1I+vnp7wrAGyZGR40UtzDaddMEPlXoZv3/DElCDlVHQLoTZ/AcSxMf+bNaQTpBmEEYKGnOloYN+V603H0LmL+xN9s6J9Dknea2TxCKKpCjabXweA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:DB7PR05MB4188; BCL:0; PCL:0; RULEID:; SRVR:DB7PR05MB4188; X-Forefront-PRVS: 0682FC00E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(39380400002)(39860400002)(366004)(396003)(346002)(376002)(199004)(189003)(6666003)(386003)(97736004)(86362001)(4326008)(6496006)(47776003)(6486002)(2906002)(36756003)(26005)(76176011)(5660300001)(51416003)(52116002)(478600001)(107886003)(3846002)(6116002)(16526019)(25786009)(2616005)(956004)(476003)(58126008)(486006)(316002)(53936002)(16586007)(8936002)(68736007)(446003)(66066001)(11346002)(8676002)(48376002)(118296001)(81166006)(50466002)(81156014)(105586002)(106356001)(7736002)(305945005)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB4188; H:t540p; 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-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4188; 23:lGdk8hHwsEVMqE+dsQFSbZxH2lRU9PdEXNJB35VO8Hk/8YEhzNpRxwWYY7MKoZCsRgsYoTsSRf9ZXEAIh3O+n2mjAzlAeW4rm3XNp7gAxzwZ0JrJs5Xq7soW58Os6c+pn/0LiahfWr/QmPmY2390gLwfNW8YyD8cA+t5h00yDBML/L/r/YeuGUzRZLIj77dGfm89EtXDuHgO5Gusafl0CswGpOp+X+dxY9KwI6BggypjPLWvtUKCqONs6Fx3Q7U1tXnJMJsec1jj3dt0SYEuTImyFfuRGNV8P7Gu9IUs5tbMpv28XgUTGDDlivcnZMHuzyshVloKnepVhkfriTDaOPkBGiei4nugLlGcSm0iHZFDOxVlk7G7MjMqsxRyHbZ0UsBoS/AEXLo75ZZMGNGKrPAwm336nh6MXxaX2yC3KUp3L+Pxg2su/cKDE3bZKUdwGCq+LqNZoXvYiBjjgNOVvfXl3V/u2pyASL/yYawX01mCf2od9krotXs4lsii5nwJPHwP3qq5LdzMOfcdyCdMb4chkvkOCjwmnLktlmt64Jnjx5aH97CxzYo+garpow2nxnt/5VLMexX/yKe89vS+C8ZjN+FBdFcHaNO0/CX7LnJru8BF0G4BUnFpyUJNk09h879w3nfmuRA+AyLNn+LS2TE5isioMPqOaSSITFQN2PwMitNa6WclVJBH+u3aqv21FR5IoJzXjc2knCvW8qy154Uz6nphTSpwmYszQiOTZs5XLDuuTQcLgaodHGeb3YJ3WYcEQTYBdIrneXrvov2PdzF7X9/7qyjLYoq+rbaSnWgae9CVnwn9IR95aWSgZcMV4Z0kmzdywQ3fC8RufClQq9RJFYY/HCEQxQpqW2bXFz07fD/SldLN7p0gQwWquc0V2Zf9qDPB9EUGOuKedxyWj5J0TTHmE3kChP3I/eSOwfPx/51o/MuNEQJjB0vpKHWLlPXQGE0ko441BcNLBj9x6ty1h2Iox9Vuu1bL+u0AplpWQPsbkpZ04UGc63ZvJSnABA0zTA+yvbTxhpOZ9IA5sqkS1ueDaE6jzag+pGDY9rsstoBS2DY16cvse6bSRfYnwUZ85cEKkFUHb0NRz7ymogU0lhFEmF1JpPL2MxDjFM8iUiVLefR/za4GKUyFTLm5rA6FnKA8L+t8mOgsmIWHv2H44RCp5fSujWvOYz5vyRQiekoRhpxPOpTZCGihRkrDuSjltUTkFbSthYGaHejw92vDc2zAZuSOCyW2fO7hECH3NqBY/H9NzxyqvQgnuGIF X-Microsoft-Antispam-Message-Info: w6ee8pET5dUpy9rPCkd3vpU6MC3isngjz4RlIhOQQEBw59AXZd/cjtHZtqCVU8AYV6hStwsHsSLuw1xOhMNe5+zkAH+UBdKpIphgLaJRa0fQpiKiitvT66eZgJAaCzbhnvRlJ5Dv8R09S4ZBBD7aTX/Vucf3l/edNDqs6GLb6/Xpy6PFGYbNLi62fP3vxanZ X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4188; 6:VlFjq3QNYkRtdhBmoJ0cqTtSLYKdkaANe+twazA7lYLU8q0ImUHJNTFNEob0p4c5NOU8HT5Qxu+hpY+qaAZOyWN0PshXJetp/Dk+DpE1F4dR6V9aulhUsll+zBxnQxGx3JC21HUt62v/lz2nexqdVTKSWOwpUqhBoo9FhUwecP0jgqwukq014QMdIEmLYoxMxMsRvJqSZxfpbXqywdY0+JdVkineILXneAWW7VaGBx1x4Dw88jjCVmuoLWYBOKx2kWOyLg2rFTfKaH5iXsc4UICjwjuLAUfCNbDDwg2v0oSIF3fJjTK6IE4UkwWfW3ZKJVdVcsuEybz0juVSEyam6GO9MlTjpG4Pg9kFgZTaOGtX8onyzChcqzS2kPKDgAVH4n0MgyAk6zv6WaLmdEoguG6r773iP5Mvmw9UXwKEZHDi8+gKAf/6t2RxDNhtbTQuk32hrg9H4tin+nXqVOLpoA==; 5:mU4W6G8vuI/HF2OJ8w8TNTZ6jJ3re4/aG+4wlCUdlEU/eodKzGuatz/W3jfWOWmAPtDU0FudPEAjyVzoEM2zv100StT9y7CorV0UZM2DsawnQMKpk7gz3uBVnK5p87d3MLGq4GdSrUIRa+VhtemxsUBJOXaMO5rcAmoaw1lxTBM=; 24:MZrNkBUGTq++dUSsz27ySDUkFP1eqZjFiWLq86NSxPyReXa0YQLJGIppw8EU5cifJGNNkdLrfbYfqaiYk5bc7ZdVfUI4eIAZ8shhdBLyaPM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4188; 7:FZIyO0OXQzYHftgj8PpYbE5A30ywmK6nI/zDWuV+dRIwKIoywsRu0ltSqIyjn7npeldaMP3+54WOTRouN9mh/x7pyuOY7bGoDpGXxvjDIusIW6m/6IdmtEu63cldAqzHGZviFTAvP39XMOcyNryRl1IO+tjV68E8YvogpKK2P8U2979yDhoCmNDKJGj/+aEeN6mv9VMQwTJeznhhhsKM1W0x5utW8STkImpPQYAGXwJmeIgWdAiSYCoc32rGgmlA X-MS-Office365-Filtering-Correlation-Id: b2d29cb6-68c5-491d-fb8c-08d5c18290c1 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2018 14:28:05.7271 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b2d29cb6-68c5-491d-fb8c-08d5c18290c1 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB4188 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Test for "tc action mirred egress mirror" that mirrors to a gretap netdevice whose underlay route points at a vlan device. Signed-off-by: Petr Machata --- .../selftests/net/forwarding/mirror_gre_vlan.sh | 92 ++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_vlan.sh diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_vlan.sh b/tools/testing/selftests/net/forwarding/mirror_gre_vlan.sh new file mode 100755 index 0000000..88cecdb --- /dev/null +++ b/tools/testing/selftests/net/forwarding/mirror_gre_vlan.sh @@ -0,0 +1,92 @@ +#!/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" that mirrors to a gretap netdevice +# whose underlay route points at a vlan device. + +ALL_TESTS=" + test_gretap +" + +NUM_NETIFS=6 +source lib.sh +source mirror_lib.sh +source mirror_gre_lib.sh +source mirror_gre_topo_lib.sh + +setup_prepare() +{ + h1=${NETIFS[p1]} + swp1=${NETIFS[p2]} + + swp2=${NETIFS[p3]} + h2=${NETIFS[p4]} + + swp3=${NETIFS[p5]} + h3=${NETIFS[p6]} + + vrf_prepare + mirror_gre_topo_create + + ip link add name $swp3.555 link $swp3 type vlan id 555 + ip address add dev $swp3.555 192.0.2.129/32 + ip address add dev $swp3.555 2001:db8:2::1/128 + ip link set dev $swp3.555 up + + ip route add 192.0.2.130/32 dev $swp3.555 + ip -6 route add 2001:db8:2::2/128 dev $swp3.555 + + ip link add name $h3.555 link $h3 type vlan id 555 + ip link set dev $h3.555 master v$h3 + ip address add dev $h3.555 192.0.2.130/28 + ip address add dev $h3.555 2001:db8:2::2/64 + ip link set dev $h3.555 up +} + +cleanup() +{ + pre_cleanup + + ip link del dev $h3.555 + ip link del dev $swp3.555 + + mirror_gre_topo_destroy + vrf_cleanup +} + +test_gretap() +{ + full_test_span_gre_dir gt4 ingress 8 0 "mirror to gretap" + full_test_span_gre_dir gt4 egress 0 8 "mirror to gretap" +} + +test_all() +{ + slow_path_trap_install $swp1 ingress + slow_path_trap_install $swp1 egress + + tests_run + + slow_path_trap_uninstall $swp1 egress + slow_path_trap_uninstall $swp1 ingress +} + +trap cleanup EXIT + +setup_prepare +setup_wait + +tcflags="skip_hw" +test_all + +if ! tc_offload_check; then + echo "WARN: Could not test offloaded functionality" +else + tcflags="skip_sw" + test_all +fi + +exit $EXIT_STATUS From patchwork Thu May 24 14:28:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 919900 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="GuHPzaju"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40sBZD3C9Tz9s08 for ; Fri, 25 May 2018 00:28:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033323AbeEXO2S (ORCPT ); Thu, 24 May 2018 10:28:18 -0400 Received: from mail-ve1eur01on0088.outbound.protection.outlook.com ([104.47.1.88]:8629 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1031005AbeEXO2O (ORCPT ); Thu, 24 May 2018 10:28:14 -0400 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=ks7C9J/jauxbD6NN5a/F7SvIc1Y5LIvilpqg7Xq4FBk=; b=GuHPzajumcQ5HMZAKQRPiABYNCgR+RkAHQGtcTPELTSIrjQFGVZQmKVWswizICrq9UEAJYJArtlqZchUsEQVqd9EPw1eA6mV9r1N1poVCiVBc7l07L5kSc98415am8wNM2l3eeJo7NOfq/AEUF5FtNxWdvCD9dvM5gqSebId6yE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from t540p (78.45.160.211) by VI1PR05MB4191.eurprd05.prod.outlook.com (2603:10a6:803:4e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Thu, 24 May 2018 14:28:11 +0000 From: Petr Machata To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: davem@davemloft.net, shuah@kernel.org, idosch@mellanox.com, jiri@mellanox.com Subject: [PATCH net-next 10/10] selftests: forwarding: Test mirror-to-gre w/ UL 802.1d+VLAN In-Reply-To: References: Message-Id: <2baa18123d3f1594d552d808d68f155f0701a78e.1527171860.git.petrm@mellanox.com> Date: Thu, 24 May 2018 16:28:06 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 X-Originating-IP: [78.45.160.211] X-ClientProxiedBy: LO2P265CA0240.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:b::36) To VI1PR05MB4191.eurprd05.prod.outlook.com (2603:10a6:803:4e::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(2017052603328)(7153060)(7193020); SRVR:VI1PR05MB4191; X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 3:liI9+4rJzCMg/ucs0y22R42PigOg4fNlKJsv8O75Ib4fgy6IAjS5ywwFruGljqckEHKNqZYsQI1+IZAs2uK9sCLWDi9XMAjTqwyJeucPWxgwxuT4x3UyVNyCrUsE5HL/5YDiUFmMwQ0GzjpaMQucnhGp30oJkCbrnQtWKa8GPzs7GdLKmlMKxdKejc+NDKU1woqbtTUbAETtlTkTIM71La/aJHD7l/CP24I9ZeEqG+8y2HrFwG1hHZQ6BGEE9w6i; 25:3zXu4/2OC1xTFyD7NpQ45dNgxIJ5U4jjBU8nQZSZLwAw0QZ4wLbqbQ6D2Sb0iWGFf8wJOlvNXOIScLlLMgRxHr9nJl8wRe3tr2bbJUMcSWslFxIo1SRWaLA2usj0VWLzn4ikV1MOwQT3iBJDWAFvH2/Ilb6IhcgeVRpUWWKcx/qAR4bDJMIZlQMY1jiF8uDfxnJSuYVHuqlPbE23T1NoVtkh1MWKhgBtkuTBZkQnXrd5VDEL9tFGwFdYcIUeyVtfvh+ZR75/CG6HctkXnbObw9jIs/q3+jDnTOYWujsFLMLB5CN6gfDKCaKCxmp8QqxgvRuHNPmlYmd5mZ7fYO6sKA==; 31:oM3EjA9kS926xjyKw4fzEUH41h0Ku8zpY/lsCd/xbJPKGvNfQ3mI4TaPeovMOM/rpclNH0orrIekgRrCbKYZdqCd5JSZ2D/i6mV2hNeoAuGT69BEy2jpXK5xbJpvefkN5Tq/kj1hKGPgXTC+Es0mtCPKZKi+LCM24UCjAsFBelLczLRE94/ypB4KaPzCOaKkPWlD8j7/smA6aX0AZyDPor5g5I6rq03/E3j7SSBHZhU= X-MS-TrafficTypeDiagnostic: VI1PR05MB4191: X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 20:s/so7loAyehHB8ryO+zou79HGnBs/mxYMRUZ37TgMxEgGV8I7bZAfDNavZm8OvFjPGNf7QNCWKqYaRFD0gJGFY0RKGuyXrEGosZKbNL9VPRKoR1GpG4MjzOBJGzHG2SedKaxubrpGUyOQ935xBu8hrGIQI+yTYOMSN8GSytdFvjalr1Ahgi/2x9QEvzhmjmkyCwENR4PAISkf33gYwkMa+7uLJYEZewyVn3zWl8R1d9DgpPJ4nRY+iTCuldWwW/W49Z+rfhid28WR+gtcNWdAMzj7/Jugj/1859O1rzO8f8SkjAOs3HpYIbKPKsIJ0KCfkmWhXdhUmG7WdV9sq7HV3bnK5Q3Jq2+DiWOHyCo2nEQOFTYWtPyhI9cRPRVGd4GC+pbEmiSblyjiTwnQR1j+t4pRFRqes/DcrI0aG4H7mak2DscSGDPoJB6RGmQ0A3+5i/JoR8XIYXmRKg4aWJQwHLbossnMRQozCBVuXP3Qc/7tUaZf/5Us/9zkSJd8GUB; 4:qxefAwUAW+jwVcnm+D42tvqNQ3bQ1VJub9J8nGXmqDtNCgHuhMGMk8OWMywpcMErRtoJl2uBcrFNxiC/WrRRP1PHS9KwFfMPWgfjjNGTFeWgSbsL0nh2VOxwUB5Gdg4WA/o+gOrBVMo+fjIs+hPjvqSSbAqp43I818Qvs88YuXQajZ+GVGmrnrMGaVefkPN61S9PHpBA+Kl2XECAwMQNRikMIBWzsEZa2tpCnenN5zEAfjohZWJV3RFN4YYWghTFwQPC6rDgFZkubLQvjBSndQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231254)(944501410)(52105095)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:VI1PR05MB4191; BCL:0; PCL:0; RULEID:; SRVR:VI1PR05MB4191; X-Forefront-PRVS: 0682FC00E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(376002)(39860400002)(346002)(366004)(396003)(199004)(189003)(478600001)(86362001)(2616005)(476003)(36756003)(956004)(11346002)(8676002)(118296001)(6486002)(81156014)(81166006)(8936002)(58126008)(16526019)(4326008)(107886003)(486006)(446003)(5890100001)(53936002)(386003)(6666003)(52116002)(51416003)(26005)(105586002)(16586007)(316002)(106356001)(97736004)(305945005)(25786009)(2906002)(7736002)(6116002)(3846002)(5660300001)(48376002)(68736007)(47776003)(50466002)(66066001)(6496006)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR05MB4191; H:t540p; 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-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 23:L2jWHbAPyWVgJB4DD6uj8D3UphIYCpPBIq27m+2DYkw1aMLgZniupElvkEHz/+BW6/BvSbjLv1Xop12TdSeG08iLP4PyrNu2rHRfWAPqdi+vI9BAglSScjbReiAVXghD/KhDcXL39Qiv5qQWo3ra5fqD9G+X1jwge7GWgVjYmpnFY4rQEi/cRTJcew1a9DSai5fJKs2+Hdnu1jcgd11FEVxXfgpfS0lTm/evIIHHm4YEW5/PnxROllIV91V7UR6Q4GkJtQD4JQF6ZIwpmgMoqsCA48kZ4L9J+J9vuvGtR0D5aokMScOk1NBTsoQDH8ASmEF3Iq81ykP6ZLENchJvKivCyibR/m2j8Es9PJfAkB+E6Zvu3zHl4K3R1DMvUVtlTeDVa6QJK97ajarvdWGLrkaOf4oAq+RIVRjsfLPTAtBEKNw95WdLBP20MkXe3bt46bG0HuPb3g9/d9XRpoxdpsNR+u+jFJtxclLP9bop/ugQkzSejROgY9CXplvd+aow3IegGApOaRqvDWupr+MHaWiB2EH+i2ItqYP+WcuH6Z6ckxnKaAQGXje13nYWdxDVBu4Bglhf5edUU1r9LPM07d829KlMpW766yp7KczYKGqVS/H6G9RLz6KO3YWOfnQk7ZLwx7Ip2QeXh2QWdvT6hOBWDjdORg5/qHbBZKvp0kbcgyQ/jOubSJYzkmQUzPo6MF1LGHjaFKvnQOd0TGcJwUweOCPoa21wXq6wYes4zJ+WK9RhOQk2fH5EJ71zeEvXgos4NlpnDc9hCKdG2D0Y8AaV7pjYG3lIR+YpSKmC1vR+wSuUxwyEIguu9JBqWsFL/7RD93Fd7ACZU+90h1Pme1cD3r/J6rT/bx0cECXTaWIu10cz71tFPkz9y+5u1IQ/CcdM4qamLLuanwgBr2+EtwGmWE/1PsNLuvxor35zfZsU7xfr8xjfhUOIKy3AtfK+mSOz1UvyHK0+DJdS4AtMdVM5xM8gZm551/ELIXBu+CkrnuPiUJ+EDoOLVNLpKY+S0hNC6fKLFUa6PguG7rMl2tB7q0b1LDA7j/xTQtchiQL1/cAHj+fh/IhUnXopmS8oeqSpg679qsdS41V54/0Xf6GeNWm4nQyLrBylXi/40jZXNO6VTXe6XRlMFDG6XuDZwQUV8ZAodGu7xpionZkInf6gFxVVAM1pT2iJr2xGsg4= X-Microsoft-Antispam-Message-Info: TTSfOY6yy1lTPvlYvuAn6zjptq5hGAhHQNwFgiXIYBTs9NyS/lK3+CpDNWrwxHMhIzktGaydDTwjNl8NqqV0kwqHNk+OzvOsxE7ndz8v7sDzp5W5etIRJ+axn/aaCKOdWcXYWSP3Q0ydk2VnTpSEiI7hppuyByk5k/L+Xd8BV8cwxbOlKRzMoZWWfPtHfaUk X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 6:RQYhf6Z8u3qXhB7syD2Bt59VGANc0eSm714iRioI9EvtXyngZdDA0tkRNm+uN1EwYyxZYxkNzVESQP3Npi8jr0zdMNIdOcTvcP7JKjZLyfAm1L9fUUGYQR/jBPJzUmN5k1oHWTEuBzdtHg/FBoSnI66jX9wSS9P1tzZmozwZYoFGxCrdvsk4NrCI6/BxPjBg9l2q+daaTickwAen3OiAcLEInnkZ982NIUbNgpiaBC/aNMcDghW/Dob7eMeQI8N10yPON7v83Rmny6C8N7ziUMFVElFRp1neMeJEK9sZBq5noJOo5xllKhW8oknG4DK+laj+X0MmBrtbLDUWVonjaRlBi38ol0kaGiw5Qtidrex12PNGtgMUPs8DKobDCe6otVR0nNHSWkwVd/Y91O27tLSzMbXPlV8nSFX+vn6nMSkEKRoZYScGyBGhSCeA5Nqz3q8s0jNwYDWUirodSZXIMg==; 5:RirDXfVmKSzPF/S/kUdxmchTpvYYDt/JZsa5Tpkw6Bq1Wr8ruugfiuTfuwQhXKKg91QTM01zBCgjPwSZs8Ua9Zov5aLeEe3N5GNnQy5dGa3fBnNYUf3diw2AUnMWzktZ6wE2R0/Yal9X8CLGQct2vVYX+FmK/Fd+4/xH8eQKsPM=; 24:yzegzBHk2/L7C37rj+lTjmMuBmZMjhNck8MSDLbR2lQMh7X5NLznM/S5Q6XXF5tABkDwsZqnNXrQcM/P21V5sC7+eSunOYQcr6ivT/oCRrA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 7:eKavS9z2gSRaKZz5SWRAY1N1jrfWdKIO63SEfB15Lqg32JD7UWriqt5oDA/TQiXL/1mZGfA7SfJsd0TWFfriKn83hwOA/4IAe3TGdWKrHvO60toiCNJI+dF6loK7Rrx7qEnedeQ6Nb/mXC/T4PgLnwKOFP83pIdHX6avw8oEzW57sXmehjscHShltY6kNm67pz+HaknPZHsNg4UNKunpo2108RcHuAyOolXQ1oEkXblbq/6BrFR8YwRFfC32F8/b X-MS-Office365-Filtering-Correlation-Id: 627a211a-47b6-4b3d-012a-08d5c1829401 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2018 14:28:11.0483 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 627a211a-47b6-4b3d-012a-08d5c1829401 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB4191 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Test for "tc action mirred egress mirror" that mirrors to GRE when the underlay route points at an 802.1d bridge and packet egresses through a VLAN device. Besides testing basic connectivity, this also tests that the traffic is properly tagged. Signed-off-by: Petr Machata --- .../net/forwarding/mirror_gre_bridge_1d_vlan.sh | 109 +++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_bridge_1d_vlan.sh diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1d_vlan.sh b/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1d_vlan.sh new file mode 100755 index 0000000..3d47afc --- /dev/null +++ b/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1d_vlan.sh @@ -0,0 +1,109 @@ +#!/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 +# bridge device without vlan filtering (802.1d). The device attached to that +# bridge is a VLAN. + +ALL_TESTS=" + test_gretap + test_ip6gretap +" + +NUM_NETIFS=6 +source lib.sh +source mirror_lib.sh +source mirror_gre_lib.sh +source mirror_gre_topo_lib.sh + +setup_prepare() +{ + h1=${NETIFS[p1]} + swp1=${NETIFS[p2]} + + swp2=${NETIFS[p3]} + h2=${NETIFS[p4]} + + swp3=${NETIFS[p5]} + h3=${NETIFS[p6]} + + vrf_prepare + mirror_gre_topo_create + + ip link add name br2 type bridge vlan_filtering 0 + ip link set dev br2 up + + vlan_create $swp3 555 + + ip link set dev $swp3.555 master br2 + ip route add 192.0.2.130/32 dev br2 + ip -6 route add 2001:db8:2::2/128 dev br2 + + ip address add dev br2 192.0.2.129/32 + ip address add dev br2 2001:db8:2::1/128 + + vlan_create $h3 555 v$h3 192.0.2.130/28 2001:db8:2::2/64 +} + +cleanup() +{ + pre_cleanup + + vlan_destroy $h3 555 + ip link del dev br2 + vlan_destroy $swp3 555 + + mirror_gre_topo_destroy + vrf_cleanup +} + +test_vlan_match() +{ + local tundev=$1; shift + local vlan_match=$1; shift + local what=$1; shift + + full_test_span_gre_dir_vlan $tundev ingress "$vlan_match" 8 0 "$what" + full_test_span_gre_dir_vlan $tundev egress "$vlan_match" 0 8 "$what" +} + +test_gretap() +{ + test_vlan_match gt4 'vlan_id 555 vlan_ethtype ip' "mirror to gretap" +} + +test_ip6gretap() +{ + test_vlan_match gt6 'vlan_id 555 vlan_ethtype ipv6' "mirror to ip6gretap" +} + +test_all() +{ + slow_path_trap_install $swp1 ingress + slow_path_trap_install $swp1 egress + + tests_run + + slow_path_trap_uninstall $swp1 egress + slow_path_trap_uninstall $swp1 ingress +} + +trap cleanup EXIT + +setup_prepare +setup_wait + +tcflags="skip_hw" +test_all + +if ! tc_offload_check; then + echo "WARN: Could not test offloaded functionality" +else + tcflags="skip_sw" + test_all +fi + +exit $EXIT_STATUS