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 D07AE45610 for ; Fri, 12 Jul 2024 13:04:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C918B402E5; Fri, 12 Jul 2024 13:04:29 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2067.outbound.protection.outlook.com [40.107.96.67]) by mails.dpdk.org (Postfix) with ESMTP id 8443B40261 for ; Fri, 12 Jul 2024 13:04:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=T8pUxvDeJFyCUVGy06dluptpB+heSb3dDoTzPHotuoLODPbua8/v7B8GSugN0XWmJ4fc1SXsuoOym5uqV0sH5zh0Ea7PIONZ+xNc7fhdXdKwS5odqTtm/+1SvN5W57mXSc8nRNsDsWjLrGqoWZpvXUlm2bntsJYAzGo/m4Yp82WApO+ovDvXXit/4DivkAWRMECSUPpx9erbJ74JrX8eRSRvS5zJBx/e0Q4rYFPrP9AysSvSSq75sJzrszBsLthehu22zqOBMT/tJEjU+Vf2LDSkCyCoa3/Bxf9TmTXD/Pq9J1rTvrlW9WkeEyeVIFisn9n7k7merlkotgwPafvJ0w== 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=PD7AHzQKNMU+bGLhMEIooThCr4QSBL++31M0maFpFoQ=; b=VDgSP0i9nPZ2et/IdrihbOwLb5of+9WJk2eVVymuzq6QHy2BpeMI+SdDevvX8dMJCTpp1FOYusYyHiedyQD1U4CDFu4githXy06+dOIw3xoYlrY7a2hEhxZElEadYeL/1LyryUEawoSiclgpVHJUgZ/4LXmdRzt4h3OnYBp9FdZ2z0lr+Z5JBSdc2kDJ7QGbRu1hv3r7qPbAdbWpewW0LWOIbXKAP33InddgkJtvVjCQA4GSWCK+DUp92P/SfCVxTy1Mrwv8SXOd6glfP9FqUPY9Nu9iVvr5GvyVUJr18mHFR4mWV+mnKA7DGJQs9U4TR7/vKhdN6a810Z1euXj7WQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=PD7AHzQKNMU+bGLhMEIooThCr4QSBL++31M0maFpFoQ=; b=QGMF35W2SKBlj172+pMkMcfPZp/0pj0kwlW+lGx4uQVSM9ft9HUitTDOuxaGyw5874Gq0hiGPP2lxvlL421XmB7jjQWOikFf0DzjRLmivvgrAoQi7KrcSvhAm85cgph3tPZmGt4jppw+DYF3JUyyOWRXUhSQ33dVDuLAYTQl5BABPB0RL9IKDpHD210w/Njv0lBghXk2cGZ4VaEN9/hRgtEExs58TrMdMGhCUM/jPuPhyT6xxV48x4M+WvoIN2UVJIXdMMMHbxFHAreycKss3MraNLolZUOOU9OERlGjt6CBZbu9x5iMPi4cDgw7wAXn+fqib0vnHL0VohF4ZX67eA== Received: from MN0PR04CA0005.namprd04.prod.outlook.com (2603:10b6:208:52d::9) by PH7PR12MB7209.namprd12.prod.outlook.com (2603:10b6:510:204::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.36; Fri, 12 Jul 2024 11:04:24 +0000 Received: from BL02EPF0001A100.namprd03.prod.outlook.com (2603:10b6:208:52d:cafe::c0) by MN0PR04CA0005.outlook.office365.com (2603:10b6:208:52d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.24 via Frontend Transport; Fri, 12 Jul 2024 11:04:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF0001A100.mail.protection.outlook.com (10.167.242.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 11:04:24 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 04:04:06 -0700 Received: from nvidia.com (10.126.231.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; Fri, 12 Jul 2024 04:04:05 -0700 From: Xueming Li To: Mingjin Ye CC: dpdk stable Subject: patch 'bus/vdev: revert fix devargs in secondary process' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 19:01:51 +0800 Message-ID: <20240712110153.309690-21-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712110153.309690-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> <20240712110153.309690-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A100:EE_|PH7PR12MB7209:EE_ X-MS-Office365-Filtering-Correlation-Id: 949dc80e-a792-4cd0-acca-08dca26263b8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?4tbVQ9lcj3hOHRT4RFGeyGkH9/gf1nlWAf/QMF6Lg6Mw7ACA09rj+5cXbju7?= =?us-ascii?Q?PmTRL04vNJEwFV5nsXv6ympoej+peHHbsr3iy85Gyxr1R+Q50uEgUtZxvYd6?= =?us-ascii?Q?CuTlV3n9Wj8p7RqepAcEpWWpee1y5WhFsvm4BOvag5FVOnIBaTvRImE7Br1H?= =?us-ascii?Q?52Y0FMF4d5urRjsMkpHLlwhVzLabYqoOxZKIvfJr4IM+slTpDPT5P5326ni7?= =?us-ascii?Q?dDidza5v+Hh1yfjhH1EGXR9uY5STjIkXis8Zx/2S38FJuX8yZIMXU7wFy39B?= =?us-ascii?Q?uKSH03vu+9rBWaNgJKrl6ye29if7RIa3SNCbA/67FuBKvb/LpXOlI0FyTwub?= =?us-ascii?Q?pYYhcD85Xk11t7yaU/FpwVAnIBTMWlj+nWAiCZUtwxL4aL/HgTgSMSIvFunl?= =?us-ascii?Q?ZcbIk//d7htGSXDwxkjH89nMSeYASeBMRanTTK6ytrqLpXDW9OOVocSkV/1+?= =?us-ascii?Q?woOAvLwTlaIQkBV6MnSBl0Jz5KttuVRn6va0EmsrmH2rEQDXaYnxnttaeXjy?= =?us-ascii?Q?sYH90Q14U+5JlszlbCYfBXfIvT7iyYJvkJtHGbHiEgGiu9t30+6xB48ycmN2?= =?us-ascii?Q?p8Y/HCj5j+4R8aIvzstO1tbCcX9Jp54tFz33fsAd7qOvQ0N32cf2wThdJmb1?= =?us-ascii?Q?M5foQ1Tupn+iD8ANkEslQ1jifmI0EWTdrEbmTmUatEc5YRIyOoMuAzP99O85?= =?us-ascii?Q?3fNv7e+gh1jmUAvo6JHEVH+I+taEDOqQmocdlfSnTwHEE+vsKh51kFNV1JyI?= =?us-ascii?Q?z74JjXNpbAVnHoL3vKIap5bAD7SW4LYVeTAtNkqdy0TITBLwhuHC7J7kKoml?= =?us-ascii?Q?YFgGGF1gllo3UM17surAcQhgN6gXX3ME+d+r0jnTiqh9u33VZazZx0rCptD2?= =?us-ascii?Q?J+8Zsv2Yz0p3S0Cvhn3xPTW0MwYDtPKgmKKkWBZRGqU7KNumQLkCH+XT8sG8?= =?us-ascii?Q?ndaVzqSXwPeNHhdpg/byr/31LKXqELnRUPSJ0XXspG2LoJzKeC1b52eNbNRv?= =?us-ascii?Q?TEJsqkGAoO0WF1ait4Ovy7Cnc3vrUEtTYQxQDio7gybLzKx0nl2gtyKQPbxz?= =?us-ascii?Q?/NPT0lsPgyyv3fFOhQ4Ks2NYZuM8YdClKQDY8MzlL1No3kMcT+nHP1DijHid?= =?us-ascii?Q?sSZUxkqQaV8gm6lpXLU+np3X88Xy/gGd4G2Rz8MPyNnZbIklXKWvF6jXj8HI?= =?us-ascii?Q?Y0xnYmS1+yNkUTH0gCYtbpmf+xYkvLMmMpJFEXM9htjqZmW55XbzNfvKMytf?= =?us-ascii?Q?zmGthcRXhZN5luVrVUkwIFvVXyJkIhwNwpT+aAWrQ8Hs63u1m5R6aVjx5ABV?= =?us-ascii?Q?vH7Pd6O50F78ZuMJBl/IQy0VgERAdt6CWrVa+6a6gkwq9UchpPiDRdbNy56O?= =?us-ascii?Q?ekKNW+wQ4FGi3FtDsVE44f28dGrlrOBWYjMhj6ifFxcobsMrxJs2SEB8J5s+?= =?us-ascii?Q?hJ8lipwW9o+GvOZGP8tHKsDPvQP2RsKY?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 11:04:24.1278 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 949dc80e-a792-4cd0-acca-08dca26263b8 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0001A100.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7209 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 07/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=8b75cfb86f90c816bdda28b8696beb18d553fd2b Thanks. Xueming Li --- >From 8b75cfb86f90c816bdda28b8696beb18d553fd2b Mon Sep 17 00:00:00 2001 From: Mingjin Ye Date: Thu, 14 Mar 2024 09:36:28 +0000 Subject: [PATCH] bus/vdev: revert fix devargs in secondary process Cc: Xueming Li [ upstream commit 22ce39b3aadb109cbefabb91aad44c94e8c2a5e6 ] The ASan tool detected a memory leak in the vdev driver alloc_devargs. The previous commit was that when inserting a vdev device, the primary process alloc devargs and the secondary process looks for devargs. This causes the device to not be created if the secondary process does not initialise the vdev device. And, this is not the root cause. Therefore the following commit was reverted accordingly. After restoring this commit, the memory leak still exists. Bugzilla ID: 1450 Fixes: 6666628362c9 ("bus/vdev: fix devargs in secondary process") Signed-off-by: Mingjin Ye --- drivers/bus/vdev/vdev.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c index 14cf856237..38d05a9fe9 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -263,22 +263,6 @@ alloc_devargs(const char *name, const char *args) return devargs; } -static struct rte_devargs * -vdev_devargs_lookup(const char *name) -{ - struct rte_devargs *devargs; - char dev_name[32]; - - RTE_EAL_DEVARGS_FOREACH("vdev", devargs) { - devargs->bus->parse(devargs->name, &dev_name); - if (strcmp(dev_name, name) == 0) { - VDEV_LOG(INFO, "devargs matched %s", dev_name); - return devargs; - } - } - return NULL; -} - static int insert_vdev(const char *name, const char *args, struct rte_vdev_device **p_dev, @@ -291,10 +275,7 @@ insert_vdev(const char *name, const char *args, if (name == NULL) return -EINVAL; - if (rte_eal_process_type() == RTE_PROC_PRIMARY) - devargs = alloc_devargs(name, args); - else - devargs = vdev_devargs_lookup(name); + devargs = alloc_devargs(name, args); if (!devargs) return -ENOMEM; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:18.570682691 +0800 +++ 0100-bus-vdev-revert-fix-devargs-in-secondary-process.patch 2024-07-12 18:40:14.356594197 +0800 @@ -1 +1 @@ -From 22ce39b3aadb109cbefabb91aad44c94e8c2a5e6 Mon Sep 17 00:00:00 2001 +From 8b75cfb86f90c816bdda28b8696beb18d553fd2b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 22ce39b3aadb109cbefabb91aad44c94e8c2a5e6 ] @@ -20 +22,0 @@ -Cc: stable@dpdk.org