From patchwork Thu May 31 17:52:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 923516 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="Rs4beM3W"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40xZn23XG3z9s1B for ; Fri, 1 Jun 2018 03:52:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755958AbeEaRwu (ORCPT ); Thu, 31 May 2018 13:52:50 -0400 Received: from mail-he1eur01on0067.outbound.protection.outlook.com ([104.47.0.67]:48496 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755945AbeEaRwp (ORCPT ); Thu, 31 May 2018 13:52:45 -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=vWqA8n/CK92uExLhKtSxAODsDVoObGNwLoUQD3HtG/w=; b=Rs4beM3W6TD+8xTeEqk9f+E5vUCLMlzO7bex2KHZgciyjMpgP19gg0FgAP7W4MpufGNBS21W+8TsZ7VXX3IVI8OpnsArfZWz3Z26rZog8i5Twb+T7h9IUsFzN8CKmCS8FEHR6f60Qsp9xeSRQCvWZlkhQTAJcdAezUP0p0EchvM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from t540p (78.45.160.211) by DB7PR05MB4186.eurprd05.prod.outlook.com (2603:10a6:5:18::27) 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:41 +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 7/9] selftests: forwarding: mirror_gre_vlan_bridge_1q: Rename two tests In-Reply-To: References: Message-Id: Date: Thu, 31 May 2018 19:52:37 +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: LO2P265CA0074.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:8::14) To DB7PR05MB4186.eurprd05.prod.outlook.com (2603:10a6:5:18::27) 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:DB7PR05MB4186; X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4186; 3:y+ELieNMlIztO25z6T1f1GVaqoxIf5AgWRbD7bUec9AWdUfaCERLDcbtzkpNuJaMw3tZ4ANiH4ACMzgfa50RsQeFuaJ4lm8SuMQFt7Iuvz+tNBnMYyRb181m5KSG6okU4p9n0/Qs/IQjEuubizsxrtbHjnZTvGZFwB/TlSU05ijr31k779d7pNS1PomkNgpzxcmapGppvvRpAixVCK7Pc2rfrszJv2iRIi0hfUVVrWNJRFKsRKU5GlS5CkR7bB3e; 25:ZkHjARc1h5i8pGz+6IvlDyA4nJi531qinv0PGzdlc0ZV3OQfXkDgMTUx4toZhONIIuKeQSg8+I+ZOk6CPsL28NbuDcGHrg572OuLObYARpSRKIieHkDBej4QKD+vSuG399Zj8MiohS/+PkSjFgulzkj3elGySOENhYym8n6jEdBWi09XQ0g3l8IITsc58bXcrmDs5N7zer+2qkX5/WOXEWUrrXPZbxjPkP80uecOITA9KiSJhIQuY0BYGiROUn0mYDfythaa1op8ZE10Cr8juTuu3uJTT6UT5dkO+mqrzPT1c9jW4REsiRFry0j/RRJn0c61KYWdU0QlmqQnSiywhw==; 31:sY7MMDJ8s4nl/Jt1bweayTKLzNR1UIdLGHXlwbfMkW5eJfEAEu3ANVNaX+C5PNDRClgwXZYmBTDwGr5uuQq4iStI2wveAOSjvCwlbKzUqKMNzbU/izAOtNHw8vIMAsLjovp8DO7ByJ4oTlz8blmqrKGcFPkcnVL6efhiFPAm64dK1RMwNp5qFk8T36WiqWpS65dYQ2DNBG2SSma2eg6X81zgjXMqx24nCK/2n+ARVwQ= X-MS-TrafficTypeDiagnostic: DB7PR05MB4186: X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4186; 20:+fLxp04BFGZFvfOC+8909GTuZDGZZGJK9KNqW6G4s1wwRmSPouUzCZENeRT5fVJ74aD3c4+b8VSxPshs+Aw/VCFaGFCXeXGp2kI9SnOllD6ebO7zTgTkldl/1e+gOPVVuRlNuxaKlzGCyInC38qtXDS+iXmrm7n0kTgAH8EOeO+ciUJhQ0UwHJy6vht9qqMUGEDpY6ONshbTxqF3jFSqcxiidOJEWqqTVJGcW2fuT3E17ZxstALPWdQB2mMN6CRlaBjOEng95tVBuUuMnF132XQ17VW2Q0hQod+2mOsNqRzBiAqVfiJ5qAVbm716s++CDMbXeySz3Drq/Bjyz79d3/hS7qpLpIAqBI5MeTtzVYmwtUv5H9ydHR6X1l0UeGG4QsK03aWOCMeeI5P5BeCwziXyyoWmKQJgFzhz25lV7498AYgl37YF3cexEMiYZRSz8d+sFyIQKcCj1pN27qqPqieJDn7YIfZpa9J3DxljZSq/+1GOq4mBwfbAVkMs8Mf1; 4:IHLV0DIcO5ZqCHtXUiIVCOdHr/mcEmm1wxmBuUHeiMjRJgVza+j5cEOXvHKaOpdgFJSeLw8Z8xmxueCZRLNc5/1XwyUlxvcqrjqffU8Y/nvEKSZn5YDQD18J952LitOz+WLN687PXkZfgBbqMhyz6o6Wdv58cd6Egk0Sjl3qhsTuQZWIcfPmwfximA2XS0kX91BGc+38MY9Ag75Vs9V4nx8cT27k3QOM3BgaabKovXT30Nue0jk2s6dV8xD+TYfFu98CJ1gGAMTOgf5A2ck0SQ== 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)(10201501046)(3002001)(3231254)(944501410)(52105095)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:DB7PR05MB4186; BCL:0; PCL:0; RULEID:; SRVR:DB7PR05MB4186; X-Forefront-PRVS: 06891E23FB X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(346002)(39380400002)(396003)(39860400002)(366004)(199004)(189003)(8936002)(6666003)(8676002)(81156014)(81166006)(4326008)(105586002)(5660300001)(2906002)(7736002)(50466002)(48376002)(486006)(316002)(26005)(47776003)(2616005)(476003)(305945005)(66066001)(68736007)(446003)(11346002)(58126008)(16586007)(86362001)(16526019)(956004)(36756003)(118296001)(106356001)(52116002)(51416003)(6486002)(386003)(76176011)(107886003)(6496006)(15760500003)(53936002)(97736004)(25786009)(478600001)(6116002)(3846002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB4186; 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; DB7PR05MB4186; 23:SSi+qmDP193BMYBPzKksw8L1aVimcWFSoN/kYAeOddWR72jIs+yOZOY/aaHqxLpc9BDzN84Ud0o5MqBIHaZF6FpwofRsGk+rbWna8LsvqDblZHIcjBw+Zg1G/61qQeSiYfaxsJ8KIS6w+IwsPLWNG1n5fGdM4IvzA8WVUP+QWilp5x2CzEWzW1gTCJR7YV/ZaKM6ihJfjjBpOz6dHvCdOyZKcrttm7N03iZa/qsVeI4raePdNuBW8wNR08pIrMUAoKCirmOOAgCE1emiluaJEhTgLm/OdPqLXIhFamkpRi80VYEsLE12rsklGN2L0F88ie9uS2mA2UayWdzZQivq25Is8/NKhTMgl9YGueaf99FJDOf/lSj7fYYaGdk/qN/LgE9z/loG8kyxgh3JH89ceKcD62o/prUkuoZw90b5jeAL6K7yyD+xNa/dYF5CcUkQ0LL5dV0xs7F294LTGqCCUrPTaHUZRbONV7lgigOMhocaH/1PDgfETHIcn+U3NvPXgfTvKxGnpB0sGDgZxKKHmVL2jYQr4ZxntMaIZDMxDUZ4796sktUhxhJ93wMGZ36GgyAQ8fbaMOcWo/iBWzeP1ig/Q3iKrzw0esFLkM4WirHmDs9rEG5PhRsEPBuVKl1LHqNGUrcvRjKtN4KQWWb4iK5lcpWx7iBmhe7JoFD8gnpt/03LnP0d8pMwIrWrTH7MKqeKS8aSY4Y4itWSp//rQZqKDVLjt4Xr2At6M6GRgZpDHaRHFT03ok7Geb58LAm7dI0wQVfWT2hLy+ay7zx/eYjWaoeyDeKsS2uMylrTOrhEC2kql55R9vDPA66j71RHtAfJcvYcsW907Fq5Rzk73/C1GeiXkQiLMU+na8tkjuP9yYFHU7Yd2hKAfY4DUR29o4bVtIKGaxBGwlHEnO/g+bcHCn9Hh59yfpLzWwyJj/ogQpk7clc50VGsNYwK+CMlXCQGL8Tvt3TUsVMCEWvUwCl5R2KitgVNo3TdzVZaRfxnbKIfoDEWGJGGPbq18RQ2voTy5xRx6ubHp0lyobdBcFIaCggrN9GL3N70+SiwTJMaRMj/kr+e/1fnOroQRFSbLJIVuHoURCRlcNfc8o1pWsMfGBemhyHgilgej+Je+ZXBhICcpc5Ey4YU3/zv81KXMTrLyEARlIQ+NMYOVisyrZtDw2iM9jmso5Q/K3bTzco= X-Microsoft-Antispam-Message-Info: RNHqBzL5pZLFEMmucqfN6/hgTbFRPT41uPmlbOalHJRKDcJ5JAe4GO6FqeyacGHPjSoOUcm48iSzMajJluujX1MffPwkT31j2j4NZkAhs5DO/d1NtqY48gEEtRaz1/hL9EVCsnEYkmLfqGFk10fgT49TU9aS49JPXtwk9dSWRpsYFkQ3mrmyRcj+qJ/EDwX1 X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4186; 6:4gc2peirP3cUwfgzIqHcAMtDCtUa78poyAt94Hce5Zbff630s1GMjkVhJMCkg72MKsJppfnGSYNIN5nZdSYNn9XHAwcAJU2kkHXAmek14YcPp9l2WHJnDa2IodoJEXaYRpBj4czcKjDxGm5H3gnFgUCAr+ZfmMCiP5X/G3PkOruvDa13Lc/VggN9YprsKw4H2/LaOEdy5nhq/OyPFJOgEbQPgKr9dyYK+FF6vQHTMEw23ypNs1O8G8Lglj2AVfpRB5oEQ167qlSggXaGWlqVyak8XSf3FLPBMV+ErQe+WZLS2xqrHDTGeYBd+jF5c59Mm8ejAq6tx1uqprRIeMf9vSyrFLq5G1jqjDjNarrKNS1KYol9WHgDtaoHCkEZ0VlFczh0wq1Nj9jA3sZJr1LM6O6eiSKr+g3Fn0Hp5GyjaXNudpcJ3E9rrU2ACa8LBepMumjH5X1T6KhMZXEI9shHaw==; 5:UPC9EyOMs+6Cx16TXWcJOWVG9/3PLWr3PktXn0IduGqKLp4khVHCYw2f7k0JpfJJwXJwOAKCH1r0p7Gqa5r6lQm27BlDb1GoQMav7FEVQQ5/5AppWfZ7acEr70hMy5kBzVegutSRaPewYaqjYPmXMqNw6X+2XbdtTBRKDbnTDY0=; 24:Wku8ZkwAopHiAtOd55l3+XMPKcNIOfX+70FbLov41FUCPomdFNqudT1p3jdDZNGaUhU6TpLahxqfFy6wOqUV7tb672DB1Og3bFtosPJuHSk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4186; 7:u1qSnN3m4gkIMolGAsozjBdj9yYHd4WK0W/ni+dvMGPlZ6pvuLaNjfQELA/PkXMRFzXphF2wY0+qmOjiX3SYGHRqRmWlly+6T9N3+1xtBxc/ug2q77f2bDVNuavsLkNR7EUi6hvdUwLKv46CCVVIYDar25coQrAveIPz5JMYUl6ixYSVIMQZkgri2meZiz5HMqwCX0uCpmKlIuShSWNNAs/X38KulQ8VbmSkf6ciqoub8Kx+NPpvi8lV06+jTyK5 X-MS-Office365-Filtering-Correlation-Id: 6520180f-596b-4361-c03b-08d5c71f4e94 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2018 17:52:41.5640 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6520180f-596b-4361-c03b-08d5c71f4e94 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB4186 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Rename test_gretap_forbidden() and test_ip6gretap_forbidden() to a more specific test_gretap_forbidden_cpu() and test_ip6gretap_forbidden_cpu(). This will make it clearer which is which when further down a patch is introduced that forbids a VLAN on regular bridge port. Signed-off-by: Petr Machata --- .../selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh b/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh index 0a3bac9..d91b347 100755 --- a/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh +++ b/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh @@ -10,8 +10,8 @@ ALL_TESTS=" test_gretap test_ip6gretap - test_gretap_forbidden - test_ip6gretap_forbidden + test_gretap_forbidden_cpu + test_ip6gretap_forbidden_cpu " NUM_NETIFS=6 @@ -77,7 +77,7 @@ test_ip6gretap() test_vlan_match gt6 'vlan_id 555 vlan_ethtype ipv6' "mirror to ip6gretap" } -test_span_gre_forbidden() +test_span_gre_forbidden_cpu() { local tundev=$1; shift local what=$1; shift @@ -102,14 +102,14 @@ test_span_gre_forbidden() log_test "$what: vlan forbidden at a bridge ($tcflags)" } -test_gretap_forbidden() +test_gretap_forbidden_cpu() { - test_span_gre_forbidden gt4 "mirror to gretap" + test_span_gre_forbidden_cpu gt4 "mirror to gretap" } -test_ip6gretap_forbidden() +test_ip6gretap_forbidden_cpu() { - test_span_gre_forbidden gt6 "mirror to ip6gretap" + test_span_gre_forbidden_cpu gt6 "mirror to ip6gretap" } test_all()