From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0054.outbound.protection.outlook.com [104.47.2.54]) by dpdk.org (Postfix) with ESMTP id E03678E7C for ; Tue, 5 Jun 2018 02:13:41 +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:X-MS-Exchange-SenderADCheck; bh=/8vKAx+HEVjrOIbhss420pXO1w23V/sY3Z9ZtfSot28=; b=Z92erer3I0QxW8i0HtxIfRQCwjTQalkR+oAg+OkUb+ln0TxcqmBUJ/7uYg5v+EcrQp1Wfo9pNiWdTnRZAVKbpVvNhz3nmuTPJbfMwgrThdwN5Z78fr4e2e8Icv1ipwvSheKQIxmJsRa5mn3RgXA6NEgWYLRll/y8fnUdb9GTCYA= Received: from mellanox.com (209.116.155.178) by AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.11; Tue, 5 Jun 2018 00:13:39 +0000 From: Yongseok Koh To: yliu@fridaylinux.org Cc: stable@dpdk.org, shahafs@mellanox.com, adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com Date: Mon, 4 Jun 2018 17:11:17 -0700 Message-Id: <20180605001129.13184-56-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605001129.13184-1-yskoh@mellanox.com> References: <20180605001129.13184-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: CO1PR15CA0060.namprd15.prod.outlook.com (2603:10b6:101:1f::28) To AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) 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:AM5PR0501MB2036; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 3:Lt6b5ssP+M0UxGeUFEmL8GhclqIOjK9BM8+9Sz9TwMPrQ4aMhkbzz4+Ap1MeVd9NNhpIR8CPEjFwUH1Mc9NSEcHDudrTEySpJDhEEsnbzG5mbsZX/Eb2OtB4NlVCHOd//drT184vP+AjtmGrb1jMlNjdHgw2YWJbOIA32tYqx4hSWWmhGtsjdAQcsbtx7auVuoQRsgLXp6eOGgYTdVYMaujJTdvofTnaxZXijP2UVP0RXeCx5W8y4jtF1169p9UI; 25:gkT9BY0N6hYPzpt/xXV629uHBT9S8J/wFXoAj3gZxGsdghbuy2BnafnX+clnMgeR+Dc1Xx4KRMDTa8Tm+B28baMxONiCeEYvkk2zYoH7+J/HLH8T9ls1TW/XwT1vRrqlZ5JgvdIcSunJgo/zkXn+cjLdXmaZnXcvikYHsgXQOjWTzII5BhOD6EkWmiO3GrFprQZUK7JUiyN2RT3wrreAzRJE9roJCDVtCwlBq+dBDLGV3Dgrm66d5IeWEnozfPPlhc1pF4rqQauVhkteA1YnCYx23MHy2yRPNkuVkOIx9zfX8XH1qFQHNQ8p0oVoITRc6tmGqKV9Uw+iVRYFg2Yaug==; 31:Yxb4t1f5xMmKFXZGmRs7wzJ3ZT5ieb0qo0f/VDWlQ0/mZLG/wvn3M4dmbGcY8hAGe9pKR2XJIj07BrpOTbqMQfjr60N71oGe7JcMfxfgn5YHZeL9OkL3l4qVZ1Dq65wkN+EDLCKf/EzO/2/cdRaOOIpXZaOFmJlhe3t1N1TwljUH4KVoNhQTPd6PWEGrQNE93oJJZ9R2cbsftJrL4+uZcFr9BhEFJcQlG0aZfbA17GI= X-MS-TrafficTypeDiagnostic: AM5PR0501MB2036: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 20:zZcgQyMiUQe8QPpXPkBUBblNgAf93z2smU3WGr/zfG+IMQeJpLk5MHT+gzA0SNAG2xLiFgJM0DEzWHJ5IoGVvVX7wFRwbwnmwrvW25uIEUAewIewv/T+WKBHwQdO58cztPIECryALtdcE8Gvpncr5/0VeFJQRA6HCKKXMTYShi9nc8r+b+qemcrLyUDjU25WIZlmCWhjsCtxH86J5fcxllTgGtZ9vGkCfv4nxSKAOyIHFC8g0vOtq78cO6MRXKFZp91DxGOXxVbco0BA+YVxV8zDzHU4Y5qNgThIrYI00T7SWnoFX5VJFY7N34B39NLagDKSj1RBuYukIv4I3inmCW5DGgu6v+aRanGnQGEXRvcnHZzGlmJgIi4fomyzAtQowWd6VwYfpYJi9eRhJbwKgz/dKUdqxjHdHiL7pyryh8xWh7bNqFV+WppmYJ1kDN5oKVh4e6w44tSWlV1zr7xNc+lFiChX0TfOG4FgklgC7YyiiwHyf1T6mpzInx2V0rWB; 4:T3ACxcZAwS5UQlyxekvShvYQo89vsUh7J/VOohiUoYuO9SegIottr9u8FAQO66ixmUMAR+BIQcc/kZm9IupWiOx+CPM6n9/HEMelJbV7phrs2QuLBfuSietw84Orpq29mP2NxOA5hqU5jIk9tAG5boRd/GpYoCRfH5/O68vYog+tJVm05takQVO5PoM4KBDqle6pC26Ri80YKOrAR0VFzYcqll0a+6tV6qSI8lNPOBQwU9UJ5OS4hbJxP6bSEXUa1hD0oEPfaJ66rietWRJ2gQ== 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)(10201501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:AM5PR0501MB2036; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0501MB2036; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(366004)(396003)(39860400002)(346002)(376002)(189003)(199004)(478600001)(81156014)(76176011)(51416003)(7696005)(956004)(2361001)(50226002)(305945005)(2616005)(50466002)(47776003)(486006)(97736004)(5660300001)(6666003)(2351001)(106356001)(8936002)(186003)(81166006)(52116002)(6116002)(476003)(6916009)(386003)(446003)(11346002)(66066001)(26005)(3846002)(8676002)(16526019)(1076002)(25786009)(21086003)(86362001)(53936002)(4326008)(2906002)(316002)(55016002)(36756003)(48376002)(105586002)(69596002)(68736007)(7736002)(16586007); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0501MB2036; H:mellanox.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: =?us-ascii?Q?1; AM5PR0501MB2036; 23:p/4ozt6EL22lnYmWsiZ1N40mqN9MrcDgomEZOvH?= =?us-ascii?Q?cwJfVNvwUnU54TtPqFphYbT/RFIHp+ozlD+tXukV2Iyob7Geche/Il6vJqwO?= =?us-ascii?Q?mRh7gcr5aFrJqaEwFMmRd6pDSk0H3Ax1RMtVHddESYIrnuUT0e+DrBS70ofb?= =?us-ascii?Q?NIpyP/MCCKzk+ZhZDNNFVxoF0kc9vwR0Ll3mVJ4WiXze6ZssTCwK0KdT4qEu?= =?us-ascii?Q?BzWfR74DAdCxEZ2xNzUs8Hgv5Lxeo/bL9oKn3oRpRJw9fLepJXcS2spUj8wp?= =?us-ascii?Q?zsg7Es+JdR6u5CyWB50KDC7McJehBfLfyjNfUTc31Wh4yJlrRH8ngT2Qqhp9?= =?us-ascii?Q?D9lb9gWUF//1YF/EUzkXINHvE4u6hl38S2F3Q6yNDDBV2v5v6X1wIXZovt/y?= =?us-ascii?Q?2n6UKDMfWvTQJVH7PtuRwpRjBrwJ8i4SoAUOQnTjcDW2HM0BES2u70aemW3v?= =?us-ascii?Q?RduAPVAVGNT1dlfPiR6VrJ24/SLLNShEBzQoX0OnDmb9tikudE0XDlRrX5Qz?= =?us-ascii?Q?pxyVNFPepRfPPqn+6tTpAvpcI/NEm1hCeb5a8G8mREsIn7kgYhApgkV9a8Uz?= =?us-ascii?Q?MpI8Kjg6JVs9n2xo8FrQSoSG+HtFJzzWumVD0+G/N9mMk4UzWOcmgn5F672p?= =?us-ascii?Q?9XiEi/FpcuVRk2bNO3EgcKYGZkk8+csMgnnsmnEE2bQmBIwqoReWyCjfV36o?= =?us-ascii?Q?cjpYk4enmw+wLBKmgZkW52RIbq7W4fa+VExKbNMfkI8IgudjmVAhSv0M3mjU?= =?us-ascii?Q?VcHqlTonPljh9CRiB82AatHAF2bDuo1HKyejN5pueKXlfOUXU4U+5RcrB3iG?= =?us-ascii?Q?9d+bwA1HNS0SX3j7XkYmNrU+SNS8KpzDHabEd5pyUJhkUM0m5aRe67sdp5H1?= =?us-ascii?Q?pMjsuNXfuRWTRO9/4AZwfdoBxN/JReN6zhUGKZiD77Cfwrs6w1dLq9QYG6P2?= =?us-ascii?Q?B+RFTsO9XPuXZcBhE95Kw2msJtgrq6yuDlIdHMw8C9RORPANoB9bzzKQuOex?= =?us-ascii?Q?fx1+VVWO+Uuhd+mJDoc0wIZ32TTvHXPHPVJ6Xx/odapMqM70dTnKtVZLDutd?= =?us-ascii?Q?/2JNi4AWl6SpA6Rn6/6qznOLTiY9ruHjoKx9k9wdgqAAKkMEiFYOHbBrxa/T?= =?us-ascii?Q?NvzchDS52QJR1IVHpQaQT71ekGVmZIgRFGTPtEsDOfABVojPKChY0yTYJj+Z?= =?us-ascii?Q?Ywcd7B0UhhBU7DTMyBnTw4BfgRBG+7DTGsKebaM+VLjwsyM00rFSNxxqL6L9?= =?us-ascii?Q?i7j/p8UtUDYcTxAyLXugGN77DBB5lT4y1ghlOkqBP?= X-Microsoft-Antispam-Message-Info: PlzLYo9xo0ajexGE4UVwV+PU195GmXzK3GXDwuQ5cDVvum1hWLvN++oM35MpqSHkjP7eG8k3E/pxgLi4UqVS+4N+W2erXYSWLD1V+FZ1mYIJVwKblRFkBOjj1yJm3heKwmXa59PztROBPN+NVPsTh1c9+BmMwCc6lvUro6bRVMr1UmKDjG4FxhehjKgJ1KhJ X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 6:FLNRzaWDF3Nx9mYrzYZU76Qr/1d1mG7Bt4iSpJI8l78P/0mvTMJa7gBDc2yQ5kUwilhBtAaRMDYSQyBkdScKzFda8v1zkANJlv6jGFOqXEbpAm30s290sOXtBatpjrHXHELVu0Q7wi2jCgDO6hpWG0A/kAcbqJcWooS+BakbNEICGnFuYWaloxJ8DqV7tPWT82VYrc5LdCHOrPFr+yAh3MFuvUnyLrZGt2mjo4pHXH4ivRK2LCqXRTbRaqIvrktbmfb+T3t8SiJBeMyaoXd6Y+8cpOnmk0wYdn3YEhlCMVYgj8m/6D+94WnTCSNlSUreB3TTMYkurV3/tXSrqkTevZyLxNWsZK25iBKre0oIjYWakmh2Bpy5/hwvlPkylbIzC1EhQUogyEFL3d49omwwZ4JLmgTkXM93obcXA2STb0WY571fapCY70SE7jDnci0yjw9jj3tZ9t72zPLnKEzyGA==; 5:BIq/HRt9OEg0Ast5X4xiw+rFI86BArKP7qPlRTXCsVJpalh7Dv3u67PlIbaJ1B+W2qwqxO2GV84yjbg+WVdezMofhL8q7bfLMeblbDbejzmC/LAjJdOPxeUbMSV9r4Ub7dXaxul4nAcnutelJV5o7oBlkR3GJSKI8aCczskNKu4=; 24:9DERkBNkPzZIYfnc33Cro1higJ0Xjtf4uIoi7lBhUt+7BnNShOf0GEb9YdooIPxDhd2v4m0+EgYmNU6lllCgR0uMOgIXuQ6EMwGvwzp8uL4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 7:HCxmEri53f7V4H4Ygqft73DUpLX5g3QdIQNTB8e6/v0DCvQalvs0IbFugcLO2fkE3+tCKEsJoQ73I2AvdlTPgvYzYObd22yQ6gVrnLTHyfCTB+gQooQFj5i/clTYGroec9mrHkY3VtyRqEpI3oh2Ji/fUis/PSJL6b4//lkOfzsV3F0ytk7sZJDOy8l9qUIbGMUzh6MmOO0HgyHclnOv/Y/E0oTV5UZe2MOlEu+lC+Vttrn+AWZkX7kOKbyKPRCL X-MS-Office365-Filtering-Correlation-Id: 60f61563-3ef2-44df-136c-08d5ca793149 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:13:39.5768 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 60f61563-3ef2-44df-136c-08d5ca793149 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0501MB2036 Subject: [dpdk-stable] [PATCH 55/67] net/mlx5: fix probe return value polarity X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2018 00:13:42 -0000 From: Shahaf Shuler [ backported from upstream commit 012ad9944dfc470c17d8f555c89dadd5473e25d4 ] 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") Signed-off-by: Shahaf Shuler Acked-by: Nelio Laranjeiro --- drivers/net/mlx5/mlx5.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index ac43d80aa..bd21454cb 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -779,8 +779,9 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, cqe_comp = 0; else cqe_comp = 1; - if (ibv_query_device_ex(attr_ctx, NULL, &device_attr)) { - err = errno; + err = ibv_query_device_ex(attr_ctx, NULL, &device_attr); + if (err) { + DEBUG("ibv_query_device_ex() failed"); goto error; } DRV_LOG(INFO, "%u port(s) detected", @@ -823,16 +824,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 @@ -901,12 +908,13 @@ 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; } mlx5_args_assign(priv, &args); - if (ibv_query_device_ex(ctx, NULL, &device_attr_ex)) { + err = ibv_query_device_ex(ctx, NULL, &device_attr_ex); + if (err) { DRV_LOG(ERR, "ibv_query_device_ex() failed"); - err = errno; goto port_error; } priv->hw_csum = @@ -1006,8 +1014,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, @@ -1037,8 +1047,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); /* -- 2.11.0