From patchwork Thu May 31 17:52:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 10441569 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 DF435603B5 for ; Thu, 31 May 2018 17:52:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDE0C28ED6 for ; Thu, 31 May 2018 17:52:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C215528F30; Thu, 31 May 2018 17:52:17 +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 47B2728ECF for ; Thu, 31 May 2018 17:52:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755903AbeEaRwQ (ORCPT ); Thu, 31 May 2018 13:52:16 -0400 Received: from mail-he1eur01on0072.outbound.protection.outlook.com ([104.47.0.72]:6960 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755895AbeEaRwL (ORCPT ); Thu, 31 May 2018 13:52:11 -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=FuIC4WFtrhRdhX6IPepUHWtQnlnN0M0rYfLhaDDIwKE=; b=t1zkucO19Hm9vCHe9EXQ7bYnsqVdSs4EfhhM4/Wa4Yk0OUnLBmLIwidksnEQ32KfBp+VddOcR4DvN4iuxZsQ4SLZT848xqtvkxAxxWDlh9FIyLnGkycq5R6B2bVwBNhZpNimebN6dK/lwSaN6wH1iUoD+vAkxCPhDIa2AS0OoMg= 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, 31 May 2018 17:52:08 +0000 From: Petr Machata To: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: davem@davemloft.net, shuah@kernel.org, idosch@mellanox.com Subject: [PATCH net-next 1/9] selftests: forwarding: lib: Move here vlan_capture_{,un}install() In-Reply-To: References: Message-Id: <196945ae7a8ded90e82cee21ee6e507c6a859487.1527788672.git.petrm@mellanox.com> Date: Thu, 31 May 2018 19:52:02 +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: CWXP265CA0027.GBRP265.PROD.OUTLOOK.COM (2603:10a6:400:2d::15) 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:yG2GakmzlGBivEwPW7tPm2K4oWMh/JxikK+RGv10KHzFJxyBPiN+chTd+gUMmW0PBOEY7GteMd3XB/rHWXbapTazntZCtYDgQiAhDZ10NQgjQ2xzcgAA0437kqSH/0ERjP29TIxOOsoqB4wFAO3pODETm528gSvrZ9VX+IYRjOkiyteYSnyuzrXoWfE87njO1aRihCFagCeLuQ0D4RRO7PrGvdx7y6BAU5X2TYNvXKbr2GyFrYa7qHZ7HWjhm/d1; 25:zx/8Ozk1OMXuQugKtstS4M3htovQX0bLWv6A/gcgeHv+/BeOrHUkpkzuU65Gf1xES1hchn7mk0IbsnONaJHTIKZ2t5zUZsAnpDti64rccl/9CNa33WtwH/9bINVON4BPB/OhTuCKOvpRllsg+3BBFRwo9vPZ7iMrlVXTDhjQShxpodaUfLMPR4W3IiKEr+VgUMS03yRkyEgogLZmHoukngvAcSy5hnnVES2cYW9qfmY++wLjB6LdEdFeu/09LGguFwcDNNkTlOP7TJO0XPo5TsILhU6B+qxMUUpUE+/mZFR7vhsMmgXfZBpYgfP5KpLpQbPxDCSlX2PZ0wDYryV2Lg==; 31:z7s+MVCDPelWFHVORI3u59rsXYnYI4uQ1xU2EWK3eb37l1g5WiNqv7VC6KZURnnOdXu+7vQwZrzGcsXBR5k5wNZolhGMPyHr5T1RWhYtyOCuydoZ3swRDoOzul6xhIHgQDmWJGh/KwG05nXP+6t1ajKRD5F5asnAMIcWZP/dtVjSY8ds5eBAlRVGwbTjks1GcIMrutqzT7pYJlcEZgrJsU+SIRXwzMBSGJg+0HLiIOg= X-MS-TrafficTypeDiagnostic: VI1PR05MB4191: X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 20:EhDY4ZiZTL5sIw0JKv7KujazBpCeOQvr7nYwHiI5cq4Y6OefOfHtoNYcQZ5JA72q6Kx8QfrrRrSp2QjgOFIzjAHRQTsWVHxxz39AoQC1YdAmbNY5E0qwRwKtzgq0Y440gIjXBO+Hlil4HOGibCt8GGXdCUjCwR08BOexe6ug0+ipT2O096zIPipqbGbxFWSoZmQ9W5cbSaJSAUhGPSCPsPm0Oca6fVeW0Tfn6n+EU3ubWMMyDHza0CWugFrdAEh+Detkwqih8v3U0jC1DU3LugZmvfVtdU2QpcP2H1dKNfcbPfNOh9katzcLh3UN5e7Q6ODKQREj3jnu0vrArSHx+6S0RTSpuyTlx6/CionPB33Rso9OekH6IUV+nCqo83Fc6FWa9C8Y43o2Vad1dwelMVaeE3HJ4s0h+Trnb3ds5iDQpQQa/Dh2rgtdqG0OmYPz7m7mdTmXtiNv0rdudrMeBkFqM70fSXbMhGnBlUTAdHUrC6YEhfJUE+wNJ26rdwfi; 4:e3n1bA5+JYp49/vHj1WqGfSr9L86o4xA1KOOoV/VheObEIlrUJnv2cRaQyuvBZWKRC2eR/KbSjPfyo+lfU+e1rUkrRmR1eBBJtZjPJBAB6HK2cMx3XpdfsL8Kxu6FBhD1HA+dMzFTEbOjs1Ozo1bP2bca45ya6vPebvaMZ7mNDdAniV6GiaNKgxLNwWapGWHuHRfJ+F39EWgIl15IEogPZ66OA64Fykvdu7yl0ReR6XiDopZwhlS4b96WBi7q2GeTvA2GEAkzMKWE/Uminfzsg== 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)(3231254)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:VI1PR05MB4191; BCL:0; PCL:0; RULEID:; SRVR:VI1PR05MB4191; X-Forefront-PRVS: 06891E23FB X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(39380400002)(39860400002)(396003)(346002)(376002)(199004)(189003)(6486002)(446003)(486006)(478600001)(36756003)(47776003)(50466002)(6666003)(5660300001)(25786009)(118296001)(956004)(16526019)(4326008)(53936002)(476003)(2616005)(11346002)(52116002)(107886003)(86362001)(305945005)(8676002)(7736002)(316002)(26005)(81166006)(81156014)(8936002)(2906002)(58126008)(16586007)(66066001)(48376002)(76176011)(68736007)(106356001)(3846002)(6116002)(51416003)(97736004)(105586002)(6496006)(386003); 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: =?us-ascii?Q?1; VI1PR05MB4191; 23:lpnKPkaIOzqJehFX99ZaMomKJIsUxJ2fLKpQhYjbP?= =?us-ascii?Q?mD2mk80KxJKE2ReVKtPSAPZOrkPSo7mDNS+VRlUQcObRXPOa4ZfKoxBhBW7s?= =?us-ascii?Q?rvO6Lp4AFIKDR4ekoHA4zn2ZnWSdBsKZ5uK2Ohjgh48b+tG8vZFKMd3P0hp7?= =?us-ascii?Q?suybN/xS1WiaA1c62nfF3V/ZgKQ7NCT4OThYlWhi92yb/lZIrYtQoCyJUkoc?= =?us-ascii?Q?f7wtWB9doWf0lqDc4iTmVKR2V91hz2Wkbrf8rAwkyKP8wIOQb8oNLL3Nj8G5?= =?us-ascii?Q?vyOoND0l6Nc6KkNSz9XaoYPs44sjlvj4LrGpAxW4f1qpjvHGC3yzP6MYDjd4?= =?us-ascii?Q?81UWsKx5yaWkZ3o60UAXeQ0a/sxRU7PKY2daL8f1jVADmc+Ki+JEKjTJ0pv/?= =?us-ascii?Q?UBXgBkl45C/PHaMEmi7UWpKFyREYOS7jqyx40pfOJ4PRxUPEG2T4yRvF1MnA?= =?us-ascii?Q?Nzlo3F3Mi534IeXxzKCXib+86twsvQPYSX7T0bgGkulbO5BZJkGl+MWCrxVr?= =?us-ascii?Q?5i5juxyW2Ueen6fmtwwtys9U7nb3E0wdf8uF9HKIuJgO0aSCSKFjEUusGOdZ?= =?us-ascii?Q?am3OIBYyE9rozBaFvrK6TUxgx755pUgpTj4cm0q+f55hp3bwLqtsCm1e9ybq?= =?us-ascii?Q?B8hPpCOQAqYP1cjCS1eGdYCR9P0Y4+NsLJ8VL6mptCA/QbC579cssWv5gGdP?= =?us-ascii?Q?iYd0iqtPgkoXe5eRzFU3P2XPSouxifuy1LaUNSR9L83d7Q3SY+oxV09qSWQz?= =?us-ascii?Q?IVSAKZ59eqTFe/KzfWMGDRc6tECOzhA4pkKfUsU7Dl12Ywa/yCzYlruyccSW?= =?us-ascii?Q?b8fsKLqwthNvVFSRQBOJVR5QmT5E3oUcm8OfnUo0Y2TpEYltKisSReh9hKv7?= =?us-ascii?Q?21VeO5qvIoGkp9iwrZmAN7moR78IFu7jbkQwI268GikLZEzFPB9MsMz0ME/T?= =?us-ascii?Q?APm+YmDg3RK1Fg3W1h/NUMA+NnpiBqzfg614Q0Xoq1ddSgJ/Lq9E4Swk+tNf?= =?us-ascii?Q?9jPaQAW5qP2DD6A5Cg3hcGbA3b2mQOm2RA7DT5ANqatbVglPosfy2gwcEFbq?= =?us-ascii?Q?pLRaWkxkF9zjRN5IjZmp+NkQJQcPEcFKhGwRv9ZaHAtm3VahdgVngNXJWaXp?= =?us-ascii?Q?MikZBxsUbgd11oDFnv3f+BDS/Jc8Klg1OMPkjTwjnI8xKheY22OEw=3D=3D?= X-Microsoft-Antispam-Message-Info: bSzl1eWR39FIaHhunT/3pzPE9smZpXAOyE9VxtUZ6fDCCywG3Yp2VXLtp0ikTyU3V/lxCC4Eo+Kf6FAwROx3nzDPIv6fuPmnct2JgaWET9uQCL2io1AbnWJWDwK5QJ0SiQkz4rMBJRhsPk6dhWNpx03EKw7ZWRep8pqBdILU3nfnwLN9ufkIQ0ZSHzQCuYwN X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 6:Z9/6IrJpUPc+AvGvE8quANAYiIOX9AZEPra3z/3uzNUAcVBh4W7jOLZuhSjDmxgMEcR/WDgRHxcYdWRcECdG/NXz6TAnoqQJCe0pe1V3//BKXRPHGnK4Y37fGibbNcujZDaeVsy+IXZF3dVqi9kxmlmfg+DcsVJiRhlI1qABWNvlCuwI4kRgTjPMxow5mbmk1edR5SUp2s9d1mGXgCooHkS1JWp6uHH94hshvNcK8T5idapmvvoCZuOA9w1mSQOLxBkiz2JPHdu1oMgKCL2ErMUM035/ARyihgE0Sw81qchfdP+a7nxQ/71wMjggGtxiu4KrvurwcrHMMQFhG9cwnFw9O99UpxQ2lJQ+4RZcKGLoH/hYfCBd0ehThEYMqso95yCQ4A0CYN+OvT7vocvBlAVmj+T9v8FHo/ttZRESszNP/2sP1lVW8i2ntYlpYWFZFEovokRqMyiG9OgBrnOxrQ==; 5:XzIQlt2Lv65Ys5elpDsRfqlG0+oz7SrCoza/RQNLZes5ZwRJPcW71vNPzss6E+VGriL2t4pO7c67puvCtROW2azvKV69B7FHvPDZ5hxAadI05QDFn/LVrvQZ52/UP0lt8jWSDX8rvsJJPoTFb84Fi8THzkNPDqtaxMQ4oNac8Bw=; 24:CsMhhoyzOMh9p80886/s4ICFunrNugge9hXjxn/OldJUXH4HKE4R6a4pxZE2r1uhxuiQ3XZEG1TFUQO+yKY9/xsxY6UIUmGzlcIViiVcshA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 7:p+TUc/pLmg7VieP8cerz6RS4lWsu8BODpjcMsOInuG98v8h1DpjSAvTFXgHz0vewGltJ1v5Vw86VSW+RTfFZennJnfsY7Ivw8uilFJrWVsZ7uzPVW48wPtKUD6Ojm8pkCfHQG6zvehuwbLQrG0ULp9i8stN+7MthgRn19D5/qeAwFBDG8zojYayiONFnRlWKIyVkdaaLUARXvsPQhDIyWJ6Or6btdFJNgyv3nVaJR4lNHsSYNIDFogLlNTWH/G8S X-MS-Office365-Filtering-Correlation-Id: 7799fa9e-dda9-4a25-56c0-08d5c71f3aec X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2018 17:52:08.4273 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7799fa9e-dda9-4a25-56c0-08d5c71f3aec X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB4191 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 Move vlan_capture_install() and vlan_capture_uninstall() from mirror_vlan.sh test to lib.sh so that it can be reused in other tests. Signed-off-by: Petr Machata --- tools/testing/selftests/net/forwarding/lib.sh | 23 ++++++++++++++++++++++ .../selftests/net/forwarding/mirror_vlan.sh | 23 ---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh index 89ba4cd..7b18a53 100644 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh @@ -514,6 +514,29 @@ icmp6_capture_uninstall() __icmp_capture_add_del del 100 v6 "$@" } +__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 "$@" +} + matchall_sink_create() { local dev=$1; shift diff --git a/tools/testing/selftests/net/forwarding/mirror_vlan.sh b/tools/testing/selftests/net/forwarding/mirror_vlan.sh index 1e10520..758b6d0 100755 --- a/tools/testing/selftests/net/forwarding/mirror_vlan.sh +++ b/tools/testing/selftests/net/forwarding/mirror_vlan.sh @@ -76,29 +76,6 @@ test_vlan() 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