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 36D62A034F for ; Wed, 10 Nov 2021 07:36:34 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 319A1410E0; Wed, 10 Nov 2021 07:36:34 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2047.outbound.protection.outlook.com [40.107.223.47]) by mails.dpdk.org (Postfix) with ESMTP id 28CF44068B for ; Wed, 10 Nov 2021 07:36:33 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CaiBtA7C5aFQXELIdYVBIpvD61XOtdRL2wdcc8dkktYUu1f8AHgKo6nb8n2nyFSFKXRIHnZtUCRtTA/W+HtvRErwWxyb4iEMfN2UPP2hvGerhcT7I2/hH0z4UY9yspY1ixkJTfWFA6VXjJBrlRu4Ilz8Cl+eVTMXsXnRirV7GUQcEN6Pyz5GKdCHzig5w1rjhM7Y3Dnmo4Yy3F1g0MDakkbjMerDORhsa8rGTPy2qC/RonPP7hT1lOCgVjPJV/dvJxUZfQgWZByXbBf96L6Yz+CDyc91ZkWloMZW0UoH/gQBpl5VA4RraK2klLEV90fmeN+j1n0AGh/nppLroorvDA== 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=QjGutgWmdNAmtyCYslzGanJKtlkXdUYSmeL2BiM/yVA=; b=UJ4vBlt25yfgppKi/EGlN9I0qaI1sNQFPYVhO7Ak4uhArtwX3+ne3qLJiP4KnEKk3ScwaSsefi57/rVHKENvwepYr2P1lAxB90kNeT6JVz/GayMRbxfn4zsRpy1C/hzVIJIFGaTqXlgAb7jIxnwdPTYzyy84vVU1nryZ4m3WLD6msIeK1L2ykY8Y3npWnA7Z90MF6gdsuhrbqGpNNHnMZD2YJJYV3svHpUh1yZujMkN5POJL7LkXSGjepNCF41v5T/yIhtp7ULCuRlWc9NOpP3pQ/luhOwlUK2S3VDopV555m0PMix8Vw5IC9Ju2zOtF/H3kMM+7zv2WrRYs7MK2/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=QjGutgWmdNAmtyCYslzGanJKtlkXdUYSmeL2BiM/yVA=; b=YpKcZIviIa39soayVpbAytOEAfdP0hW9hu/pPi//OFBAvuYL1xlOt3/REq7+7lkmxakJTdBQ+bGkEAVMoc5c/gQI0Wviw7bFXfNGcvp2b4R5oS/wJtZJpeJAM42CYPPsKmQ/U9wFohip452dyF76/W6IuseP+qxVwln+VGyhWrZfrhaRjlG38/pNtPbAcs+EGX5wyRi9bvKDXWrg1cE1gkxBfk+3NZH5+X4wd8XixO8RPCClaK1VKmvq7klLIxHCDwH2AgH6ZuX2rFLv6vJm9ZL3NedWQcSNRIS4b4J1aCKBEVvQArrjLS9ISXFdyzv/9Bqcm9yemhoV7p3gKVqncg== Received: from DM6PR13CA0041.namprd13.prod.outlook.com (2603:10b6:5:134::18) by BL0PR12MB4659.namprd12.prod.outlook.com (2603:10b6:207:1d::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Wed, 10 Nov 2021 06:36:31 +0000 Received: from DM6NAM11FT003.eop-nam11.prod.protection.outlook.com (2603:10b6:5:134:cafe::9b) by DM6PR13CA0041.outlook.office365.com (2603:10b6:5:134::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.8 via Frontend Transport; Wed, 10 Nov 2021 06:36:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT003.mail.protection.outlook.com (10.13.173.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:36:30 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:36:28 +0000 From: Xueming Li To: Qiming Chen CC: Luca Boccassi , Qi Zhang , dpdk stable Date: Wed, 10 Nov 2021 14:28:42 +0800 Message-ID: <20211110063216.2744012-39-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8b747f78-73f1-476c-21e9-08d9a4146e7b X-MS-TrafficTypeDiagnostic: BL0PR12MB4659: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DYbnYhVRJClPjC8rHa700S8eeGDPaP4JLmIY3M4SU/cHN9BLDcqm0A/gl9B6aN7Y815HMLeNcnH1FFkLHTCjX3rSyiT7jMrs6dhURwwntjXuRaGQ3EqjG7sNqCi+HoOMYkxkznDdS0QCSBNED89kvpAXi5N5qhUykly14N1If2WngvyN/3sDsuv57a9mu/hBLh6QApGL9mXW3J8xgLnwYafHsJUdkpsTFFPDr9yMIfQR4v62F7OLoyzxTVehf+GhZqK3XBKwMaPnWusSE6hamfxcYtObtPjL0D9y88XKhluIDUKzOehYW1jTWL+7KGEwGf3IriTIrkXXzi8+ulAHrlQALwPa6FswJ71L/+8Fa3Jk7N6aknBF2ma/DynH9lXgIl0fc/nNxVaTbiEY43B8EDotcoafwPfMntaRrEZ1buY2zod8Fa7+XWSZtP8S8S5UjmnBK3IBNBg7exsOU6DM+OYw0xezqttGQ4M2yUZ9KqzVpD3WjAImF+w8drQT6/F+s8QCx0fni+lCJ0iDol18O/tWjYFM4s1XQEtUe4ZAxKxYZUKk3jbGGxee/x8VSAr4Um1cx+4fO3vevr75Yn0w+ph1iRYaS0tt+MBizEsitaKcr1D9yZzIYwJ7mQXBdbtXU28YIm6t5j2uDx3wFkvEMdlZ0EhVYi43Y/bZuOwGPbBDFPIAOWdgPVgfwUkPmCiV0ksaICJiQPHQyHIdcSRtM4GijjO1oRCDzI439mpT9KHuWNtD+jchvfErPI+qXfXyi5313hs7sb7qBCDPc2CTbJXzaTj2yyUOH7E/UyZ99mAIs/9N4W3Sl9FlFMFICTQgCxFAAUzl2vqxwoKuIJbfjg== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(8936002)(6666004)(47076005)(1076003)(4326008)(336012)(6286002)(36860700001)(36756003)(4001150100001)(966005)(316002)(2906002)(26005)(356005)(70586007)(508600001)(5660300002)(426003)(53546011)(6916009)(54906003)(16526019)(186003)(7696005)(8676002)(82310400003)(55016002)(2616005)(7636003)(36906005)(86362001)(70206006); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:36:30.7171 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8b747f78-73f1-476c-21e9-08d9a4146e7b X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT003.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB4659 Subject: [dpdk-stable] patch 'net/ixgbe: fix hash handle leak' has been queued to stable release 20.11.4 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/21. 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://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/c1723e2d14001ac5b7aa0227e4aef911b4e0e9dd Thanks. Xueming Li --- >From c1723e2d14001ac5b7aa0227e4aef911b4e0e9dd Mon Sep 17 00:00:00 2001 From: Qiming Chen Date: Tue, 31 Aug 2021 21:24:07 +0800 Subject: [PATCH] net/ixgbe: fix hash handle leak Cc: Xueming Li [ upstream commit 03f83d6c5c9f9d30ef2cd7c2b0fe5d86935cd372 ] In the ixgbe_fdir_filter_init and ixgbe_l2_tn_filter_init functions, after the hash handle is created, the handle is not released in subsequent abnormal branches. Fixes: 080e3c0ee989 ("net/ixgbe: store flow director filter") Fixes: d0c0c416ef1f ("net/ixgbe: store L2 tunnel filter") Signed-off-by: Qiming Chen Acked-by: Qi Zhang --- drivers/net/ixgbe/ixgbe_ethdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index bf0e850402..1af04357cc 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -1393,6 +1393,7 @@ static int ixgbe_fdir_filter_init(struct rte_eth_dev *eth_dev) if (!fdir_info->hash_map) { PMD_INIT_LOG(ERR, "Failed to allocate memory for fdir hash map!"); + rte_hash_free(fdir_info->hash_handle); return -ENOMEM; } fdir_info->mask_added = FALSE; @@ -1429,6 +1430,7 @@ static int ixgbe_l2_tn_filter_init(struct rte_eth_dev *eth_dev) if (!l2_tn_info->hash_map) { PMD_INIT_LOG(ERR, "Failed to allocate memory for L2 TN hash map!"); + rte_hash_free(l2_tn_info->hash_handle); return -ENOMEM; } l2_tn_info->e_tag_en = FALSE; -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:03.809835755 +0800 +++ 0038-net-ixgbe-fix-hash-handle-leak.patch 2021-11-10 14:17:01.787413440 +0800 @@ -1 +1 @@ -From 03f83d6c5c9f9d30ef2cd7c2b0fe5d86935cd372 Mon Sep 17 00:00:00 2001 +From c1723e2d14001ac5b7aa0227e4aef911b4e0e9dd Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 03f83d6c5c9f9d30ef2cd7c2b0fe5d86935cd372 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 3cd2a094ae..7b198d95c2 100644 +index bf0e850402..1af04357cc 100644