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 5FAD2A0543 for ; Tue, 21 Jun 2022 10:10:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9D2EF42B76; Tue, 21 Jun 2022 10:09:54 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2059.outbound.protection.outlook.com [40.107.223.59]) by mails.dpdk.org (Postfix) with ESMTP id 720C0427E9 for ; Tue, 21 Jun 2022 10:09:53 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NwXDIL0UTwKmgSXOuZzX3ypdVUiCFHtbH+aANGp3cfHqPOdLlHDOVq1n3IjDMBiAWHkGkkYvqHxYsEB0bbYBAdR/h06LtcRp9fEJJJtcwAQoYI1ioFsbwRtZpvCbx/KvZULUHEtC1e++0A8m3FqeY6Yggh5ulnAFlL1KN++tApo4HEIM/tI6j1oDWvZl9J6RVroeDinOZ7Fq0aZaZt6FaOeQg385024F/JVeA14bnh1r7mfDsdqkX4d9Zb/vZV9xDjytK5Eh+Fwr9uYPAOvoN5mSH0WU/Ghw+UIqNcXTewpeH5X5MA25qpQeqcurOv0LfMJcwrOI83F75wVaIshEvg== 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=VIWOo2rQD9h8TMJ561dPJf8PG616zEankcLTtjIcrT0=; b=XxxKgf2b1LDzZ8khUn33Wbcd+HU6+3XDdK781WLOdgyUqjY2uKtEA1T23d5t6B5rF0H1+yPRT+rXiGhlJE1es7ZoWi4b4ksE5F6sx/hA5/YEFM3Qhk6kcNR1NkrVq1VtsCzmUGYhPm6Lk10qg/gCtNW82xgDVrTgPZTrmCdzaodMTUrz9bFpACLajP2FZbr73m0lmW7YsSwN7GRgIbF6047kM4dbW4/XJel4I5TuKYVOLfb17DMq87d7cUdL6Tt9GBmwTwbcQIrIffzKH8OY6m5AX6r3oQ9CJRFApjMQJsTO+OrVIonLj72keOXgyZt/YjfB4zr3etR/DcY90naOOg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.236) smtp.rcpttodomain=oktetlabs.ru 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=VIWOo2rQD9h8TMJ561dPJf8PG616zEankcLTtjIcrT0=; b=polK5g6H0hNlcuNynUzZEH1Fjx/o2uXgzowy6scDk/STxZ4xnZRinBGLMWmYXyU0mL5dIEzGD2I3D0b91LZv0MTtrwgvBPHV9AKqCcSQf8+l/XtaJpYeKJOO7Sh1OIpZs2QKDYSPyW4Z+rWCWQ36sOh73WTaiILP4WNmAVL8q4XybSDctY3M+pXTmzVs1BwZ6j/DkFqv2bG5ReFax0q4VsdlzoA/DAZJlhl/HckFmFxl5wLEqZ5dHng/sC/x7etPnWRVfTZGCAhaXNkGMkNey5UXCTdxWjdg3RLWNBDgc2XgyOJ9rIRRaUmWXAY0fImeBoSdVluVprYcuIzSzIIh0g== Received: from BN6PR18CA0011.namprd18.prod.outlook.com (2603:10b6:404:121::21) by CY4PR1201MB0245.namprd12.prod.outlook.com (2603:10b6:910:1e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Tue, 21 Jun 2022 08:09:51 +0000 Received: from BN8NAM11FT025.eop-nam11.prod.protection.outlook.com (2603:10b6:404:121:cafe::ac) by BN6PR18CA0011.outlook.office365.com (2603:10b6:404:121::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.22 via Frontend Transport; Tue, 21 Jun 2022 08:09:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.236) 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 12.22.5.236 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.236; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.236) by BN8NAM11FT025.mail.protection.outlook.com (10.13.177.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:09:50 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL109.nvidia.com (10.27.9.19) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:09:49 +0000 Received: from nvidia.com (10.126.230.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.986.22; Tue, 21 Jun 2022 01:09:47 -0700 From: Xueming Li To: Chengwen Feng CC: =?UTF-8?q?Morten=20Br=C3=B8rup?= , "Andrew Rybchenko" , dpdk stable Subject: patch 'ethdev: fix memory leak in xstats telemetry' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:02:21 +0300 Message-ID: <20220621080301.2315720-76-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.35] 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-Office365-Filtering-Correlation-Id: acd3eebc-8628-4f6f-1e2e-08da535d6a37 X-MS-TrafficTypeDiagnostic: CY4PR1201MB0245:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F8SJ+Qn9OKonVzvhKJNFU9wiEBF4sSQTHgUPJqjFAnCIsVp0Hmwb+k1U0dixAI5LxHHIJTtfdpK1tSRXsXi5lOQEmwexphR5wJM7XXUcSkTxaDk6xFSt/mfFyTVCFj5hvGT2FcF2OcMjX5kjQhH7DDbXzq/txdCmlpL/SM4MgcQiaH6fqMdtYGvcSBRwV3b7ynrz9ZjtnA47trHhtL9nIDS89j5fM9QLF6xDjVc/br8jX5MAtwi7sUJZ57IeD2GOijw/l+bDNgtOuUC1fDekL2ApGOsKRHXGYJliTh5fSxrKxW+tCnmmxvmOaTKKJ/+HjTUZKQ7D8Yi8tNj7zEBf9bbUc3Qwti8mxHK1l/VawxfyIk6CZ4b1ppCkeqOyD9nbpTMWdjsvhDjaVb3bpAyokQs7wB2Y6aoROhKPzMJAt/ZnbS9dMk9ksOUhNXYcC+2ZEeigjN0kZKbdSrZ5R/bg6zgUW/vBW771fMr9EP4byD8ToLgG8s6XTFldRQ/+s/JfY7D4LupKzrDZvzc/1ghW6tO/Wpc+UJyLP6pYYcPTmx1DaqxqSGdR9BxL4KcwlwuNk4MEN2jkdiYWMLH/2ilDBUrHXsJuxTzOxTCNFwfGaj5NYGB5ik5XdkGDCUt7LOV7D/0Ch+R213cRgbbuQ5IQtEYdPQKtrjkSvcMgU8Fx85WRFm9WOzk8Bc2dpb996/1AYyLdhGgNu37+pJk0gW1fvXZwbkyNITFy5x0+2LbKxOjBb+qcfOWlN7M29Y9CH8ejOqvr6cvXKyEHEg1cz/zDbb7HxA2ySUsNvuKkRsdHCFtQzYXud7XSiPSNTgm5qdbgaX9Ivxe2VrVlGJ+tAMfoNXhgkDzLVmuX8OMfVQ3wKhk= X-Forefront-Antispam-Report: CIP:12.22.5.236; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(376002)(39860400002)(346002)(396003)(136003)(36840700001)(46966006)(40470700004)(86362001)(82310400005)(5660300002)(40460700003)(81166007)(6286002)(8936002)(36860700001)(2906002)(82740400003)(478600001)(966005)(316002)(336012)(54906003)(8676002)(70586007)(426003)(40480700001)(356005)(1076003)(55016003)(66574015)(6666004)(47076005)(4326008)(6916009)(53546011)(7696005)(41300700001)(70206006)(2616005)(186003)(36756003)(26005)(16526019)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:09:50.3688 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: acd3eebc-8628-4f6f-1e2e-08da535d6a37 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.236]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT025.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB0245 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 20.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/23/22. 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/7386b53220564c4f10aefdadd9ccb09bc37f2216 Thanks. Xueming Li --- >From 7386b53220564c4f10aefdadd9ccb09bc37f2216 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 13 May 2022 10:53:55 +0800 Subject: [PATCH] ethdev: fix memory leak in xstats telemetry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 2d00e2b4382d6538d305fc6f3606ecea72011f5b ] The 'eth_xstats' should be freed after telemetry dictionary setup. Fixes: c190daedb9b1 ("ethdev: add telemetry callbacks") Signed-off-by: Chengwen Feng Acked-by: Morten Brørup Reviewed-by: Andrew Rybchenko --- lib/librte_ethdev/rte_ethdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 028d16f99e..8df4b0f6ac 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -5721,6 +5721,7 @@ eth_dev_handle_port_xstats(const char *cmd __rte_unused, for (i = 0; i < num_xstats; i++) rte_tel_data_add_dict_u64(d, xstat_names[i].name, eth_xstats[i].value); + free(eth_xstats); return 0; } -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:52.666404356 +0800 +++ 0075-ethdev-fix-memory-leak-in-xstats-telemetry.patch 2022-06-21 15:37:49.114451524 +0800 @@ -1 +1 @@ -From 2d00e2b4382d6538d305fc6f3606ecea72011f5b Mon Sep 17 00:00:00 2001 +From 7386b53220564c4f10aefdadd9ccb09bc37f2216 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 2d00e2b4382d6538d305fc6f3606ecea72011f5b ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ - lib/ethdev/rte_ethdev.c | 1 + + lib/librte_ethdev/rte_ethdev.c | 1 + @@ -21,5 +23,5 @@ -diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c -index 10db76c1a6..dc47543e6b 100644 ---- a/lib/ethdev/rte_ethdev.c -+++ b/lib/ethdev/rte_ethdev.c -@@ -5595,6 +5595,7 @@ eth_dev_handle_port_xstats(const char *cmd __rte_unused, +diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c +index 028d16f99e..8df4b0f6ac 100644 +--- a/lib/librte_ethdev/rte_ethdev.c ++++ b/lib/librte_ethdev/rte_ethdev.c +@@ -5721,6 +5721,7 @@ eth_dev_handle_port_xstats(const char *cmd __rte_unused,