From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0073.outbound.protection.outlook.com [104.47.1.73]) by dpdk.org (Postfix) with ESMTP id C59B35B2C for ; Tue, 5 Jun 2018 02:12:26 +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=mlVeNuWL6oEAG1Gyk1dOajTvxOIpL5i1gPjYpZpvVHo=; b=HSe6HIXz/fISUmrSCPOjDWnq4RPxuJxzUR9REdn5JFR4PoCdrxRMqIEfVNyOAVQ/QSn16VcXkdFAkjxwjzIgDM81bJpqlBrW8tyu6+1orVshvxpu8Xoi7HB7647aoDDLxvd83QiBxuldgLF9S5AjFGcafVZGPnP7IHgvT0oJutY= 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:12:24 +0000 From: Yongseok Koh To: yliu@fridaylinux.org Cc: stable@dpdk.org, shahafs@mellanox.com, adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com, Xueming Li Date: Mon, 4 Jun 2018 17:10:37 -0700 Message-Id: <20180605001129.13184-16-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:heua+rTZL3qFmEwanj69fIHqeDct8N5cg+qfr/7OwA2eiGxT3oclPIVW44KfVIFVTEnmQCCSHwTpoPboRMJaDpzbxWgHi5nUdAVeCLyGyexVLpa3AaG4TQGgCyo5aYzzn7K79rlKE5b7DHvwu0fDWXDC3BpB4hqKxqSARtcmFJnX/9bjmoIJa+ViYC0LV6aiKDZcMPnDGMs4cB4KLnZDKEIEy8umPs2Qtdc/qq/f1rWg/7edIxtmtX3i/eHj3TnI; 25:taKr6m4rTQaqFIkKODbwjOUhT/trE2KUSkM0nYXmsfPD1GGZdkRLPtyt1a1F0JOEX1I51looVdA2RTTv7V6KziC7XGO+Z6NNMGb0tKCIQfCNca55E0lGQXS8EMI8CPAyfo2auZEFFZ4itInZpJdN8MWsbFsOQHNnhMDUVkuKXRWC3gVMofIySqj4lhD4IiPwy9cMqtf+9Ct6ySG9O/QJm4tDGEhG6W8QuIHDQ6hA+hrraLvgzUZbrJaFa1pwtj6XOExFAFtaFMjpokNI724+TiK5trLudR9VZCEaqXZONjymEwlHJoFpxDv5p9KzyfILF6SPbnwtKs1w8vI+E5mTuw==; 31:4yXWDxKyEZcBGz0OYnVQS42xgemHg3Dxq5V/LrJQw0bZJJ9Ky77BTYL84/v0HG05rmywbRuWPdkcMrTCa3LqeP6XlxI1PQmJcI30qBJnhPQRowOonKvnGJXBC4Qv+uXBLgX6JW9fqYyl8h9wT5RPBAYuZUNnYy/p9qaqJswVAccYI2ksM9+eTHlazcnngE1IdgilH9ve5VDma5j7ZkJrtVi2Bk4ys6uyIh03KMf847A= 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:wAOgUEJJNZbNNWDiBhKCUa95ow3Fbh13a9u18Q2vt08kchcMpT/fcX0I4Jw4fEucF6aSGqhmP/qfpV5T7KrQGEw3dGZAwrDbFjhGax113V//yB7APUFS3Z6IsBXQHQwmE/Eo7sWaFwaQKInVgxkyY/uGXgUmRFY5Jjgh2b3X8E3TN4wnreDnIuDzWAHCSE0zUapswTgCYQaw9pS2xfM2IFtHXfPW5hKAck7vRNE8VlAgDBxFi+kradcGRebzqaCM/ynKUfEKYl3/uHoG4uPIXlAuUWk5RJ64R6C7wFarLpX/SaEw/lvZfrdfOhJZgIor69TATbivwflbr2dfDo5jC11qoyaEtpQYQ4mda4Ho2h+VbFawph5l8OBECcdOFbokjN7J4r4rt7MuZ7RluIsWc9PVxkcV3e7Oc7LtPr3xRxV8xPvY1+qMjI3169ZNjbFb7qnFaWRnOPOq2BLB/HTfyY8recnLQO4TCJf5ZEJRcB8oejswg+ZGUr74Zsi+/hYZ; 4:HEqHupbNmqDTu1GA9zrs4hPVggXKCsppSKrD109SDRAor8e23pqKFgywR0cYiPjdGcMPobrCxwXlOhfFQi/SzX6bT9xcTk9k/xTMBH9pdaEiXcD5vNAhDjb0AfNxuS2YTYe0KHLGO0qZ84DwYq9IO5dUsXaaMOTAT0JGVAjLfCK29vnxfw2gEOFrO3YkV83FOe5pK4JvalJegmX5wYap553jliXrZw8ynnfw51RV3a1lEKoB91umpjx4CLPYm2GdqYEPpZCV6ytIrwi+5r/pdA== 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)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:AM5PR0501MB2036; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0501MB2036; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(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)(59450400001)(66066001)(26005)(3846002)(8676002)(16526019)(1076002)(25786009)(21086003)(86362001)(53936002)(107886003)(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:rKFTJcbhb7iFen7IaxX9BH0BNZzoYHxsV9cnnk2?= =?us-ascii?Q?/Y5IGaKbHpG2QSfqHWK6J1r7MaaQzeS//gemQCQI8ucJoKcsMyUMrNF6MlGK?= =?us-ascii?Q?zSV28SXofrzv5Thh3qJBEuSkmL1ognS4jc4+LUxL9LtkrJ89bvFZsuNAe38H?= =?us-ascii?Q?lXpz4RB9qe3udcp4VgSc3Kld02eRjvnXppRexYRkKoTYxFMFYqwYOLcjm3WI?= =?us-ascii?Q?tTexlx7sdvmhSjwpK+M+fUh6iA1bT4i7OzpsSsoFwEMyPlQcnmzu4GGrDyEY?= =?us-ascii?Q?2OilH5aLhv+8uzn9ThaQhk6AP2MY5ldKQU4tHv7prvQSJ1l2I0KGWraLGbA9?= =?us-ascii?Q?yxo83m8dAox7tcfEX9J3JncFawI7rTARb19KA0ESFfqAYyqbQop6Yuz9FWKF?= =?us-ascii?Q?R1Jptxd6QvgrGh8q9ATQkTL1i0oF02G2Pw80tj3ZSEfRCj8+w9QCaivQfnV3?= =?us-ascii?Q?MkVjhXPjjQ8szrb+FgtagR75h/X2wDkTmKCvjRW9Ncya1cOcHUsUgTakD3sa?= =?us-ascii?Q?f2HD4s7rZUZvv4SrPzmrKzLfx5PtWdAni03GWFZGhwxZbb+ma30Ztvu+nXFH?= =?us-ascii?Q?0RYmMoouHrFZxxEydQGM4VO4s5qIq7Cb9G5gXsASPxF3WWPKNzJf7kXO+6c0?= =?us-ascii?Q?ci1uqm0rh7DRJc1d97RniMqI6lmcLpPauYWwvVHvD+BzckLYmMBtUSsv1+mM?= =?us-ascii?Q?RfA0sM3AilYw1t9N8RkYtKTn1O4M28V+L4HMkgNjSrAkV5w8fzBVvZAUWFm9?= =?us-ascii?Q?XYM9hu1v/oTC18UEPk61dm4t1JSl6JeDP44a3ggwG0q9E/8bV5QjK4Q+9knV?= =?us-ascii?Q?K6r/OMf3ziG0NVQ0XeijU4Un0aFcpcwbqe1Cew1depDdddra++RDNp8JumGk?= =?us-ascii?Q?zt/7Kc4wNeJEOyjxzfoOcgDdqnkvcV/xdLNxStNwAbm2Q8REckVIXV7VXden?= =?us-ascii?Q?qaQoPeu5W5dSkT4yY3WOEaV2/pe3Ksfl3aV1EFpObQ+21wT7vLY47EDZmsTE?= =?us-ascii?Q?kIww4uW35mVG4c4bRjFfpzCvpLGCnJf9vaxODvESHxHMwvFQ7v3HEm/tiWt2?= =?us-ascii?Q?kH3RifHUKV9NOGFi+YZhbujIIYP0CbUwFWUwc0X9tZPgE1B10bV6xWeNwOga?= =?us-ascii?Q?qmkb7zSORpuSvawyNCevmT0BL+awM40MMT9mGR7HIGX0lfGHeUwuCnCIuOZP?= =?us-ascii?Q?h0+O4wOncAEnpo3gzzCnIyPf1bGO4X49tMb1fSki9fiBlXiWP/rQKOcctWGF?= =?us-ascii?Q?7dDO53O8eq3zysvLVA8foHQNSQZFRgTN6XgzBDlZLObZZ+KITaHnEYEHup1K?= =?us-ascii?Q?daVWdgz/0ra37wuctGoDGp4Y=3D?= X-Microsoft-Antispam-Message-Info: MjzGCgllfoYeRtJZx+C0OH8iDYkWPdzeNDIrNKiNmxN0YAegJw+NPNC0Oc55Oybw0nYKccOLGFP2/caRvugMNaIPA1MjvTNsUIppCTKdlUrCOI8p36Lcc1eqbRyi5uGzybJzAMKeZYylXZGQIkPHpHTcycpHjmCWawcvp3bnxcxAmAi09Qx75QobXGeScXWg X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 6:OZC8cOkuntccPfoJORwQgJL26AyxQb3FrlkHwyLBlWfrfQBQXaMEMEc1DoaFZX56qO/F9I0Eq81yq2CKDFS3DAvoLQQlB0+PMCXeyrIDEgz3Jw5Jaydi2moJGIZusc8gsfsL+vJpyyzCpBe6HoMbVTVtbZSGorW3m9LWaia18lcI6oyOBiTdVd/PBRefGc3IOOdvakRs6G9J6Y+1+WuNLepC2DuUZwXsKO63Oc3KSNH39daiUhhhNbeF0G6dtjzeU99qbs7wn/WVeogCbg0YNUbglb1e0uVC/24jBRL3Sp2JO5BOjGkoFNKNB2dNi8OhfJM8tjDP3NstlIzb230FW73+1rDy0xDO6gJ4bZCdMVjkFqT013Ih3Wl3nOjC3keb+QlnZPvpZQUo/SorVDHLfJFpqkXIxZ9Sg2cSwOkO3fjMVaTQEOstArCKzy51zlhLH5jXX1cV6lLqO6LJoiCCZA==; 5:skZaml39Xj1srymqzc3QN6PJRh33j7rDZPo2asp8H5GJEFHVDer0lxl3eLjogPkZqYJLt6UUs/pF8Oa41rtzUQ32bTbH90KuJsZDE/D16OtrYXARs7I3jWleab6AVUoPtsuYIfgDTUPYpaBtIoOBQ2ydmgLzYG/HOIGwwKvc2hU=; 24:CMjcLuHsl7f+shU59N2nFI8AYF3uxiVSSTB4pJHpYlUPQEVX77ihgJViIrpgD1kMc3I2MVKUkP00T2cVVSogcgR+c2xIk+s5vQU85JEJH50= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 7:aToOF2ES5UmuzBYeMmoYDE9YUN0vJNO3bMxUDT8hFjlwR3CDkJwG7/qU28EsDKmyGIBj2QkpQ2a7iARMptoW7ZEVB4aZGruyDdYUFScXoexRJr1/eAS9+lCD1FDnbk4Tr/AgkQwXYPUWlnf5UVdadqintTX//cK7Pvu2rknKt+yPQCGlBmjAQnRL+l9vQMbkZM4HnciorrEBc2K+AdnmZi7zyNi2G/ffyHAdGvO6OLv4CKnohSv/OeDwCvmlJLa3 X-MS-Office365-Filtering-Correlation-Id: 25132370-1d3c-410c-c388-08d5ca79045f X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:12:24.0561 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 25132370-1d3c-410c-c388-08d5ca79045f 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 15/67] net/mlx5: fix close after start failure 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:12:27 -0000 From: Xueming Li [ upstream commit 8c5bca92c92cce90239ca813f293f3df53427775 ] This patch fixed primary socket assertion error during close on a device that failed to start. Fixes: f8b9a3bad467 ("net/mlx5: install a socket to exchange a file descriptor") Cc: stable@dpdk.org Signed-off-by: Xueming Li Acked-by: Nelio Laranjeiro --- drivers/net/mlx5/mlx5.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index f83508cf9..6ad5aa7e3 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -243,7 +243,8 @@ mlx5_dev_close(struct rte_eth_dev *dev) rte_free(priv->rss_conf.rss_key); if (priv->reta_idx != NULL) rte_free(priv->reta_idx); - priv_socket_uninit(priv); + if (priv->primary_socket) + priv_socket_uninit(priv); ret = mlx5_priv_hrxq_ibv_verify(priv); if (ret) WARN("%p: some Hash Rx queue still remain", (void *)priv); -- 2.11.0