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 2948E41D8D for ; Mon, 27 Feb 2023 08:09:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 211BD41140; Mon, 27 Feb 2023 08:09:51 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2071.outbound.protection.outlook.com [40.107.244.71]) by mails.dpdk.org (Postfix) with ESMTP id 039F140A84 for ; Mon, 27 Feb 2023 08:09:49 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gGJyc/9htfEDCo4eZfwYJsFIN0oA3O14/S848TYc1+u3AVNHYAz1PuPDRgHh0yGwJsL08s0j7bZOgWk8emGv7rGsr3deUHyK0yAQ46llw+DBMEeA/59Yd5hjikTzOH7qgw85XeuZ90kSQkNUWEgMT0WGRHAEP+1FzRX9FIv+vU5pxjoaG5mgcJFxMQEvpF+ltUrTxwnBeo9ERQczNhk5848lorrPpUwZFi/cxdontG1kP3M8upKfhC7lU9DXbcwmGQK/9J294Wy6S8VUm+GdhbrFGdN6wBg5YwSIj31KROEIutqRMeoe3qvn8RLiXfhukNGbDA1NSGPf+jof6jZzWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=vjua8ltyPkZRKKT9M7HKJQF8pFeTU0rQ7c9/cO8h+ig=; b=RJwkYFO2Dk4Hwo0CCWkTzMhzNbVsxBkIGScvMHxRNcOAUKmmfHKKMLLzsTBDgV2zfITK4dwHRzsMyO3KJriJDElJLjoYNKeEgkbqAB2PLn8rFXhaB3O7E8KwZCL73c2qCoIkHKUNyHZMjSPXV3asKMgjcN+dyY/P9E4VKRNh3YBFeevfcXQuQ04ACWr/z65v2m1RDSRB8KS+wRjsFuAnjTSCK+XHb+17+OuEcAUXcMHPktv2WC43X+Y/7WuijLvyJeTp8tCu6fyaAKJ4QFe2am90EFY7HZoLo8BGWCYrI4jI2yUmkDt6oBFLlxmh0Y0hmiFX+ejthvRIChkMqXt0ww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.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 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=vjua8ltyPkZRKKT9M7HKJQF8pFeTU0rQ7c9/cO8h+ig=; b=H37HzLYuw11MYGqgtsPDFpt1Z6m1enwBomoXpP1DjlyWDk4S0pFMXO2zoKV1v2M8AfggvoABjF1hQcOLqQg8tSGz2Sa8HN5YjaHEJf6A7+pv/N+vSr0RyX8O8vzg+TYzwiRJWLBJBLl6GDo1ibTYo7AL1imz4UfvgRLr8YoEhFtslfK7SiAICgFEDX0ym5Wo7UtUk+Hwg7xQktcOEqxV18Jfc2lhtAB6UF/iw8noyNbY7cbtIvANfcqNblGTrsf6U/p/Nl3c44sVuCtBXABFZnVoutEf3f45uxT/ZeS1W2CTB8OnLB2+1qVC1tIcr1xjC19SGcOTZxNoQZKn7m8eWQ== Received: from DS7PR03CA0113.namprd03.prod.outlook.com (2603:10b6:5:3b7::28) by DM8PR12MB5397.namprd12.prod.outlook.com (2603:10b6:8:38::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29; Mon, 27 Feb 2023 07:09:47 +0000 Received: from DM6NAM11FT030.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b7:cafe::8a) by DS7PR03CA0113.outlook.office365.com (2603:10b6:5:3b7::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.27 via Frontend Transport; Mon, 27 Feb 2023 07:09:47 +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 DM6NAM11FT030.mail.protection.outlook.com (10.13.172.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:09:47 +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.986.36; Sun, 26 Feb 2023 23:09:36 -0800 Received: from nvidia.com (10.126.230.37) 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.986.37; Sun, 26 Feb 2023 23:09:33 -0800 From: Xueming Li To: Volodymyr Fialko CC: Kevin Laatz , dpdk stable Subject: patch 'drivers/bus: fix leak for devices without driver' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:59:48 +0800 Message-ID: <20230227070107.15664-80-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT030:EE_|DM8PR12MB5397:EE_ X-MS-Office365-Filtering-Correlation-Id: f8f27e05-4290-4648-b932-08db18919c2a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KnqlgG/AX8tYSyxz07Uq3T+Fvl/3199v/0oGjSIt+nW+AZ/15/QlG2uLD/PCBnzRjak6I22Ed5iMlbs7NsXJ+rv5lE4TM/eiYAXVT7Csl2n2giEgb5ZbkZRPNDyQLyvnJbvJDpcWjHn1etAl3e5neMGmuFKAa0c9oQotV0EwLJtuCIM8jjwTGJVIs4ClaG7Q4M5L6yNGRHQ1325wm9Tqo9k787u51q7Hw/xQKGC1goovAYElkFn7oTu3mTmvwbldTDu1IkgsiT9qm8aVbFSfVZOp+jt9mdZeXfJaMTcQBKM1WHuPsXGoYUAbEayjFep2E08WoT1h5JB92SrC8USx/V0vztJHUdmmPaRg3D62H1K20u6Q+jw9SNC83KMahtt9V4k5Dl4s1XA/qJE9pHCHvsWamg72IYK3Oup8U6kCLylhai0Zb7G5LQl/2jaqzffyefWL4BLCQjcLON3JlA9pCI0d3yqTNqmJq6TFGnWtSacXSeUJlAH0S3q1EKNeAXczPoi0mG8OgwXJuub0W/ax0m6Q7C/y6Gzzpwkawu31qdUinMAdUnSE3fckKgAXtWXQSCUE2eU7mk4QhCSedwXeQNkpsAfuRWc891nw8ca5fVAwjKoEpiWQmVSw58x6LQaniiX7h69gnYmXsqOIW+d4fe/jbWagbmY/n35fdYVUIvr2B+RDWAUbuAp7+EIDZ+LSirZrDrMhKCNuZd4487/h0pM5+dBmXpn+kvW1kSIVfoS5A4gtI0/dK7kEbSlmLe7l23t4Sbzthef0LxixaaCW77SoM8NqdD9PW7t6Hl2QQ+IMbw0+PSFupEFnMYvD2j52 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:(13230025)(4636009)(39860400002)(136003)(346002)(396003)(376002)(451199018)(46966006)(40470700004)(36840700001)(40460700003)(36756003)(54906003)(316002)(966005)(478600001)(7696005)(5660300002)(8936002)(2906002)(8676002)(70206006)(70586007)(6916009)(4326008)(41300700001)(7636003)(82740400003)(36860700001)(34020700004)(356005)(40480700001)(86362001)(55016003)(6286002)(16526019)(186003)(26005)(2616005)(6666004)(53546011)(82310400005)(1076003)(83380400001)(336012)(47076005)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:09:47.0864 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f8f27e05-4290-4648-b932-08db18919c2a 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: DM6NAM11FT030.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR12MB5397 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 22.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 03/01/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=cc69b3523ec0d264f254c1d4451bfc6534a6a801 Thanks. Xueming Li --- >From cc69b3523ec0d264f254c1d4451bfc6534a6a801 Mon Sep 17 00:00:00 2001 From: Volodymyr Fialko Date: Thu, 9 Feb 2023 14:22:07 +0100 Subject: [PATCH] drivers/bus: fix leak for devices without driver Cc: Xueming Li [ upstream commit deb44af7066a17b1d2bab180cbe98ccae6e253ca ] During the bus scan, memory for device configuration is allocated. Currently, if a driver wasn't attached to the device during initialization, memory for that device will not be released at bus cleanup. This patch address this issue and releases the memory for all allocated devices. Fixes: 1cab1a40ea9b ("bus: cleanup devices on shutdown") Signed-off-by: Volodymyr Fialko Acked-by: Kevin Laatz --- drivers/bus/pci/pci_common.c | 3 ++- drivers/bus/vdev/vdev.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index bc3a7f39fe..e32a9d517a 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -448,7 +448,7 @@ pci_cleanup(void) int ret = 0; if (drv == NULL || drv->remove == NULL) - continue; + goto free; ret = drv->remove(dev); if (ret < 0) { @@ -458,6 +458,7 @@ pci_cleanup(void) dev->driver = NULL; dev->device.driver = NULL; +free: /* free interrupt handles */ rte_intr_instance_free(dev->intr_handle); dev->intr_handle = NULL; diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c index 41bc07dde7..7974b27295 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -578,18 +578,19 @@ vdev_cleanup(void) int ret = 0; if (dev->device.driver == NULL) - continue; + goto free; drv = container_of(dev->device.driver, const struct rte_vdev_driver, driver); if (drv->remove == NULL) - continue; + goto free; ret = drv->remove(dev); if (ret < 0) error = -1; dev->device.driver = NULL; +free: free(dev); } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:43.488801400 +0800 +++ 0081-drivers-bus-fix-leak-for-devices-without-driver.patch 2023-02-27 14:08:40.799237000 +0800 @@ -1 +1 @@ -From deb44af7066a17b1d2bab180cbe98ccae6e253ca Mon Sep 17 00:00:00 2001 +From cc69b3523ec0d264f254c1d4451bfc6534a6a801 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit deb44af7066a17b1d2bab180cbe98ccae6e253ca ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org