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 7B750A034F for ; Wed, 10 Nov 2021 07:38:47 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 76D5140E28; Wed, 10 Nov 2021 07:38:47 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2071.outbound.protection.outlook.com [40.107.92.71]) by mails.dpdk.org (Postfix) with ESMTP id D28A440142 for ; Wed, 10 Nov 2021 07:38:45 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RvIvHW5tzJEPb1u76vECCeMyc7oRSW8UZzN6Kn9C/t1RfAR6qzaHJGfR7kVpZwGzx+7J8EwSuwN5YBHeKFT+fVokFpzopILnObgKfpFLAJk4BxJjVH+tmZRf3WkPBieDIxTnr3K0bxLDLREEzGDoESB9ir81wliFQvPYv/vnzcszHS9UqZq/8oN4LUMUye+7rVj40deqcurwG7OPHX4nEnpxLRW2YIZ+u9FdItUU8CIoQ34cQkx0zM8czOG8oqxENEFY6EMWn28ZI7OuemyuXQBjxKBzcxFrG1z+Y6Ibvx3K4sIfS5ER2Z4E7VAVZ9Uq+FURiK9gHRlKAS+lZc/X0g== 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=ZQJsJtw9O6qKe9eTON2hsEWQx3zjrF//GsmbRPR8UNg=; b=YvkVgoKum6jUwtYtSkDgfpeQIom18/FRvVPg1GqUijDliHVQ33aK/ynCKYvKRWj6Nup+ezSf/q3nkPeCjb/aZAQJVcHs4/7XRPyOlRYzdoRFMczUpmZMVQXt7rM+CpweugCvDWKl+ZWBkZCfHC6jfx1l2cBSfDW5i0saRJ4ZK85u9thduX/xRJBi9hud4C6cf6gSTdngoAickvJixQ3EAjZAXbVy/RGxgldjBrEXZkDhESxmiHGkj16wCLvecbbyctz/smXJ8SzuRvyoV9GQeZZE1mk2rEOQZ4WMc8YXdhhogq4RHbNl08b+KwtqSMORydi0CkR/kMH0tuS6vM48Kw== 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=ZQJsJtw9O6qKe9eTON2hsEWQx3zjrF//GsmbRPR8UNg=; b=lMmhJTZk3lPJguriyKCUfcrJIn6inqL1r254q7+Ivl5MOUbLPJofux2qaVkDaHDkCGYovRBedjWba+wz68Sihbc5A+xyd4YhrWSgbD97rnnS2M9pySa819yW0ieePve2y2/Pcj5NPUr82mWP61s+fGfT4ecrIfs2GmcL9O3ReKvwCuhz0C+IGmzSgbEXtGepiFHkj19Rebgfz6vXsPW5CIubTJDzXxpBqxSwWxEYoGFnEJTIxdyHSF/UpjSNleLcTDIOxitHEGuQ9a2rSS5bZe9aq70jK+bNF0d1yz/PUOCUakJvAPchXQ/J/CqhbMiYgTAgCBTRyEGgUSbl7F347g== Received: from DM6PR01CA0015.prod.exchangelabs.com (2603:10b6:5:296::20) by MN2PR12MB2928.namprd12.prod.outlook.com (2603:10b6:208:105::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.15; Wed, 10 Nov 2021 06:38:43 +0000 Received: from DM6NAM11FT044.eop-nam11.prod.protection.outlook.com (2603:10b6:5:296:cafe::f2) by DM6PR01CA0015.outlook.office365.com (2603:10b6:5:296::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.16 via Frontend Transport; Wed, 10 Nov 2021 06:38:43 +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 DM6NAM11FT044.mail.protection.outlook.com (10.13.173.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:38:43 +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:38:41 +0000 From: Xueming Li To: Qiming Chen CC: Luca Boccassi , Qi Zhang , dpdk stable Date: Wed, 10 Nov 2021 14:29:03 +0800 Message-ID: <20211110063216.2744012-60-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: 2235d3ce-5ba5-4964-200d-08d9a414bd4c X-MS-TrafficTypeDiagnostic: MN2PR12MB2928: 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: IJMRlTKdmmmkVEjN+ijMb3Tcab2XhRqlcwKCVcaTabaCfmh2SY5yPlmDYMs07evAbxC0EE0dIrns7ylR+qWe2WauA+kXoQcAcJw/45Y69f6dtW7uL+/XX1EkA+9/Xdd+vka1IqkTtaysyyNbllG3hsfed74rvjMKQYKbfJDZIKjD3wG+B5X7av4YlglZ0/IiAebj4DykKBKTBnicPuge+IL+4vqMfSQhSlWctdFQy6hMqW/v4xI8lCjQuGP1NZh9iQ34r35PNXIrEU9TaCOZN//JrIWUGmhM+lZ0sayCbuUWB3iezkul/fed/RcK6y+e4BAkro9A+dmj2xpFUI7cVHCI0tLbOk7Mv5s0KHGybzwDJij7Gh6ZVZTB2zEjg77Bgj8YUnY5EvUkSqshUpEEGPcGk960xE/Xh95Yc/j3oVtrN/QbnZirVWzIf1pLEKq6Y9aKNB4bVDPFZXm3HBD4ad61B4Dvmhudb51MVJ1a/bZycdUGb6OzhE1i05q/leS00wqYZjJx9wk7gTiVeIkFr8HL7YIa+nwCCpNHtB5kDE5yt0AtDaGXm1+JreGk8Ealai5esFpvjlwfczp78kxdFSDKbNsxUGA/ZWOhDdPsAVZ27W2NTf2sTwuimX8Z+0AFgIIIT9eUhLOU6ThuOzQc2S+IgCMNOZZFirgfT0RZMAT87+pFD9SB8iyQmdjMTwdXJTcEIi9m8FjxYScyQAL2lIEYb/+3JzQag+bxkJKyuClyfMEb4MF8/gpZ8lKc811s/FKmNK/lbHYFaHuejaVoLVvprRFSoE2IZC4hYWPGsyg7MK/a4Y5mcrFr4TkWRRkhYT82HAeir9OpL/Q6BFHWOQ== 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)(508600001)(186003)(70586007)(26005)(7696005)(53546011)(4001150100001)(1076003)(966005)(2906002)(426003)(55016002)(6916009)(36756003)(6666004)(16526019)(5660300002)(70206006)(316002)(36906005)(6286002)(54906003)(83380400001)(36860700001)(86362001)(82310400003)(7636003)(336012)(8936002)(47076005)(2616005)(8676002)(356005)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:38:43.0577 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2235d3ce-5ba5-4964-200d-08d9a414bd4c 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: DM6NAM11FT044.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB2928 Subject: [dpdk-stable] patch 'net/i40e: fix device startup resource release' 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/4fc96ab6c9d3d17054758a9c6ceaf3013043c75f Thanks. Xueming Li --- >From 4fc96ab6c9d3d17054758a9c6ceaf3013043c75f Mon Sep 17 00:00:00 2001 From: Qiming Chen Date: Sat, 21 Aug 2021 17:44:35 +0800 Subject: [PATCH] net/i40e: fix device startup resource release Cc: Xueming Li [ upstream commit daf3332e11ed7ad6cc12e0aa69cbb8b602bc5685 ] In the eth_i40e_dev_init function, the tunnel and ethertype hash table resource release interface should be rte_hash_free instead of rte_free, and the previously registered interrupt handling function also needs to be removed from the interrupt list. The patch is amended to use the correct interface to release the hash table resource and release the interrupt handling function at the same time. Fixes: 425c3325f0b0 ("net/i40e: store tunnel filter") Fixes: 5c53c82c8174 ("net/i40e: store flow director filter") Signed-off-by: Qiming Chen Acked-by: Qi Zhang --- drivers/net/i40e/i40e_ethdev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 5e3b80a6b8..a364338564 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -1817,12 +1817,14 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused) return 0; err_init_fdir_filter_list: - rte_free(pf->tunnel.hash_table); + rte_hash_free(pf->tunnel.hash_table); rte_free(pf->tunnel.hash_map); err_init_tunnel_filter_list: - rte_free(pf->ethertype.hash_table); + rte_hash_free(pf->ethertype.hash_table); rte_free(pf->ethertype.hash_map); err_init_ethtype_filter_list: + rte_intr_callback_unregister(intr_handle, + i40e_dev_interrupt_handler, dev); rte_free(dev->data->mac_addrs); dev->data->mac_addrs = NULL; err_mac_alloc: -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:04.720591875 +0800 +++ 0059-net-i40e-fix-device-startup-resource-release.patch 2021-11-10 14:17:01.817413194 +0800 @@ -1 +1 @@ -From daf3332e11ed7ad6cc12e0aa69cbb8b602bc5685 Mon Sep 17 00:00:00 2001 +From 4fc96ab6c9d3d17054758a9c6ceaf3013043c75f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit daf3332e11ed7ad6cc12e0aa69cbb8b602bc5685 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 7b230e2ed1..7a2a8281d2 100644 +index 5e3b80a6b8..a364338564 100644 @@ -27 +29 @@ -@@ -1760,12 +1760,14 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused) +@@ -1817,12 +1817,14 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)