From patchwork Thu May 24 15:10:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 919930 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="IkWmFRwp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40sCWS4t5Qz9ry1 for ; Fri, 25 May 2018 01:11:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S970824AbeEXPK6 (ORCPT ); Thu, 24 May 2018 11:10:58 -0400 Received: from mail-eopbgr50045.outbound.protection.outlook.com ([40.107.5.45]:26848 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S970809AbeEXPKx (ORCPT ); Thu, 24 May 2018 11:10:53 -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=4S70UcvTo7C+bHXkqxBW96TsehXd1p8Mt5A63GNR6Fs=; b=IkWmFRwpJTjEngjqUQKYvTZKe9x8TdJ7nD9dGCm+Np+ivR36lugUA3leO2j8HIzCEqvnBqJGe9w9s/mfFT7RMNpQ8qaqRk4C04COoTRTx5t8Z/lJKPx8aW4qDlfMB4YsiskdYlThluuXGoPfb8n9BIL3gGUermA8i022eKwst2A= 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, 24 May 2018 15:10:49 +0000 From: Petr Machata To: netdev@vger.kernel.org, devel@driverdev.osuosl.org, bridge@lists.linux-foundation.org Cc: jiri@mellanox.com, idosch@mellanox.com, davem@davemloft.net, razvan.stefanescu@nxp.com, gregkh@linuxfoundation.org, stephen@networkplumber.org, andrew@lunn.ch, vivien.didelot@savoirfairelinux.com, f.fainelli@gmail.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next 7/7] mlxsw: spectrum_switchdev: Schedule respin during trans prepare In-Reply-To: References: Message-Id: <0c5c58584f95d814999f7144365b37334d1c9c9b.1527173527.git.petrm@mellanox.com> Date: Thu, 24 May 2018 17:10:46 +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: LO2P265CA0126.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9f::18) 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)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB4186; X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4186; 3:BepKmwGnnvB+nw+FeebDe8kWVk3jrmlYimjMLce+azEYigc8RuYCFR/4HfjaTur/o6/z98wKvtVpXrRKVqK9l9sujfVR43paTefh2woZ9CzFEJfgea9zyvSgstLBRWKtQ0GEJKkFAWO0cxnDLbX/sDX4pZYvcn8V5GpHfTUmTVluJjSeCfDYYpTS5d1BU8r0pHGWF/E9n9nhqu5Kv2BUMrfPN8gNM8ww59rcDzEFovK6mBhABtA0WZE431qQ8GcG; 25:TEprMK0WZUwbrHwAskA3wMzOoYlDGup2i+R3JrM8rVksEO6J+3jDBUVUL9CbPGpfUEtf3aS4HexT71YNkRtdEWEeSBSZeXnB6soHjuWj5ENRYW6DVQUqIgRP6CLzl0IPETBCs5M56U/+pVfaCs93pzg7Fjjt0X8QirG9g9p8g+UA2naKVRGNRBV4EEkXbVAMKRcqhb8kW4aOMp5a+fYpzaCHFYKEFoTEOMOOiOEWXegelK+6k/TGOUe1E62/WjHtkyPf01sTMRwiN2VJBUodcnNginFdCh0o7mCIICc19bzmhukIA5KHfqtyPeuVegLxjWT7d8K/OBaP09jIeY2GMQ==; 31:7yBDl6EIvBP9JQs5g0GpQCndt5qjFaNArpQ9BUPcU8rsqS+aPsVdbuWQAMvTSvba3z9HY+qQ/gQfb46ycbQvCCQN9yncmcCM5Udj0S9pRnKOUijExVKUT61GV4xmxYkCDlA5wOtECuvApFc2OQZio9oHGln/XCfwX59OfmWkg9988pmTmV2W9aD17ysm5/ZoQirp563ALzugZxgqeEK1yt8TkDNQ4RMiabfQ7wVtW6I= X-MS-TrafficTypeDiagnostic: DB7PR05MB4186: X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4186; 20:/uu0vw9L+TZ5FXgFKvK3+Tt41LVSULIecvlGvoN1iSuPHruZB9ouqhBoUKjQep4XQHOLzyeIwV585GYn/QJKWQFU3WG14BOw0np6pzsPDrTdHCGxSakChmLhEOnloP1O8qWNjVjqt+2FLa9qUGFv8URbv51epk00OitaURy4zeMMfgKNWtZGgL3BIglQ7MkzE8H070iwdDEGGZMnJqWOipjBi1R+FNENfih+z5nxfVolCkDoKdhBEs4Bec3mCkahaiYPpYq4Aeh9t1NchPUgPwH+Bq31Wp+vbJcHeiAdCZFCt+lPKMdYiYKdna7mZJ+2Gs/PMY+IgoTAm9o0o4qsTNZOwU5weW2gUF1I9YCy3NUSnzZLr2pdZ/+TR9F1h7Hel9bTm09nOdkdz/SL20+U5fm7mpQwaS5eiVunO9KkfCQwYi7/XF7uzR7Oc6RA+QzhsXLIZhr/TqOpRDs9aS9l7L2MBA/liHDYdIag26UYu/4dVJgocY/J2f2uXC5K/oNG; 4:fE7iE38255AmVqKqUh5e+Rhe2yTAQ9uutqsNvvRyPGoQXc/HAtTil9N8KctIIXWDQ3yMDV78sX/0YJtGOGhur+NX0t+Sa7kiaf4tlVy/ELvzxhPDt/Qievj8wRbdJPrHLrTvUd9r+dzQWiu5y6JGWilA2kxX50Z6+WCSepylNkcrxZifUbCfNGC00uhS9xtzAAAjJRPflLk9qQsqWVyIM9572oZSSbRe2pZ74YNCTS2o4Mf5qFtbnAI5rGjpjrsqB2ZBnuX8a/kXC/Z4+xhr9A== 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)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:DB7PR05MB4186; BCL:0; PCL:0; RULEID:; SRVR:DB7PR05MB4186; X-Forefront-PRVS: 0682FC00E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(39380400002)(396003)(366004)(376002)(39860400002)(199004)(189003)(106356001)(5660300001)(3846002)(6116002)(8936002)(105586002)(6496006)(81166006)(81156014)(8676002)(386003)(36756003)(7736002)(305945005)(6666003)(6486002)(52116002)(76176011)(68736007)(51416003)(26005)(86362001)(478600001)(25786009)(118296001)(16526019)(8656006)(50466002)(48376002)(16586007)(59450400001)(2906002)(7416002)(39060400002)(53936002)(316002)(66066001)(186003)(58126008)(2616005)(956004)(486006)(97736004)(11346002)(446003)(47776003)(4326008)(476003); 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:qRKrF8ZKfMz01lYwqsZtCOrRZZC80Qp7Embuzayx6LqwPIRyL3c/83QLrGG/MKWbKES3cMqWA9+9q9VGZQSY+LSwaXcQqLcBPMepAiz00b2T6eGj+6qaAJromwuSdZj2PGAXRPHZ42ceGhj3z1jC1bHqwPBT17ylTUEaybvynf08AYQdeo797ooWN+p1WKubBIsyq6foMvsQgInXdhEfyDYUsbv+7OUdVy0u5pM6uP0gfmjCwWpZuCU1sSisvx++0kieko5uGG4qikTrvCOgPgEd/j8LyadZSInVUQlYWKDgB1gm0///deVqaOaLiUwLXHgN7mB5QCQemBOIGhD6SZjFhYHdPIlzoPjfaUEBEL/Xs/dSC/lJOSRcF16RpBmCQNs/iueVGhi9eJ9oPM34F9HIDtZZUeD0vUG+AQja8iOl9ZkBbDK0vw/GRhrbkCXzqFuESuNV61KmPX+GeJdlFUc1+PxTN5esoBgeFXPxl3wPaFSlbiGWabOiMo6ScyMgHIFu5MrvRU94KP1ayzEsiVWhTaV5TyNhEXWWu5KtYbYmvnZ2LA3NfE9TT2d2ohBNCPdgD0+QPo71VSwYcW6r5U+QEt4Sa4mSpG6s4xqNlBXHKOranz70Wgp8AW0n5+WV4HoLKLb3rNKBjLSY5H88ME4nziLd49xqJmEYlhesl91PqdWnT4gQvlTZKDN6SdCTk1QMQPLJAVxacSP0VhN5gahXsnPrSU3OLJpYdqH8vZTVv8r8iB4Lius20rDPeny4gqPEe1e22yVNF+365U9OMRjQYX8wnTV1AWPIDhBcPnLYiePUe6JJlmAoqgEZrxW620iC/VBBWLsKPubeiOyW2HtMOd43T+HIN9wf8heQwLqkEPGHWNUH3Cm2slbU4c3wk9VMDCl6XmIk7hatURAunnZsyKTpJNbuSQ9KbdcOUMMy4FYG1tmUSVg1U5NdgFdeXguGzfrAxULpCTJU2xqmriGnKk4LHSXvsof+ckfqyI4RkCKk0WldH3kmSl7xXy/Wc7mBMtX87sMnVyRQwvA3gwmgSoG9xKQ3o5ZB0vxU4Wppuq5SBIbpRHNUjJCvfMTiSLzClSLdtwhGmAHNP5nIWLHrNEpMCjc75cN6Wv2tgvORo0g58b5cBfMPmnoJqVE1Oui3kImnSB5rl/Dgr7TaLxIuT6hRjfWOCyKdlcFIqTMGieLzhdMgBYWVAt1tdkk+G14hyPL0nh0uo27u/2C/AZQ2/N0LVAIRSenG7frl8q0= X-Microsoft-Antispam-Message-Info: ARuL7ZQyGwX8r0a8mLwE81gDySfqLb4eq7nWXK2VWP05O4BKBQugEv80A3WJCcN53IW0XIduwUoQnj8ysiMOLWHW4KCPUiuSxOh5ctcn8UBuFuPFTCGr2Qc/f8y1lYhmpWSRE8m2TklLuWa0JCFB0QvcfpVgM5P8NTh6zbkXeleGfZLX23hBikdwFl8xPTS7 X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4186; 6:t0ZOcEMPW5iWlYpvPPg4GjaQDT7XeBjDU+dlXV2A6589esQDvUUVKGydc/WzIU4N27J+SC7qCI7VhayDwIL0LCjmnFB5mctPmf6RkqII5sRFTKh5dPhdON6mljEAHJkB3e0YbJzk08IERM0shDKy7ZvCjVE8cF4dEmiaBDeT67Ha5v8MoIjz/aSzlm+8NTKkO/l/GqUT4PuEBv0LzfCI5gef1pzcBaImcvSbqAR6H499f+M0SmhElXl85tOPcJMbWRVhoqRSYfjHyhE5Sr98NbXnf63BTycNIcrxdpSJzPkjeesmXcvtEUDbjgb1k4MPnUB1ma5+Sz1qided+QgzEjKuATfz0CgDe24atji2ckTrUTxkB3ox8VVDP3rS92KhLYTvh8sEVAY568D4nqiVpfJybMRHNSwEIC5kDe8KYNIo1AOeRteyarhD+OwjA3Z0CguLKGdI37OSJcSPdscevA==; 5:seGLK273qvhvYoP/ZxswwEspVx6pDjVS8REuBOeGwsF9Y9vEsuqLglb7Bn5PrgPwKUVJY0k+RKjAE0GLR3qFHngZiG1dxO/jtx9C3rsE0NneceS9G3nJn/N5PSAMeXX5ivMGySkhj1IH5HBo7X9mj0yWDdW+AWt6878KZOx8AIY=; 24:s+xkR3D3IJvcGHqNJywReWfTyONOYIS8g2O5AOCt6HL6ImxHyqvfTfSdyAWgWMKX/z1e95G6ZbcGUij3YsTOFwYDzLlHxEbv2yKumDpZFdg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4186; 7:OEDquoMsNvYI6gtQHWV90palhRxpFYQRRRhmPC3XFLFtFRyebUuUKjbR4LLcsLq8tVdCn7TOn3rBZ7nPZ6KiyA1G/OQ/SKilG4k7QCeOt1NxEuEv0eGvmDZJIW2WXjQoB+XwCQ7GcA4uiKCW96OITdPzz66OgGMThDctNu7CO0hChCw2zhKW8H8tcAnjEuAQsJ48iYbQyIbBvFF5Q1VkDEuUJQ/PVj8NEtDp8O+05cJ2Mw8mOPesxdCRwzVF1AI1 X-MS-Office365-Filtering-Correlation-Id: a7e79396-edbf-47ec-529a-08d5c188895f X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2018 15:10:49.9888 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a7e79396-edbf-47ec-529a-08d5c188895f 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 Since there's no special support for the bridge events, the driver returns -EOPNOTSUPP, and thus the commit never happens. Therefore schedule respin during the prepare stage: there's no real difference one way or another. This fixes the problem that mirror-to-gretap offload wouldn't adapt to changes in bridge vlan configuration right away and another notification would have to arrive for mlxsw to catch up. Signed-off-by: Petr Machata Reviewed-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c index cbc8fab..8a15ac4 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c @@ -1697,7 +1697,7 @@ static int mlxsw_sp_port_obj_add(struct net_device *dev, vlan = SWITCHDEV_OBJ_PORT_VLAN(obj); err = mlxsw_sp_port_vlans_add(mlxsw_sp_port, vlan, trans); - if (switchdev_trans_ph_commit(trans)) { + if (switchdev_trans_ph_prepare(trans)) { /* The event is emitted before the changes are actually * applied to the bridge. Therefore schedule the respin * call for later, so that the respin logic sees the