From patchwork Tue Jan 8 16:48:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1022040 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="ssGAkcby"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43YyrC44rRz9sLw for ; Wed, 9 Jan 2019 03:48:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729080AbfAHQs0 (ORCPT ); Tue, 8 Jan 2019 11:48:26 -0500 Received: from mail-eopbgr50086.outbound.protection.outlook.com ([40.107.5.86]:21248 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729043AbfAHQsY (ORCPT ); Tue, 8 Jan 2019 11:48:24 -0500 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=6V9l50vvmQhSQEEyH4rGNx08C0UuizNqnDgmG+vQIDA=; b=ssGAkcbyAKlHQzEGVoph3HOCZ37NuqgzuKBi6v4g63qUZL3gscxP3s2AUnsdFtiUUHDNCjxgu1JwzsizCA0p1e3hVC97uMOb9fXF42X/EtarbpMChAEYNKjrnTQfl6mVHYIxmi8oXqo+YWveNaO83ApHGpZlpS3zmQs0Gpg1cMY= Received: from AM6PR05MB6056.eurprd05.prod.outlook.com (20.179.2.148) by AM6PR05MB4405.eurprd05.prod.outlook.com (52.135.163.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1495.6; Tue, 8 Jan 2019 16:48:08 +0000 Received: from AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f]) by AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f%3]) with mapi id 15.20.1516.010; Tue, 8 Jan 2019 16:48:08 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , Petr Machata , Nir Dotan , mlxsw , Ido Schimmel Subject: [PATCH net 06/11] mlxsw: spectrum_nve: Replace error code with EINVAL Thread-Topic: [PATCH net 06/11] mlxsw: spectrum_nve: Replace error code with EINVAL Thread-Index: AQHUp3HvFvw0fusDaESgx4ncnmLWsg== Date: Tue, 8 Jan 2019 16:48:08 +0000 Message-ID: <20190108164732.4024-7-idosch@mellanox.com> References: <20190108164732.4024-1-idosch@mellanox.com> In-Reply-To: <20190108164732.4024-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P192CA0024.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:83::37) To AM6PR05MB6056.eurprd05.prod.outlook.com (2603:10a6:20b:ab::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR05MB4405; 6:mGJcnRC/da4Bhtt8wQvhgwv1nGX1cKbFXm8/TKpQ5PgEFPg+lN5hIxehJVpUdl4sQyuLOpA//JdxcVKKC/UHjXx4fwClkOM5G0VPL31JAdhYB7Sxno0GX04uFLyVGF9LVD0dfU6t0Fga29gPshNoJ7WO8n9He22LKtRdw2UfkeaBvVT6FxfT7SYJEcRi+VL+NW4JP0mWNAw9MsKfQeUq4TeAzR3PrFgFUT2EmvT+qXG/LuMPrDi2USFciNN2/1bk7S7nexwkKYO8e6uqIITb3X+/2H/aVf9zhi69SWimcElTDLRLWOrm7kC3DcZDEN2voaMDfonpYNJ9WSn0FORmQLIEAe46C/uTYz/m+9U8UwEAZYaCujjVjh4LZda9UwLgiMvx3yE94cTZcACr6xbdFPgh25e2aYXkdkh8qONQcevFjltCvxOw9KU9M9BR2d9CYL17kDWEX000lX1Rrnon2Q==; 5:HykanOJuOZzfVT+V8OBkSOCik4gAwbycy02CPnsmlbzmXR47wAJdUSK+hf0p8bXl3jyMhlKeS3TboG/DIGddlmogyIApmjZcrnpzSCR2MoBFVfx2SgIUoMCi0WrWGNdkUNvOX6gTph8Qf7cGR/5lwoCRTzBnNZYRoGIZzMxnT5PGMA8hZZHpobXiHojwQ5h/NG7J3uyw7ruKHnpryxHRJw==; 7:aFoySM92f6MBEJw6viGfSmOhcUnpnQElYPBUPKh0IdMhb0918moLnr1CXrROAo+bdum/uIQ1WQRA4Hrp+lE+Uxk1/uJy5S9UNEP4AhkY8rsyY2DmhNjkwsIn9ySCY+4qy8Dx60cnawY1Jgwbsb+HlA== x-ms-office365-filtering-correlation-id: f82964de-fb99-4337-7b6b-08d67589118a x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB4405; x-ms-traffictypediagnostic: AM6PR05MB4405: x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(908002)(999002)(5005026)(6040522)(8220060)(2401047)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231475)(944501520)(52105112)(6055026)(6041310)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699051)(76991095); SRVR:AM6PR05MB4405; BCL:0; PCL:0; RULEID:; SRVR:AM6PR05MB4405; x-forefront-prvs: 0911D5CE78 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(346002)(136003)(39860400002)(396003)(366004)(189003)(199004)(106356001)(105586002)(2906002)(6486002)(6116002)(3846002)(99286004)(6506007)(305945005)(486006)(7736002)(102836004)(386003)(76176011)(86362001)(52116002)(26005)(66066001)(5640700003)(6436002)(186003)(97736004)(2501003)(6512007)(2351001)(25786009)(1076003)(478600001)(81156014)(8936002)(36756003)(81166006)(68736007)(4326008)(50226002)(5660300001)(256004)(1730700003)(107886003)(8676002)(6916009)(53936002)(54906003)(316002)(11346002)(14454004)(2616005)(71200400001)(71190400001)(476003)(446003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB4405; H:AM6PR05MB6056.eurprd05.prod.outlook.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-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: xvU7XKh/6cWFdObTb0TpCP9SPWgM7EjQX5SXuBlU4RYgnXortvfVagLGz965Pk8p+neM4GNbUc2ovROzEaS8OC0dGt8rJC+j3lBXtZD1RRmFx9AYXAVOoqcKJzOtIi36+BFOf2tmC60b6qwJhOeayGkKfhxUwLR1o/Pl0SKCFSuauJ8PxG40OA9KcZkMnlghks4ks87RIYrrOTdU+2LyqpZ6p9J701Gja0LFM4vDEGr1t7fkVchJq9KqGrzEHOOt1SKelj8zLGpq4rbCU2+eKJwKtrue/3WFzb711JJY2twIw8ohci737X98ZRz90bAr spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: f82964de-fb99-4337-7b6b-08d67589118a X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jan 2019 16:48:07.9227 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4405 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Adding a VLAN on a port can trigger the offload of a VXLAN tunnel which is already a member in the VLAN. In case the configuration of the VXLAN is not supported, the driver would return -EOPNOTSUPP. This is problematic since bridge code does not interpret this as error, but rather that it should try to setup the VLAN using the 8021q driver instead of switchdev. Fixes: d70e42b22dd4 ("mlxsw: spectrum: Enable VxLAN enslavement to VLAN-aware bridges") Signed-off-by: Ido Schimmel Reviewed-by: Petr Machata --- drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c index 0a31fff2516e..fb1c48c698f2 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c @@ -816,14 +816,14 @@ int mlxsw_sp_nve_fid_enable(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_fid *fid, ops = nve->nve_ops_arr[params->type]; if (!ops->can_offload(nve, params->dev, extack)) - return -EOPNOTSUPP; + return -EINVAL; memset(&config, 0, sizeof(config)); ops->nve_config(nve, params->dev, &config); if (nve->num_nve_tunnels && memcmp(&config, &nve->config, sizeof(config))) { NL_SET_ERR_MSG_MOD(extack, "Conflicting NVE tunnels configuration"); - return -EOPNOTSUPP; + return -EINVAL; } err = mlxsw_sp_nve_tunnel_init(mlxsw_sp, &config);