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: 10424893 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4B38A60327 for ; Thu, 24 May 2018 14:27:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50B1F28987 for ; Thu, 24 May 2018 14:27:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 45932295D9; Thu, 24 May 2018 14:27:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C92D428987 for ; Thu, 24 May 2018 14:27:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033291AbeEXO1m (ORCPT ); Thu, 24 May 2018 10:27:42 -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: =?us-ascii?Q?1; AM6PR05MB4181; 23:fNYJHk2nk+rEnNA2RlYAhz8SBabVy/XjIwSMsvgV2?= =?us-ascii?Q?3RiaTJb9C2ruRV5j5hu0CP6sYLZJmroEbxQpYneZEw33MJ7it9bqkpdlBhR5?= =?us-ascii?Q?pJEzxVyr8+3AIxaaBb+gM50KxjzDwsbWTfm7oI1yYAzMAzGXl4jli4sYi6PP?= =?us-ascii?Q?EavDNqKrgEj1CPOBEo3TVaTgrlqA25plQk7E3azslZeIb8xHlbN3FA8GNr+L?= =?us-ascii?Q?6cAn41alSPAB2E7mK09jKdv/CQtUZhAnJn5NRvIXOVrm6RlehYbF3SKjiyfp?= =?us-ascii?Q?ydkmA0fsBr7How68c82z0kwleDY/TIGZBbcAnFopT5xtnRnDIaE1ZPWwdKvu?= =?us-ascii?Q?Td+Wk33Ttf1fLRjgJTufVyAq7a/E8yVjNruczESGaQnebbYI7nywWqrQwcUk?= =?us-ascii?Q?/1ClOju+WnN7dHAekpoiNjirz41lHCGmbnFUhY12NbWA7x7DilT8mYIHAIbA?= =?us-ascii?Q?NGOxKE35qbMi+8VEos+tuUZE1GSPpS+8CaNnfSPxg03vv/9iv7myFThNXaed?= =?us-ascii?Q?h+CgKG5e29pD4IeC2dyi9WqTMpZznBj/lspUM4EvCdwWB9S0IZ7iqSv0tsNF?= =?us-ascii?Q?zxG8h/o8l4NKrbupaD3uQ3BKmGWYqOpc2wnhZ/naTIUXeeRakt1ht3FSNLjI?= =?us-ascii?Q?+s5sYpaP5QDDmaL8byzNQaMIF/ssWaxIk1+WO1DyzK7XtTspSLCKgSU7MQYg?= =?us-ascii?Q?E7XQ5VPu3evOgJRPMg8BE+cbiJ6yidYyD4FKX8HAoFjUfK4z2poe3tenF+nC?= =?us-ascii?Q?Js0Szw2TkbB31OT7reQyhv1TcoTDdZq099PWy1ZfK5n49TffrSqPk2mclbFU?= =?us-ascii?Q?Dl/ABxcXGDWZe9YC9so2PPj+CHOviVOanY+2lz5ry+dcMgtjBhVUWMkJA7MS?= =?us-ascii?Q?WDxeua1dvK5GRPN8XPr2x+kI4o+nSWcKVGxLN96biKe/Ex3pdczw8z/a9W2f?= =?us-ascii?Q?kHZEvRpOD85NcDeDi72nQNWIlFNDvmA74/9r1xzy/zXvoIamBOe3h4vJ9dPX?= =?us-ascii?Q?PNlvUBs58ho0QlFVpferxoaa2edI1tj1E5jJ23ScrA9vyryBNkK/YgCBETCU?= =?us-ascii?Q?qyBx2vn7YPiCi12sWIsPQJLGYse0Nx74NjOz9DH7ewobwFi3nlTz57tSO2j8?= =?us-ascii?Q?mUPrpH7qEoICFpkWvnHC3bR1IW1DBNTVGMYz6DEVqs2lMdoFhYLOr0UiUGwt?= =?us-ascii?Q?q6/tB+a2IFj7P7gn94jtbPabA1M1XAgWdxQuw2J9W+q3PVO1T6V9XSNLazIm?= =?us-ascii?Q?qOWn/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: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 +}