From patchwork Thu May 3 07:59:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shahaf Shuler X-Patchwork-Id: 39282 X-Patchwork-Delegate: shahafs@mellanox.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C448C2BE2; Thu, 3 May 2018 10:00:07 +0200 (CEST) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40056.outbound.protection.outlook.com [40.107.4.56]) by dpdk.org (Postfix) with ESMTP id 53111231E for ; Thu, 3 May 2018 10:00:06 +0200 (CEST) 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=YrRZTuTuqavuu12xE8UIOprdb4e2MCo55INyfqzOjYc=; b=e20RNqPyaDYUSTI5Xy+zH51JKFWRUdPSGjw/MAI/g1Aer/TeZ1X598vrxZd7SyKenD9YZVOfYWMbW3/8DvZt3/WH8+9/GgYNRYBakt/hs/oJOr/fWEKeD3F9EsO4vOnjjR6bJghvmTsYr2EPcy9wCYHqNROTFwps+6UH7hoehBE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=shahafs@mellanox.com; Received: from mellanox.com (141.226.120.58) by DB7PR05MB4427.eurprd05.prod.outlook.com (2603:10a6:5:1b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.715.23; Thu, 3 May 2018 08:00:05 +0000 From: Shahaf Shuler To: nelio.laranjeiro@6wind.com, adrien.mazarguil@6wind.com, yskoh@mellanox.com Cc: dev@dpdk.org Date: Thu, 3 May 2018 10:59:37 +0300 Message-Id: <58bf3a469720a2b1cad4c84cb8ca971b756a2215.1525334236.git.shahafs@mellanox.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180501111806.112319-1-shahafs@mellanox.com> References: <20180501111806.112319-1-shahafs@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [141.226.120.58] X-ClientProxiedBy: CWLP265CA0040.GBRP265.PROD.OUTLOOK.COM (2603:10a6:401:11::28) To DB7PR05MB4427.eurprd05.prod.outlook.com (2603:10a6:5:1b::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB4427; X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4427; 3:z5hG8gBiiKnkbVGZ+GLloMB6NRhP3jrz7LWnfZI4J2eJwC63RMIpUH2gEdJG6EJcqKAByNK7uLLIu7InNsrvHI9ZGy2eVf8MCKPB+3+j8psux1Y4rKfZ6BmtyQ2l4X017+1FE92aV/W2jBCki14iww/nvJ0iwwkFC/eeF8zIoWt0VaF5Gl2hDqNQeXa8Vehju/Io8Awv75wHJ5a4P5UgJ53GDK/6DgvxagWLphDCKI3odBifsfZpXdhXGm2Na1kY; 25:YuPpskmnWM4ovdtcO1h9EU0UUAFMC8vlXHKortUVFJ2nxS1ck6s8/SEfQbzO4COnDY8tw8VyYsWNbRzJNRgn8V5fJGJBwArQvIksqywwhJ/G2UCHZZm3CkFZXBNKsMvVoFIoR6h5wSKtFc4XVZLJJ1Yw1yf+S+mRRRUZr5FbJY1zAAkJ+AbLk6OY36q+vjBhnDDuWccPZQ1CTwQcVWcDcrssgUmdhbgAKzcJuJ5bAxDaHsGp+ngSSg4xBhKXUKKe6J/v0CAwjsfNVpwmrQP3SOJCsMKmTd4GjNowyQFtXlx9DuMM1FmYmw/Qs0aM0nMJdqH41VXKmfsLnOZ4NNih/A==; 31:YqngArGEIAT+gq4Y3lMWRly8ueX1lgO7iXOfpXwDRnOqx/Svc4HbEHop0INEuJaONP8hxwzqQxJ1HfdPE3BCuv6SwO9aXWr8f9S07i6SGyk9KkzB/jVzCq2l4odkvMAUToSmujsjJe052xEmkiWk242qKifT6x8qBqLrtJjFu1UQOgyXPdJU04S8wiF17Gm6HqgZ5AnLOPr7Au0KU/WdW+mb/Wn9jGu9ud3cIKsC5GM= X-MS-TrafficTypeDiagnostic: DB7PR05MB4427: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4427; 20:2KrjVxGiAxXvIHOfP4rJW3AXUfvYRJj9Tm9h2uiWtposBjccoEj/8c4NZOIRZ+0WOibzUatyym/lpEyWN6cQhwNNczY2Wr04BsuZQcvDh9Rb9li5/sENTWzE8jUMS3+YbUSVlR+Jm4+ExM2/HfD7cey6MtQebQdJ0Kgaw3i6ktL8sJ/cqNi+jvhatBTOqW0ofh7yzbJX0uX4ddYMQC4uFtw4EA/tw6+kbIE59BQpn1h/ohpUPcz1i0+Ce6ONCuXfIk8HI0pBRg4l7E+uzkivsA8W3ha0+2O1JXQsSlNmPn4o4lQYQJwajK71ICMKYTmIn/s1wo+kzaZQUMxrHXMdJLq5ezDU2ukU/O324lj7XQtlGzIsNuwyjhdoG+IpBzJIIfOk2Ss+NWLS8o6Sm6vtdymRdfmD7fRmXdXvkcTzY+hIp+GRmAlCaUfHA6OlQFtUCJyhgGbMywqBYSOV0qEKKPiBdDMRK+UykeeHGAeEAvMHvA74wmbAuAnFnOByg4vJ; 4:E7Oxd7pj5Qks+7pyrajkvbzvsTJl/FkAJL2SQ4dF326Q73VTOjSXjh1vxZY7tk2DSSqK+VxYZsk+JuYoDPFZjVPLPkNN7p/s2IpRRPz/lnlJ1q6+zPPyki7qaiL/9SJDqX2HIiEppW51ylGkyXJ47r9uFCnHPLkpAdAut7xv/l32YlCZxKJ2Txq+XG74ZXoxlrNgVliaZdvsql1pnsrRlp88W7xFzg6y04fG6K6Ob3RstVbckVF9Zy2savtYaeLYcWXmT6ujA/gUGN/pJPu0cw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231254)(944501410)(52105095)(3002001)(6055026)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:DB7PR05MB4427; BCL:0; PCL:0; RULEID:; SRVR:DB7PR05MB4427; X-Forefront-PRVS: 066153096A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(376002)(396003)(39380400002)(346002)(39860400002)(199004)(189003)(956004)(386003)(118296001)(305945005)(47776003)(16586007)(66066001)(16526019)(486006)(7736002)(5660300001)(26005)(476003)(52116002)(186003)(2616005)(25786009)(51416003)(76176011)(3846002)(81156014)(8676002)(6666003)(6636002)(7696005)(81166006)(59450400001)(36756003)(106356001)(97736004)(446003)(68736007)(55016002)(86362001)(48376002)(21086003)(50466002)(4326008)(2906002)(11346002)(53936002)(6116002)(105586002)(316002)(478600001)(50226002)(8936002)(69596002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB4427; H:mellanox.com; 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; DB7PR05MB4427; 23:4OKjKEyHyZWpzawCliB2H4IFxh3vpJALyrTothW1m?= MW4H00pZZfa5TTqPXDO5A3vnpglbf/rLyNFFM0mUAi93y0zLeUih0w1Ja4XnGe/5o0EjUCEIrXLj0qQU9blHDIUx93V9b/ELzZwrrhwAUHBwXJ4ZICIwGlUbxcA33MWIHqfItZ7SmR4WViv/fkfDmPv5QM0N56SuHQaPUHVaTHbREULYsrEPNdr0zGQS8j/3GJZsq5Eq4FntDYR8+B2GpIzGNlJI4+lwGwyRfOOUiqFKeTHCk2bx4kWVpLbsK9X7Z8jLmOCq8H0jIkUmbOvH1sGlXLJoecHKcH1VRF8H4XRD6wU/CSR2YS34BVKRyau+J1HY+K74dVWqNN5EF6hs7iYNPr/XFGH1wXghqmt98i1Bn/s8tnLxq4jYQZBXGbhESPooJZbqUxjlPyyyEolgXrWfbXMsgI6m+5zvXDNJXBVCjdwF6F4INuqKL0zdoMEKZ0K2dwawqWA0NoFZ5JjSRjZZ0hcGMAeM+nh8chh54hoH8XaBiAlzKPu+ZxR1hc75QKBGzvB3I/hLItB37pVLkpAQFJ8jGAStgeQv5pnxlpXY98kWaYqmy5LepZt3aQYdNVscw623YxKL/goXs6rOxSggvBcMIewk/+ccKObO09o79RE4iAWj88pu8ahu6mzBARRNwjWVVvPSlpj4juKKgj0Arn9M/n78ESsxU2Lj0V1qz4VO2s7HPONQXZX4PHg9P3t50Jy58uVhqdVNPEpkmGMAB1r16i9MODU8agOhQKE92OB9NfhQ1e9QNI84+Ztrh+zgGOOT65W5B8UhQr2S9ELjH+bC6XFulXJmlMivNNY6A/YIenU2uO91C5RFB0GgEmJuQaHHKj5fNeW5xdElsQxOz1WsgbyAzoefr15rBGWhrq0MuBw/7D+HTEtqXLiftUrPHUNXnYP16JI/W8lBAuenGqoushTfWDYsxYtJSybKQVklzxlUAysQvuqqGuHgmGAaPrfzy4ArJvgHN0sLk6wMVDjD8A0EpF6GtFicsPeBZWBZqtWiywAzbTRJ/P1ok9UTUz4eX9vWwLlkg9uPKJhgkbbHqNCMjJ8LQInzt9guws/CvHzgmWtGTjNAeEmSGDLdUFzPBheE0w5VQSCoJmOYr3Z++d5QHzLJAZLdZDhBIfWlJ3hjceIsLxNhuksMIrSQnZ/TMdQWoSquOeYgbsxm+ln78A7R+M15Wkbv2Mn9atu+4/1IKAtxxofjTKSBk4= X-Microsoft-Antispam-Message-Info: gxrfO2koHTtwKQcQlR8Pim9qi/MKjyPX8EBHgdhM4wpgWMp7FETiQQD8Uzs5Dnb1xjB5CPX9zULyJLTznZhRj41bjnTLeuP4vtpsFjvHG0rFxXoS/PMQJGcbbtbfCliPR5plonHCUOsvPz+nxmldhfopjNtyl7/SkR2G9Tt71uRPlKqOWfiMdXGBVFpD1bhK X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4427; 6:ybFA0xrK+1hUbCmVElx8D2p+zCEaOhOoHFH09xTt+JVZccAu0A0bA4KSZjTWUc+DywlY4x3My1qiVEaPKx7uDDLpKbXUbeNDvvvNr0n0NJPYIa+VBBt9U2C1svjGadb/v3sAEOpEcNyRw8VIxx4mKN8Ak7g6dsdTI5aZJCg0Q6nZEwpryv+ed2CtJMWvAZkl2nhhq1x+j5QAYYkT8q3WisTiHe9LGyPyPidZjdpJn0esqQR70PWGbugW89XXRQsWdztIS9X1Oek05ynzHZJRehg4O5NWoBp/llRLOxmjyHQYDy+dE7k4gZnm4uUk6S04U+Rw72AoIsUHc8vDoYPSmKWJmK/CmcLMuYHo/plttCtr5rJfm/5Lb8UgPQlEt6aAgb6w9Wk+Dn4N3URmuSWFm/LmL45bUX8qWuhxWZJwVJ/3nqHFjGkd3EB8K7t/Bvka6egjYEYWIPRFfwW1dWrzbA==; 5:txDzcapuRvqRJVFM216dTZW6+gek8afIFMzxEp8EQznsZl8EAcFSXjdNnvBq5AcMKr00ReUHJfCfhGNV7oyfTgWLkh8zH4cSrNXjzSQ9Q/NVB1SHKKGcIswxqyf0DShRiI+0EroL0gcWvaaOSfRYYEbEf2odM1X+Hu/Hhe50d/A=; 24:NOURmkV4iRzMM3VnZTqnRwkP/aGkrp9k7+Xvc6wwifrCJrGaaJscUsb6tfCDMEkoMVA5IRgWcQVrUKLJOK+4GZ80z1xhFlmehW/kKT1731o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB7PR05MB4427; 7:F94/5SpVwg60QUjB53gENjJl/PLAKt41NkLZ12CXnAayz9TN+SFNoAx+unCgO6nGAv0ra2Qxf7HvWfk3zmyeC9Nx6BOeFfH3tEa0lyJO586PE2T+XxuXLSmMl18b9f93BY+F0Xfh585Fkm6dMBmWNfRCazZ0MlsQ3Mygu/X8ApnoyCFtmb6QCGk07tQgv4K30nhJpUPnrXP2r/iENjpjUsPHIaf6GV+8cCFwrBbocte41+QQFPtAzvl2El4hJ8/f X-MS-Office365-Filtering-Correlation-Id: b73211c1-3ebe-436e-0881-08d5b0cbe1bf X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2018 08:00:05.0036 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b73211c1-3ebe-436e-0881-08d5b0cbe1bf X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB4427 Subject: [dpdk-dev] [PATCH v2 2/2] net/mlx5: fix probe return value polarity X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" mlx5 prefixed function returns a negative errno value. the error handler on mlx5_pci_probe is doing the same. Fixes: a6d83b6a9209 ("net/mlx5: standardize on negative errno values") Cc: nelio.laranjeiro@6wind.com Signed-off-by: Shahaf Shuler Acked-by: Nelio Laranjeiro --- On v2: - fixed more polarity issues on different mlx5_* functions. - aligned verb calls return values. --- drivers/net/mlx5/mlx5.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 46cb370a29..7afdae863f 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -751,8 +751,9 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, DRV_LOG(WARNING, "tunnel offloading disabled due to old OFED/rdma-core version"); #endif - if (mlx5_glue->query_device_ex(attr_ctx, NULL, &device_attr)) { - err = errno; + err = mlx5_glue->query_device_ex(attr_ctx, NULL, &device_attr); + if (err) { + DRV_LOG(ERR, "ibv_query_device_ex() failed"); goto error; } DRV_LOG(INFO, "%u port(s) detected", @@ -800,16 +801,22 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, eth_dev->device = &pci_dev->device; eth_dev->dev_ops = &mlx5_dev_sec_ops; err = mlx5_uar_init_secondary(eth_dev); - if (err) + if (err) { + err = rte_errno; goto error; + } /* Receive command fd from primary process */ err = mlx5_socket_connect(eth_dev); - if (err < 0) + if (err < 0) { + err = rte_errno; goto error; + } /* Remap UAR for Tx queues. */ err = mlx5_tx_uar_remap(eth_dev, err); - if (err) + if (err) { + err = rte_errno; goto error; + } /* * Ethdev pointer is still required as input since * the primary device is not accessible from the @@ -873,11 +880,12 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, if (err) { DRV_LOG(ERR, "failed to process device arguments: %s", strerror(err)); + err = rte_errno; goto port_error; } - if (mlx5_glue->query_device_ex(ctx, NULL, &device_attr_ex)) { + err = mlx5_glue->query_device_ex(ctx, NULL, &device_attr_ex); + if (err) { DRV_LOG(ERR, "ibv_query_device_ex() failed"); - err = errno; goto port_error; } config.hw_csum = !!(device_attr_ex.device_cap_flags_ex & @@ -952,8 +960,10 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, rte_eth_copy_pci_info(eth_dev, pci_dev); eth_dev->device->driver = &mlx5_driver.driver; err = mlx5_uar_init_primary(eth_dev); - if (err) + if (err) { + err = rte_errno; goto port_error; + } /* Configure the first MAC address by default. */ if (mlx5_get_mac(eth_dev, &mac.addr_bytes)) { DRV_LOG(ERR, @@ -983,8 +993,10 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, #endif /* Get actual MTU if possible. */ err = mlx5_get_mtu(eth_dev, &priv->mtu); - if (err) + if (err) { + err = rte_errno; goto port_error; + } DRV_LOG(DEBUG, "port %u MTU is %u", eth_dev->data->port_id, priv->mtu); /* @@ -1031,6 +1043,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, if (err) { DRV_LOG(ERR, "port %u drop queue allocation failed: %s", eth_dev->data->port_id, strerror(rte_errno)); + err = rte_errno; goto port_error; } /* Supported Verbs flow priority number detection. */