From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7951D457A1 for ; Mon, 12 Aug 2024 15:04:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 731564065A; Mon, 12 Aug 2024 15:04:31 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2084.outbound.protection.outlook.com [40.107.244.84]) by mails.dpdk.org (Postfix) with ESMTP id 30FD9402C3 for ; Mon, 12 Aug 2024 15:04:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UfTjzBJXbePv7g+BXJd25GWcnWlBEljRcUnRlcb3XJpqeW01DojA/90h2FJ9GrHOrow1StVfh3LNIsBRqH13D2eutq2Jr+AAv0nwRbKJ5f+HALeOjY1FV1djSt7+Am1E0UTCrmMslbdRV6xRc2v+hPtgyP7yX9JzBuKE5i8VjaXYk7899rxqqLog3vDJPNcPDhjCWkx3Acl11hU1UodqFQO5p/eDgEAqHP3YtvlF9nfnbu+ishHgdbY6I8uiYnnl2ifIbBMDJbbs6z4BOgr7EqAZQy5jg9SP2BF0MwEMtPqDUc2dE1f0NwTYUoe9J5ncqr7wfZi8kE1+6ZDWk9i3mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZFntBqjIDoYJlKGeG2ossO/xxow+OeOUwQAugb6754o=; b=Pqh9dr0p32JGzSmdHn6rMQEj8ZQ93wIuvvRUJPNJncq8KVr5+NX7/NB5Lp4uL7pwkWwzq9PT2kGbQJHOlPxGAjYVqdnGfh39DQaBIguC7kHy8hNuUggR1ytm3kMIltdyMwDPJfpnNA6vjU4bbnn65hUwBgyk8TydBryk3epxUwSHFPXni01p3FfSCMv5wReJPO3nBwI9DId0vWaeWmelpbr1hzUsaUJ4qY+yKip1r44xbLud0uMumtvTlaKd4feO1j3mGUFUIfO+qP8SkaiyfuohhoHKOJfTjNE2OC9ZdWoDgQ8x6XYjSbDqOfPm1daZiQhViLUtXF+RTK8BzcFt0w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZFntBqjIDoYJlKGeG2ossO/xxow+OeOUwQAugb6754o=; b=XQcqQfp2F0i+RZSUYbZQXiDItlGEiSKYOxdGMrfrCqy4wgcZJl88PoQyw6kooR1GdwksRyVmyP8NGf8XunI/wQ1gBRQ2E5ZCeoXjEmQfG9LpETMTZsWakC/Xp+up/keDpvz+jBewc9YbqR/rhDYsygkWmhAFjU6N2NMwEdCFmiLwSafAU08vs4eglE4RImtw14na8kmFTrUIWWDElv5lNy+wSkI/39lRe6WG3TsKHhxNnzjNwcwtZ2voaB4aWm+a0VQlMr7Xg2ONjIdea8R4WRCo/0cORHnAo4id9YWFL/gGEhODx5HRDWjis3MuHDRFWuutjO3uEI3HeFJ2sb7D7g== Received: from SN7PR04CA0084.namprd04.prod.outlook.com (2603:10b6:806:121::29) by DM4PR12MB6062.namprd12.prod.outlook.com (2603:10b6:8:b2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22; Mon, 12 Aug 2024 13:04:26 +0000 Received: from SN1PEPF0002636C.namprd02.prod.outlook.com (2603:10b6:806:121:cafe::c0) by SN7PR04CA0084.outlook.office365.com (2603:10b6:806:121::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20 via Frontend Transport; Mon, 12 Aug 2024 13:04:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF0002636C.mail.protection.outlook.com (10.167.241.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 13:04:25 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 06:04:11 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 06:04:09 -0700 From: Xueming Li To: Mingjin Ye CC: , Anatoly Burakov , "dpdk stable" Subject: patch 'bus/vdev: fix device reinitialization' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:50:21 +0800 Message-ID: <20240812125035.389667-145-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636C:EE_|DM4PR12MB6062:EE_ X-MS-Office365-Filtering-Correlation-Id: 7ed0d8c7-16f2-4dd8-a514-08dcbacf4b23 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?+Wmjpv1/pg5p3gdJyt+tOgOTfeIKCXxRfeeYJR3DrWt25011tv59TviNMyhr?= =?us-ascii?Q?i9bTrcFutSrUVTqyEiz/4FFJ/chWXZECGAtj18daBjz0ZRlg3KwXJ9QutI29?= =?us-ascii?Q?3ziOs+y5FBKhPSsHDy+3Pk2UJQcR17xZ/c7Jx3Bw9bgfJe6SXz9A1CpUMipq?= =?us-ascii?Q?07V7i8CkXtjGj9SfpZLu/CJFmeo1OK0YPXxN+BgSArwg0b2MTMqvcu6VU4dH?= =?us-ascii?Q?cJFInk3hqHrRIMWZ6yYtrzCkZedbFtAnSaph8P0Uekx7JZ0EsdO6chls0o4r?= =?us-ascii?Q?Wb5/N3Zs5LcMnSHLn5OQieOVx9+MXFzE0t0hdBoUn6uOxWUYymIAXfrZ8hbe?= =?us-ascii?Q?Ymc1R1wSU2ePIjI4hfMTksRtoRaXtJz5bGzGGXEjXmMQjix97CKAtfnRyxlu?= =?us-ascii?Q?mRDtdnkhPu54QuX+4+Vz6UTLSxtAgKsTxWLqWTs1ZmFcYUV1g8thf2sf5Y9i?= =?us-ascii?Q?pW/YmOAfx/Mo2jUsgPSGGwZnEB+ZHQOzON3U1FhUnruemyRwuJA7s5V7FAC4?= =?us-ascii?Q?513hjIwQJedtscz+nq9VmwNzVZDwWsDUPepOIMHSH5l1aKcHzaaY77Xc0du/?= =?us-ascii?Q?TB/SeVN5NFGUV2TbAo6mczaanOrra+RD1m//Vi2kUvt33BMTn6VgeYUvErNm?= =?us-ascii?Q?g+k22B7Hys/6vLXrhldVEwr2MSUkllhC37F1qRhnMJxT5JJNKHpHMe9BGhKn?= =?us-ascii?Q?Cx/7c93b5mlYNbtd92GVOryS32bl1jboy+bRNlC+FxTWX4aJs4Hr43gnFKZy?= =?us-ascii?Q?zg2b8ewVx8m2Mwh+tktmct3U5Oxdfk/Me16X8g5pYtSCzLwZ+ut5OKWUyE1N?= =?us-ascii?Q?8SYYPJf7SIKp2g5J/0oDpSde/CuLiW2ShRVNvIO+wy31P3s1ZqShb1/QoiRv?= =?us-ascii?Q?tNIswCB9i0wSw0t02++Jxib4Vs4Wfm4cGTVOwq+Mm6XsUWhvw1cgsFjfTsQk?= =?us-ascii?Q?A6W8kl44frgYJy+qQbb5rbiKmrWHQjSbI8hJ/rEVqbRHMm1oggtbREW4OeJR?= =?us-ascii?Q?3wdaoNQGimzM1bTMk+/2GuAoQzPMTE/luGR9SerPz9oHeLwQJKq9+nVD/8ZM?= =?us-ascii?Q?jpkalpvEnEviH/VDO5WZQpT6gCnhwakJkkKRs6pKPyTWrDMHR9ZuqHGbZRBz?= =?us-ascii?Q?nSfP++0QQR6G3rc+jvBpjxaRbRnBOuOkX+zhcz2ufwZxsfNezqU4bZ5EWId5?= =?us-ascii?Q?J+/w3G4saKFejfqjz5xxIFjJ8EdmALapg47A+96GLVg4iiBDtN/OlFIocuq3?= =?us-ascii?Q?EZpM72zv0CUs7npQafqASq0/m52fOiz8VjKyoY1FgI/bZqT0xwWBS1v6HBZb?= =?us-ascii?Q?p3KRYma0qVHTwx3BdX41gg4jmMiS+Vi2APxKaVSLmEZ2ZdmvHrsNJXAx9DQF?= =?us-ascii?Q?TI1EXsPga7yVcgfmSGtrwu5AUlfB1trxiM+ELUbQ2gzD8GSasg=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(82310400026)(376014)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 13:04:25.9985 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7ed0d8c7-16f2-4dd8-a514-08dcbacf4b23 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002636C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6062 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 23.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/14/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=bef8327055d34e3a4e5f26d443322a2a3d81d273 Thanks. Xueming Li --- >From bef8327055d34e3a4e5f26d443322a2a3d81d273 Mon Sep 17 00:00:00 2001 From: Mingjin Ye Date: Tue, 16 Jul 2024 09:53:28 +0000 Subject: [PATCH] bus/vdev: fix device reinitialization Cc: Xueming Li [ upstream commit 1bd1ab6fd010837773473d821f9284369b37264c ] In secondary processes, insert_vdev() may be called multiple times on the same device due to multi-process hot-plugging of the vdev bus and EAL parameters to add the same vdev. In this case, when rte_devargs_insert() is called, the devargs->name reference will be invalidated because rte_devargs_insert() destroys the just-allocated devargs and replaces the pointer from the devargs list. As a result, the reference to devargs->name stored in dev->device.name will be invalid. This patch fixes the issue by setting the device name after calling rte_devargs_insert(). Fixes: cdb068f031c6 ("bus/vdev: scan by multi-process channel") Signed-off-by: Mingjin Ye Reviewed-by: Anatoly Burakov --- drivers/bus/vdev/vdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c index 14cf856237..dcedd0d4a0 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -307,7 +307,6 @@ insert_vdev(const char *name, const char *args, dev->device.bus = &rte_vdev_bus; dev->device.numa_node = SOCKET_ID_ANY; - dev->device.name = devargs->name; if (find_vdev(name)) { /* @@ -322,6 +321,7 @@ insert_vdev(const char *name, const char *args, if (init) rte_devargs_insert(&devargs); dev->device.devargs = devargs; + dev->device.name = devargs->name; TAILQ_INSERT_TAIL(&vdev_device_list, dev, next); if (p_dev) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:07.078678436 +0800 +++ 0144-bus-vdev-fix-device-reinitialization.patch 2024-08-12 20:44:02.565069387 +0800 @@ -1 +1 @@ -From 1bd1ab6fd010837773473d821f9284369b37264c Mon Sep 17 00:00:00 2001 +From bef8327055d34e3a4e5f26d443322a2a3d81d273 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1bd1ab6fd010837773473d821f9284369b37264c ] @@ -20 +22,0 @@ -Cc: stable@dpdk.org @@ -29 +31 @@ -index 38d05a9fe9..ec7abe7cda 100644 +index 14cf856237..dcedd0d4a0 100644 @@ -32 +34 @@ -@@ -288,7 +288,6 @@ insert_vdev(const char *name, const char *args, +@@ -307,7 +307,6 @@ insert_vdev(const char *name, const char *args, @@ -40 +42 @@ -@@ -303,6 +302,7 @@ insert_vdev(const char *name, const char *args, +@@ -322,6 +321,7 @@ insert_vdev(const char *name, const char *args,