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 E0AAAA034F for ; Wed, 10 Nov 2021 07:43:25 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DB33E4014D; Wed, 10 Nov 2021 07:43:25 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2059.outbound.protection.outlook.com [40.107.244.59]) by mails.dpdk.org (Postfix) with ESMTP id 85FF54014D for ; Wed, 10 Nov 2021 07:43:24 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gJm3NgM3pw0OO7HBNJWeYnBYhcZsCKs48J9v9XEKgdzbcdTj28hNbZNqAqmMbp5YuwvQR7P0BIJWP2qLQw6CrVD40Tk69YiBg6pbmOAUkfMVoBMzp4F3sYKm0YQ4rbpQESsAZSLZo+t5FlhQ2QoZ0f49GtsZPRxvfX5Vxgxa5SslCE+0HppsJ0Fg5OrALc2p9OkrEm8jsf8J5YIzY+6298C++SHI35JX8IB0avMSr81nq0osGSXu4G0j4EsTTSZXWLCA7l2Qtmi9aKYH+cfC2yZAblFYXfXGeFryIYKVjcnxwwQLNW9QmMLOhjqAUph/51tqk9TidlF0EuTbVg/QdQ== 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=P7ozRNnq4xx/I11bGSlg4Pc1PGz1LORKZBFomWQjEKA=; b=PpjdKNkrsd1CZJiN2uidk24v4wvvIPoCPaKbXWqKHeFW5fHnPFLJLFi9Z/xQZ/kkgEE0XhjDqOz7q0foG780wt/XDO7I7vBkEJNT+g4H7NxOQAGyb3XxEFX/bHX7fmPQeJXOKK0dVrrdwJmETzTYOq7OT6eyRNX8t/Fpyzc5rX67CgAIo5Y6z0W85tJ159xGu/gi+x3jtJPe7dx+y1PCIlTw7Hjg5JCMLFfGVWqaINkWxUnPraQx0UrLRNjotCHDRAubpjCk1KJYPqRqR1JmJwOwx0s/0P0OmMYKmqGzhomS7ODAAzQuwijuzWWKOZVagVAmv7gXzkwy6WdvSF7oUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=broadcom.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=P7ozRNnq4xx/I11bGSlg4Pc1PGz1LORKZBFomWQjEKA=; b=j0UlU7N9jIcO04GPcdKKnXsGNGUkYjeRLmE0pOQfmE+ko+C1En4PW5tSURGhMnpJCXbebju7xbwrZXG2Bew8QtZqqxjWWpC1bm706cZqqdRJOq0TJbkr1XLDBFYXfoztYk6Cj8nCKY2hQMNvzfsnhDZ07wXTPjAgW7KSRmMw9T7rRa93r4P+AkaSUzK31bnGGlHWHK3K2y7eJua4oNNgE6pHkssqAzcOSOOohblCxAK9XBPCkqU/+2eG8uP4KgxPcssXi8AX8qZT5kgUQ7C1ZGbgPgpj1Tip0VO/8yK7ipPHbS7/zrIgSm+dwY4YiaYIrxJYh10jaCUQE5X/RTQkRQ== Received: from DM5PR07CA0101.namprd07.prod.outlook.com (2603:10b6:4:ae::30) by BN8PR12MB3490.namprd12.prod.outlook.com (2603:10b6:408:48::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10; Wed, 10 Nov 2021 06:43:22 +0000 Received: from DM6NAM11FT017.eop-nam11.prod.protection.outlook.com (2603:10b6:4:ae:cafe::4b) by DM5PR07CA0101.outlook.office365.com (2603:10b6:4:ae::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:43:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; broadcom.com; dkim=none (message not signed) header.d=none;broadcom.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 DM6NAM11FT017.mail.protection.outlook.com (10.13.172.145) 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:43:22 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:43:08 +0000 From: Xueming Li To: Ajit Khaparde CC: Luca Boccassi , Lance Richardson , Somnath Kotur , dpdk stable Date: Wed, 10 Nov 2021 14:29:43 +0800 Message-ID: <20211110063216.2744012-100-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.6] 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: 36b7fa71-8166-4c34-699c-08d9a4156390 X-MS-TrafficTypeDiagnostic: BN8PR12MB3490: 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: 6OPA0ntprO69V+KaWXB+TTbGIZ4Y5vwlU+MSajiLuRoEbs8DotuyYfRn+RPR0NU5XNdURGvM68Qt5nWM1NsnrtNPzOp63LyAQgTiahDN9G4MPaczVpUdcvY1VW+OvJPlo0Gl18mA0P9xyDQbL2MHigtvafxcyLiD+nueyd9vJ05GjGOmQIEuyvMVO56pyx8KYvlOveVWEYYdvknBDHXNQowb9FBq20nb5okxcTnmBHsTiCZJIMEgFNUKn8ijAK8BF7/T+5uqOjRx6DsCBh8c6+WsekXDwq9z+kVXJynKPumuOp7q6Smwbfc5Voy90Is+gxHhBJX3gNTtckVZ6unGy11GNNjZ7A+8jqsO89ZoziJAtutW7/4SzbzT8PT4VtGPjLdPM+eGHJWP5hIa3kBzBqDiRDvIBzihDhhLepqJKYYnt8LcHj+eny9kFmQ+/TQjk71LkZ96UTT2lDSODDvkXcxlxyR7VD6KBmOHA6DEc6wsyFV1s1fElSc4MWvMepWs83TlAqh3IvYAjv7FIMF7KJKyghGPF+XFclboHugsocLaluMv7Ni5nLN4ZyGfE7ly/F3ATTUrERb3bMENktic2gRft5y/x81npA2naGGm3Wd4vi6iX2pvk4v+67qmoZeTJQztpUGZJTwVbaK+jmql1PLqAIfNpqkXi/1s1oDLMOCAq3eU7h1vAqpNzJAWDTCX9QA4cCEcE/A3hn+V0NWw3I1UUWKWEmyLTxFhIs3tMGMX3lyIB5AGYMbThwvku10nqsHubICqkVrTJ2zWXjyC8PNrKTmgeHHncJPQ3aoDPVcHqoZjYnzd3crlRr0HflaAHOBgLO3c+dFaCQP93vHavA== 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)(36840700001)(46966006)(36860700001)(70206006)(36756003)(316002)(54906003)(70586007)(8676002)(356005)(8936002)(7636003)(186003)(7696005)(26005)(82310400003)(16526019)(55016002)(6286002)(426003)(86362001)(53546011)(2616005)(6666004)(336012)(1076003)(4326008)(966005)(2906002)(4001150100001)(47076005)(6916009)(508600001)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:43:22.0193 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 36b7fa71-8166-4c34-699c-08d9a4156390 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: DM6NAM11FT017.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3490 Subject: [dpdk-stable] patch 'net/bnxt: fix memzone free for Tx and Rx rings' 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/5b3f9bec58acdcb8b2bcd194ba529019f81cf811 Thanks. Xueming Li --- >From 5b3f9bec58acdcb8b2bcd194ba529019f81cf811 Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Mon, 20 Sep 2021 16:11:51 -0700 Subject: [PATCH] net/bnxt: fix memzone free for Tx and Rx rings Cc: Xueming Li [ upstream commit 64a4d59df5d668e18762a80d360a1aa8a9e8d81d ] The device cleanup logic was freeing most of the ring related memory, but was not freeing up the memzone associated with the rings. This patch fixes the issue. Fixes: 2eb53b134aae ("net/bnxt: add initial Rx code") Fixes: 6eb3cc2294fd ("net/bnxt: add initial Tx code") Signed-off-by: Ajit Khaparde Reviewed-by: Lance Richardson Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_rxr.c | 3 +++ drivers/net/bnxt/bnxt_txr.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index 6b3603d11f..c1893bb940 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -1134,6 +1134,9 @@ void bnxt_free_rx_rings(struct bnxt *bp) rte_free(rxq->cp_ring->cp_ring_struct); rte_free(rxq->cp_ring); + rte_memzone_free(rxq->mz); + rxq->mz = NULL; + rte_free(rxq); bp->rx_queues[i] = NULL; } diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c index ad78fa1bea..78d7329f2b 100644 --- a/drivers/net/bnxt/bnxt_txr.c +++ b/drivers/net/bnxt/bnxt_txr.c @@ -37,6 +37,9 @@ void bnxt_free_tx_rings(struct bnxt *bp) rte_free(txq->cp_ring->cp_ring_struct); rte_free(txq->cp_ring); + rte_memzone_free(txq->mz); + txq->mz = NULL; + rte_free(txq); bp->tx_queues[i] = NULL; } -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:06.415107018 +0800 +++ 0099-net-bnxt-fix-memzone-free-for-Tx-and-Rx-rings.patch 2021-11-10 14:17:01.860746172 +0800 @@ -1 +1 @@ -From 64a4d59df5d668e18762a80d360a1aa8a9e8d81d Mon Sep 17 00:00:00 2001 +From 5b3f9bec58acdcb8b2bcd194ba529019f81cf811 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 64a4d59df5d668e18762a80d360a1aa8a9e8d81d ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index a40fa50138..4c1ee4294e 100644 +index 6b3603d11f..c1893bb940 100644 @@ -26 +28 @@ -@@ -1207,6 +1207,9 @@ void bnxt_free_rx_rings(struct bnxt *bp) +@@ -1134,6 +1134,9 @@ void bnxt_free_rx_rings(struct bnxt *bp) @@ -37 +39 @@ -index 47824334ae..9e45ddd7a8 100644 +index ad78fa1bea..78d7329f2b 100644 @@ -40 +42 @@ -@@ -38,6 +38,9 @@ void bnxt_free_tx_rings(struct bnxt *bp) +@@ -37,6 +37,9 @@ void bnxt_free_tx_rings(struct bnxt *bp)