From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0071.outbound.protection.outlook.com [104.47.2.71]) by dpdk.org (Postfix) with ESMTP id CD646CFA2 for ; Tue, 5 Jun 2018 02:41:10 +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=fsUi0qb5YvB2H9hAWVTTQYNh8D/B/dTHnY+8CvtQyM4=; b=cMySGgWFMYjtZzyW0uQmBGoCF4/V+ip3nPY7fUt3PR0BUwCYQhkpfzO8DfXr8c/+NdzK+HYIsYaCyUVZItP9/dwwlsK6y+1sLMPSW7m8gj2v5C8BHDlHIc959wR2ftobe9Azo+q/IkqC9ju1kzZWuzx+rGnIXHQzQCNvyx/kkRg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by VI1PR0501MB2045.eurprd05.prod.outlook.com (2603:10a6:800:36::19) 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:41:08 +0000 From: Yongseok Koh To: yliu@fridaylinux.org Cc: stable@dpdk.org, shahafs@mellanox.com, adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com, Yongseok Koh Date: Mon, 4 Jun 2018 17:40:23 -0700 Message-Id: <20180605004029.14593-4-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605004029.14593-1-yskoh@mellanox.com> References: <20180605002732.13866-1-yskoh@mellanox.com> <20180605004029.14593-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: BYAPR07CA0013.namprd07.prod.outlook.com (2603:10b6:a02:bc::26) To VI1PR0501MB2045.eurprd05.prod.outlook.com (2603:10a6:800:36::19) 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:VI1PR0501MB2045; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 3:PZisC7jogjgAkvPmGcaYLderoqub3ce2mq1go5a0v+v5m5Y66kj/EDSy32PXbCY3NjrsPNC9xQslohIgohVWXRXelj9f2XNbdFRYiDjcwT04fpEONl3Yxzn8IVlEUg5nHwRwIER0TZ2I3B9a2H1UZe+M8QUWu8brPUttOnR6QbyI+GoKyhxLAOP2mMFCEKZSNuMeWIaejgwOcgwe/+mTIueEEsfkLwiBdqvW4yVVe9vVz3xib40UNv/lFelor23s; 25:kbkKbE1qzvE5muCL13yKVYSafd0qBF75uMvkTJPkcn48HIHVX699fapFH07d8o2jK2jpSLmHVDO6DK6QvRkCN50mV4pCaUz0qurU4t8SjmDFsXPjdRArjCStwrUhnQ/7vZXZnpzck65Hns8tzkns8v3wRsgIMFZuEppb5VtRIMfeBnvjl4IvGvPSuSrn2vQjZrvzGwkUauoD0MJiJXyY+WSb196MKVRWKRsuvo9iWKa4xO7tFb4/6ijKSPXeY1swfYkq/SnqDyKQp10fa0VPq+PvbvjdMV4E0KY72zskGGGNFRXIklLRURExCQ+C7vpxYKzVoO4KyBaBML0qS4jpqQ==; 31:kwAWxKXU9sTkGjlUVY+JYqyiosOyIDmAKvF9IdydMPw0c5otARrMxEH30YK9pxTi8/he57PFKkfUujlaOCL9z1JIqogX0UZGgMpIgyoGhrTGhz9LBM2El87ZxDNL0X/h6lD/DrA7zLVyDk7sQ6f30w1yPahmsZTGz+EOIqyYPgPvTqS2xx9I8tBdJD+LjKAgXlCYiE5qaBpHibhVKtJ8WMPzfN0bbavajVw/ejawWko= X-MS-TrafficTypeDiagnostic: VI1PR0501MB2045: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 20:CRpKc78fh5Boq0sBqaryIJwvynZGZjFr9dFxQx4Dns/s3m7yEKl/Hk8KQxowaM8ePrA0kwoORFjWhkFxDCrW17L7nhv8cySSqJ9STCh0/dmR16nIiW2Xf8fgf+mfCX7lds/XK+9luW8Utt8/Y6DPkXyy6yprUtYoS0CvvFuhDLkhBlvCvq4Ph+2U3I058GMOdEEMqXwbzDecHQ9K4GPBnW9ozdZWCy1S53Djj9aqYy/h3KVz+MrFcjXf7dBejj7jptlI0inDh6cOfTbeTsx3bnED7jk2X/j7j9EMGyQ6HTivk2M6NpT2ckmCRZZr0OAcp2aqqhmX4JIXQUVkv05th2RBVC1f70jj4L6srAd7MqyHgC/6TBo87A+nCt5sC//3x/DdB4QZWSOa220c4vQyMKDyAvbqgH6Xn13k93Kku+EavSvn3jDUGTGvJM5qwoQ6fTPZmHv16tDrPgi0epBxCOE9fUusn2N2LA1e7v4u5UxPBa0nrhQMLU95tM6p0RBZ; 4:jmoCEsQGvEXKzNFmCAaBWQSI/2zi47G11twsRXjp0xlMWnSyTeuIoM/89mnC5MgEwmmrSTRigbVDo8IHB2hlEeURpkLIvD7Rt7Eq8TEB5i9cVCDCqOmA5jGBNcf9tdahHQzPL44vZTXuGLJ2TBazMMhuww2Y6Fk2fmXNT6Zv8KprTEqH7wGKfXNj+6wI8CdBHJKs7tnOtITz/O152W00AyZk7qHtrB670POBXlC7x9Axivse8x/GTHA9/DMJ9nbEFV1ZC1tqSxLZAwG/GIVF9g== 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)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:VI1PR0501MB2045; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0501MB2045; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(346002)(366004)(39380400002)(376002)(396003)(189003)(199004)(5660300001)(8936002)(3846002)(6116002)(6666003)(2351001)(55016002)(97736004)(7736002)(305945005)(8676002)(48376002)(68736007)(2361001)(6916009)(2906002)(86362001)(81166006)(81156014)(1076002)(50466002)(53936002)(47776003)(446003)(16586007)(36756003)(105586002)(2616005)(486006)(316002)(956004)(51416003)(69596002)(52116002)(7696005)(11346002)(386003)(476003)(59450400001)(50226002)(478600001)(66066001)(4326008)(107886003)(186003)(21086003)(25786009)(106356001)(76176011)(16526019)(26005); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2045; 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; VI1PR0501MB2045; 23:e72VhUDcQcE3R+wPphV4MViufygVdxePVanV/D3?= =?us-ascii?Q?iffPJlgXHxcMxjQRgeX8EPLyGoQGgy/6oGtP6/XsPOyBAjXrPdeneDy6QcNx?= =?us-ascii?Q?4CciDi/A3e3nlAvgBSiTYHNFpeJ/HT8RCjeoz8eLTo45UA5D6l8/YSLGa26T?= =?us-ascii?Q?sjnqNe51v1Q3cHGow79g2W/PHXA/ZTf1Pg1ZTno1gxYKZWERzzvIhnFhTKPe?= =?us-ascii?Q?5ci+BL3fdDSneAdUKSSkXVA8Ka43o/55/2boSoCv2xpPFCzopFTtXzHbGSm6?= =?us-ascii?Q?3noIiManISu1f3oI26npg9wWpH2F6b1dhVR0Tab21Ww0mjEF0oUIaqefjzCp?= =?us-ascii?Q?xz5VMl5bTyh/ZHVwpxPyH4GUuOW43dZjibi0dFs8fODqbTO6nnUzVva39cNa?= =?us-ascii?Q?zwV5+FaXEoYmTBe9dcC112EASt/VL685wFWd/qzAqG8s5ErKMIaXOPPosRrc?= =?us-ascii?Q?o0HHxlhSOy1nMdplbYrJG10MO0qY/tVAIriBFf7w8SdOjPMzdeRos1NtC0QY?= =?us-ascii?Q?fNlYzTTNuiHKTxNUJJlUhY3MNNyAvAPBVKDW1igYPl7rh6y/RfvhIKOwCdbm?= =?us-ascii?Q?9f4Ekaw+EfwFG8hFVB/gIyudOlFmgGJoellcJMryhIKACffwmuzrfQKi7skQ?= =?us-ascii?Q?FhSUpy/R7PaMj7dw2fvTqhW8i/VtQJrfrDP4VV7DKlxFNnOTj2g9VUU/1xjX?= =?us-ascii?Q?8RpduvvEMXPrHVB35Dl+3WC4Xhkt0MW2okd5e4fy+AgR/J/W+I1dcnGLFh2C?= =?us-ascii?Q?7nI7zRDo52vOwVLEJLpIKPSZxCLXKUwQwxEBbZ67ybzhLo5jiPZ8/nwhAGzn?= =?us-ascii?Q?5u2RJvBch//el0XNOd9tWBcII1Pokq3nvOca8zIra+wOomxJ8gplDbXr1j64?= =?us-ascii?Q?C8xc+B3n6YBZdDVvKRw+D+HMeUh9FD6guKJOZGMSnlpd1kEwfX6761f+HxzU?= =?us-ascii?Q?Z/l5Xv4FFeFNg9LBgYYr7aeTONNj+qij/DmeyzFPkeGyzFKmiyKO213IMayF?= =?us-ascii?Q?f4Ep2aTROixAJLqbrkiEK8Ha0y2FsYez7FPyulbOUgROR9QoTgPGOVcboEr/?= =?us-ascii?Q?jw1P8+FrVeEOjYjjG5h691EU6uWZTIC2CI3fG2C79m4/tMg3hZTYcZZNWvaJ?= =?us-ascii?Q?jS8FyAqnLk98kqeCgkYWdxbMP1K2Jvuw4VarWgO1RJxqFPLU+zP2YQsDa1gQ?= =?us-ascii?Q?pCd5pfQ5qCj0xLrhQ8aBu5c+5jBO+29N8GLIKHb1cW3HhsOLwlhdYe3jIQAr?= =?us-ascii?Q?At29zrn5WhZL6xV1jsjQ+3uNAomBizU9h+YyKDBrcDg/hb/q36vEYAXRhDio?= =?us-ascii?Q?/45ckzolBs4MZZh287y279x8=3D?= X-Microsoft-Antispam-Message-Info: 4inoDnKsqcZe3e/q1+CzmlPKlRrUM8EedjLUCaa+MRz/i5tgkh+iVtXcWSPwpxnDp9XODK/IToqvlWyC2Y1/pJzs8jg5OYQEYFKEZI1RJmORDKYIP2DG01MG+MfBl3wZVGFLu6/5kSQ3sKXroFhE30+fCLqudj3rSTRvxJxS20RE6oItgJgZTAYCSjUVzZED X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 6:1Hz4RUV3lnH7295ztONvvmMsnpw2UlD+OCsfe6sHQDXacEBzczQSYJSNLVd0LZQ4sNJmRtzL9vfYXqwVYUHNWagOF3wN/WuoUk1/LeOol06sSFp4RqKD43MG8l460+Qn/c/b+DhzogllYHO+x+mJ66Xq4p9DJIGc78El1D5r6FxsYcnSxccRXJ5F/IGCjVihU5Pk2PnWWYRax6kjhXpLMAtn4LHRwqA1UQ2YGAt/Rb3kmNFrFDHGh4y7RYEoe0ehcJ9SSoWJGzrVJcPzzff6c4mkgBjYIe/m1/rPf/BeKxh0wRw2ePfOT8iXxMHGCp8c3nhlsM9uXJedAqs4fhUy16gHcItiwxqNinjDgS2KpJYIYZLCyLgIaIMU1tAEjWxbRfnmp8ICnNEEoUjt67AhdCmE9yNd4JjanNPolUdA3Yi436+R+8kxxSrYj5wYOXn9DwIpwYva3FHOv6wD5Kf/wQ==; 5:oFTcV0ex02FggkDZE+oS6J8FyKlzfNxzcm4R85X5BLlYxwEnaKYmeZ2aOc7Q7VWonlwIZ3r139iGgj9x+CCgbFfAG3DpkCLA+wCtMhqCjFtLB0QwfGHBHTq3EZwaCZ1Q2DuSf5NTg1NLDmGxFxBHEMr4sZxC6cN6jtX3bAo8KB0=; 24:nxnj9PehXypsA6pk3IYqBswou7yIOCkVkOyLDs9v7TLRuU0RQabY1Z+lVhw1qdLW0OwCPIIYtjMJBeqLAOttu+24AevpoVFLIJThLQ3hwjI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 7:Uztq0WXktG2Vqx333of62foQA4tiXKyGzKbC+/gIh4fnd6gi1yo5p73WaCWfy6HtahgI1z5DkQmEkME0Aej+FmhuI/U0Ep8ul2nkcRPIy/nlZpjiY5iCUnzR2DmrR2m25P69vSgTi8m40ldLaVddQ16KpnoAfZQryR/I+JiIG6qIEzCo3oZ34QFDFZ9V3zQcWuhRcx/9VUsf7/WjoU3aur//DcTek8193it/ikaPvSsR3pTadRwjFIoDgGFTxsqC X-MS-Office365-Filtering-Correlation-Id: 6e8988a2-e225-4423-60e3-08d5ca7d0803 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:41:08.3829 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6e8988a2-e225-4423-60e3-08d5ca7d0803 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2045 Subject: [dpdk-stable] [PATCH v2 53/67] net/mlx5: fix socket connection return value 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:41:11 -0000 From: Shahaf Shuler [ upstream commit eac9cd58dec1b08d241657b1a81deebed9d4db9d ] Upon success, mlx5_socket_connect should return the fd descriptor of the primary process Fixes: a6d83b6a9209 ("net/mlx5: standardize on negative errno values") Signed-off-by: Yongseok Koh Signed-off-by: Shahaf Shuler Acked-by: Nelio Laranjeiro --- drivers/net/mlx5/mlx5.c | 2 +- drivers/net/mlx5/mlx5_socket.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index d7cf5a63f..ac43d80aa 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -827,7 +827,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, goto error; /* Receive command fd from primary process */ err = mlx5_socket_connect(eth_dev); - if (err) + if (err < 0) goto error; /* Remap UAR for Tx queues. */ err = mlx5_tx_uar_remap(eth_dev, err); diff --git a/drivers/net/mlx5/mlx5_socket.c b/drivers/net/mlx5/mlx5_socket.c index bdbd390d1..7ab310007 100644 --- a/drivers/net/mlx5/mlx5_socket.c +++ b/drivers/net/mlx5/mlx5_socket.c @@ -320,7 +320,7 @@ mlx5_socket_connect(struct rte_eth_dev *dev) } ret = *fd; close(socket_fd); - return 0; + return ret; error: if (socket_fd != -1) close(socket_fd); -- 2.11.0