From patchwork Thu May 10 10:13:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 911349 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="BNsIikWt"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40hTc600NJz9s27 for ; Thu, 10 May 2018 20:14:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935032AbeEJKOo (ORCPT ); Thu, 10 May 2018 06:14:44 -0400 Received: from mail-db5eur01on0046.outbound.protection.outlook.com ([104.47.2.46]:10556 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934275AbeEJKOM (ORCPT ); Thu, 10 May 2018 06:14:12 -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; bh=KvrjkduRLngL5gLfohPTCLgpgE1zMUbzTRti8H9Z2KU=; b=BNsIikWtisa4XO3Esz3zd7XwGxKptVAXaLr3H/x34i2iNLKW41cDJIxlQ4gf8zOD5Mo4dkx5EJ4xXIBhxhoEaUq0YGVgUGZK3669ceg1WLPg2EcVS5ic0o7U00x9blNGr3PAfXtRjP6C6gJ5xDHevs8cUgtbxBnjqbYr/FWISP4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; Received: from splinter.mtl.com (193.47.165.251) by VI1PR0501MB2336.eurprd05.prod.outlook.com (2603:10a6:800:2c::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.735.17; Thu, 10 May 2018 10:14:07 +0000 From: Ido Schimmel To: netdev@vger.kernel.org, bridge@lists.linux-foundation.org Cc: davem@davemloft.net, jiri@mellanox.com, petrm@mellanox.com, stephen@networkplumber.org, nikolay@cumulusnetworks.com, mlxsw@mellanox.com, Ido Schimmel Subject: [PATCH net-next 1/4] net: bridge: Allow bridge master in br_vlan_get_info() Date: Thu, 10 May 2018 13:13:03 +0300 Message-Id: <20180510101306.4891-2-idosch@mellanox.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180510101306.4891-1-idosch@mellanox.com> References: <20180510101306.4891-1-idosch@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [193.47.165.251] X-ClientProxiedBy: CWLP265CA0002.GBRP265.PROD.OUTLOOK.COM (2603:10a6:401:10::14) To VI1PR0501MB2336.eurprd05.prod.outlook.com (2603:10a6:800:2c::25) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR0501MB2336; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2336; 3:bMIp5ERiVIdqKguSNQNnwGtK8wm4tHkE9X4EYFybnZvNiR8sgiL9tD/0Ay5Xnnh69k4pA022ZhK+eyYmFwdIUVyRro4/69Rp5OLyYbSIMKVMulROjRzhi2BO7HNzqerlqxSrfG98EPtYWm6LzDI6wi2kJgxQgSBix2bkt54wiLRmMkhlb8q3RkwysSK/Z+3n/xLdhE0TotuiS6r9GGV2/VCAFnbeBK9oMuyDPRj0yAWlXPUDlBfF9YbvuDmKRJnM; 25:BYDXOu+zl7zSS8MyGtNxcKmW9aZR/+d74xkk0K26p8LuQ8AROclLWH+YypncKcBr3p+DykftGOZEQAOy0LTM4qqgFpOpZxLlyUmXmr9oYDeSg3rEmOfsH/bf/oBs9jWV/aXNFTgbQTrma0Ed4WP6axphzru/0l70fB6ak4nSZi08K5dUlQJSD5Gnp5ynHZEvZ37xWkrfXG9W/Zu9uVZAdjeQ/EB5HhMGE85HDPE/jolR1biuInbQzF1ooyNMWL2kUHzqWc5yD/P8uryv6wbohn+9lVYbe+tjeg32Q6DYA/hTXGwd7Kd9kqingxovfPUFQZoML3WKzwPmdVLoxnLKeA==; 31:GSiJSvgAir+eZe5RAVLd7R83GH3iAUz/ajzNAQ3uGdwLvXaERSBEvkzX+C7RkG32RBYuIgykPMBbpDAejAQciYlZlB6fh3Cfjeo7MiMcZOL4MqO124wy8OQ1gj7HxrBzjswJU/mEQJPz+m4Dp/xOLvpRKG+F87YIpsB5BoAQRTv7KdNODH4uFG8VB+H5aCVZ95jrGHYOOQkkwo+1kwYPfPRAJ0e19JJXOtVwo7jr+bk= X-MS-TrafficTypeDiagnostic: VI1PR0501MB2336: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2336; 20:BPorueeiZnlPHF2ajGAlHb3HrGgOB6MTvhDrynefwcCCN0e1RyfVU0e71Ano+++I0WTHPJBS1lOOjAqIjcqBiEhI53NAwgO9IvoPCTk0TkQCa06ALAFGOtHwR3Nvr73yzldJOuj71ZFROpKFbIzNe9W3JbmkFNXsjO/Oap1vnPHnKaaK4uH8Y1poCNHZzEr3VkzgTQGev46D4U3LH57R3NgFrmsE0BT/2GOyaGWF5Sair13cuNCBMDqelP9+UMGdEeIpoFp3PddVMhASf3ym+FW5t5NXEYvwZFuA3ATq15Jwrm/QKVCnUYk8sdU+zaTfinvnmBeTMadIcvTjrSzUSQFIeTkTNH8uyabRfohjKoCms2GiCH6TilhLAtjux1gRj4p7xc39BYeN0y/E1gKfoB5s+C+W372o4pLmuzPUSzQ52+CLKjW+rPatpuoDfx+kqTduLweMgobTCDPcOpq/34kxqPs295l+GdqXg3xe0ARWg8wSJd4W29DyqdLbD2sx; 4:QgEZOB2h+EIKBqxRzMVp/Gd7jfLqz7Rc0eYGREbAwvs9fplGDnEosdehgu1iEIQhToVImJHdiHLbModZzA3DYzvnQrM6B1zu2B5orpoOhZAEV2AUm2aH7BAUOlimc4LhbfLdQgV1psKxMGyzHD1Vr5Sb6xJwf/MBJsfIN/dQkHJE2MJF5oXFg6soL0VDVXQaQPZybe35E++dfuv0cJmC1In3FOg5z6GQybRTaz5BZu/qSWq0Tl9hhAnVWsN/42cWIumXwok29Ouevi3+as1P0Q== 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)(3231254)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR0501MB2336; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0501MB2336; X-Forefront-PRVS: 066898046A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(366004)(396003)(376002)(346002)(189003)(199004)(106356001)(86362001)(97736004)(6512007)(53416004)(53936002)(50226002)(6116002)(68736007)(47776003)(6506007)(76176011)(6486002)(52116002)(107886003)(305945005)(8936002)(105586002)(1076002)(4326008)(8676002)(7736002)(51416003)(3846002)(6666003)(25786009)(36756003)(66066001)(16586007)(2906002)(316002)(476003)(956004)(50466002)(48376002)(81166006)(186003)(26005)(446003)(486006)(386003)(478600001)(2616005)(16526019)(81156014)(5660300001)(11346002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2336; H:splinter.mtl.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2336; 23:+2FJcI2RXb44tLsIWdTuBjF1nX5WZRlf5slzFCwd8KPcJMlQ0kQwEmFQP3R/gXeEyWOvmq2kmfcIkY+a4kJwsmtCx+sEkvqVFzDUvT4SwA0FcMnyMvqjdlx3BO7yEY5+FgCktVEqlAVQrCkFgAeJnxWHQ5Odhf9pjBJviIFS752nRflw+Ydl6gAIjl8dGTY7ks41Jz2l7VL2QI5qS0p+1boHPG4XWl6upBAex+4eNtM0KzMREtL4pQAaqyL6apLf+lGCY4l7IRT+R7NNm5u4usLnzuCxqzW6u21D1SicsLM9QE5eaKy+FCA95qTA9mO2ZVfJt5u8cFHyUSRhdLVs92wB7UxmVav1G+l4wsYagdhoqP9QHeDadomk7obE5uxhw5ZTaj61c6a0bSk4BWEu5/lAm5T00BPyxse7X38B0vO+ad4AmdGDt8lqM1683PQkmKKMZtNq1Bo1LA74yYNAO9eaSWVArzwwaezkCxi1DEGAxm180/9CzL3kbKIDR4iGHTDxqf5Z6dbkbnOr1lyI5dZ3KCgnXl83ycRliUSDFReU2XUmTzoZtNBl+Bzm2ATzyGIhQpOUdjq+gW55qMHpbsBIcHgqqHEg5hjVBt38K8w4H9ZhDq9lRgI4E6ey3Bds96rElOlJwDma2qHfmaENY1vgNIw9cI59VjjYo7CxToN+up0uAcEPlpy8d9UrTrOjJCNJA5AzbNdQU5hnqPjgvwCyYhuWrRyNQtggDkhnZca/PWsizIcvLVwfPOvPQgDHMRxrbSwUWzhTyCnYF83OkDhsWzRCdPIg9K2oEstmKlpX0E7RSMXy0yc3HIGWXF0Fr7Rln7wMNLBrDmJm/30kW0fE1a5yb1j9oIDDnDWD0JtaKqFFz1taewpJrzkZRbOOyUqAgWsiXPA9eqFs8HFB8JVr86j5O1yDCAyKL0euenBJ1cszw7oI6RMCwx8KItpLE/qZ6ZIGIYTq6OaGvh6Z1lNmDXx51nQXTqekIs1krM61ESABb2gah4I2eBv+Z2kpp3NtSJIlf7dfjDoRq192bUDPxSi+bGt61mA7MxwC/jhbgp9kQ1vAKRLyuT97PWBNNbTjDbJSxzLQmaO6581Q3FdT2xscKwxwI/1WuJDRkm9JpW+l/ZdaG7jmRA3utmSqTF6v0KpNCVxhLQGva5IH2NPZ4yXM0Nqd+yfi8rK9nyl6rjzVvlQZwjSVzlcLpEfij4BdkCR110z40EpEntBXGQ== X-Microsoft-Antispam-Message-Info: PDNoeQpCodoaNsW0YvopDcn7mP7J/Ew9o+guCLfAGJb/OEeTYatnY/Z7vakZLE3zbbI9dCHaCR0R076ASaFT6HmKZoig4tYTOfCuXIxlxllx1RBRX0wrhqnu57wFp/Q4mN6jYHSfsekawlX82xHBmu6WajjUXpLgLB5Ru7QBVStdYRTUNUx1yvhJmDRTpciM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2336; 6:SSvPcZNyM1wCmZkCjKKaWbAw3ucd1J3sNrdFgXqKb4uSCW/zv6fUY7E17RKYblQ8RNM0sMvBXbNIKkI3z5n2AVmXNVp6cSe6eWWSZpFVhZbleU9E/2MNWSWU/ATwvD7YwzdEc3Wbdg2S+MhbfOiI99+ippqxzAj/PiSKMkH5+RIXsmlRQLJy37ibJEcpiRUTi2+4xf6gsMwi/2+MEIFAO3ylcXAmEimNtbyReInDw+0GDIepWYjRVYTJzaMF8KKClN4ZMGhGmxEE7NmtpUmdxj2JjLlA06LpQUg/5TedrQgAnbCi3bDFS/vHLiBIXDKt+pHvi9VcJWT2AUW1znaIQJrZNiCpB92Kn8LEFE4eGDWbyFxs7pB+2rX4aPVmOYiTuzC+0syg+JyFPo0+PZ+7/Cz2K3hdUFVh9w/QOU8PEq9SdNK3sazQDlqkDren+YY+A31kDMGn3LB+NuVzPLFUgg==; 5:mG80uTgFjFYa+zKizZABDflOakl9wNsC8EMYgwQK6vQMOY5FIzpWSqLLpN78ww5mSMAWadIxQFFHQGVMAVKd49gbzz/EDiusp2wYXZ5rSlvwp6kHY+RkIB+By+XES7Vz2m3QKwmD/ISoDw0lbMSdq1/sZZpqTy2V1kMXNsyDPac=; 24:pJ7UEmp4/2JED3Vm0gVwIRgyUk85+tpzhZaAGDQAfGhxPobmBlsx1+cJX+hxW98Nf4oYyyEUokL43dy3/F8QcPb7LGQmVIRj50/u3MfFy28= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2336; 7:Hp5izo4quZ7217TdK4uudMkKq3o2+X5AI5KxYYfDvJsRKRkhdGZH/7lPkjEpG/NcZlGawGsbpcvB6oZyd+yXe6DKFNKzdCosUqEPPxzxjWyDSudHrnHdKhAyrOu12jADRXJ0HByfeLCn/CvXmARVdWW7VBIJp4dSNlaadI9yGzS5UfHrw/suUHPsjouNdzYb60ImLkdwHI9aPpBZY5zfk58mNCfFjyibMCT8X/50KnDx9A6M2tWcaF/16bH+9zlu X-MS-Office365-Filtering-Correlation-Id: cf20889c-fc9f-4001-3b4c-08d5b65ec47b X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2018 10:14:07.2384 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cf20889c-fc9f-4001-3b4c-08d5b65ec47b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2336 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Petr Machata Mirroring offload in mlxsw needs to check that a given VLAN is allowed to ingress the bridge device. br_vlan_get_info() is the function that is used for this, however currently it only supports bridge port devices. Extend it to support bridge masters as well. Signed-off-by: Petr Machata Signed-off-by: Ido Schimmel Acked-by: Nikolay Aleksandrov --- net/bridge/br_vlan.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index df37a5137c25..dc832c0934c6 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -1176,6 +1176,8 @@ int br_vlan_get_info(const struct net_device *dev, u16 vid, p = br_port_get_check_rtnl(dev); if (p) vg = nbp_vlan_group(p); + else if (netif_is_bridge_master(dev)) + vg = br_vlan_group(netdev_priv(dev)); else return -EINVAL;