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 43941428F8 for ; Sun, 9 Apr 2023 17:31:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3DB4742BAC; Sun, 9 Apr 2023 17:31:57 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id A791842B71 for ; Sun, 9 Apr 2023 17:31:55 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AVL8j9Roqyq3MlpK5ETD/ycYf5g7cRwx5QrHYLSg1KOyr1GiGZzUOjeVRrlDrC2mvaHlBoXXu+kWhyq9HYlqhp6i4ZodzTZEXb8piKque14WcpDzHQvmczkuXw3Plka1BpFiA8KtWqIYCHUQwARNAxYjczhPSv2onta+2Jb8ozeiiT6FSsAseUwXwXSlLIk3EnvVlKUk2vrQ/R7g0Ru7cyxo9LIw0DoHNbvaczSQcP8XL9kkjFPhxvuLWWIm3pbNZDCgILuBWrP5TSXJs9YCoOOD1K1NzjxIch9vkiWJV2b0xKSD9pIY6lM+2eC7iTLzK9SXjzWsxMgqBP1S8zke1A== 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=YN9I1XsnRx6wwNOluP8S/TXDwy5D4rRTRRbsqWq6uFE=; b=DPcNNfQ3ASI/JkbxLzSvlIyUCuzlal0bmaLXpV6sUKW7NSmusERhMObV93OCHtrTQ9xT3wRmAGUMnGNjyHRKaG/AcSKMqbj0iFDp7F4u+lqsYe5gWm5LvjlBS88CLR0RHOoP2/mmMlCX+JNc6nn1ONW8c/F4CI7q0LSHwrVcD6irhi2zpN6pobg7HcGTdNucdAmSMOjKjhRECDyLDfB0jhjszbg/o8m9I+R9fKdgrzLrEOJ8ptV8pxsFx7sVJQPy0N3D9qa0ZquFxIm9locVZFnb2FO3WojwamgIf0MWCH4JSqTL3P4/1KDMz/zEKiSM6C8Yw0JZ9BkY80jHrLt+fA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=huawei.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=YN9I1XsnRx6wwNOluP8S/TXDwy5D4rRTRRbsqWq6uFE=; b=LIdo+OR+Lm7cDQOIBOkOn/jRrg9oharJd9vlgNIajFOOHg5NsZtTO3sFlEN/BeKa6R3z121RHoYJtrN/CsRxE2SyasOWjqOVkOHwF0agi2tZgtNrViXLgk5ROciaC0Nwq3sl1Xz8b9h9+TPqxWNYYD/XdjGEfuWgSWZ4Q0LmzFsRe57tERM94qMfyk0yAEsHfaN/NvLV9gynHWXFRZ3xU1302Mf2WASM+PNiEKwOhWY2QuDU2VlNTiuc7AhTCeHMKamncKtAKZ45X3zDw23yuQPZb7JLkNseWy3jje+y+eS7ffTdYF5Wt2Nyb3H+W87jQJalRdqvQon6ENe4nVa7hg== Received: from BN9PR03CA0986.namprd03.prod.outlook.com (2603:10b6:408:109::31) by CH2PR12MB4040.namprd12.prod.outlook.com (2603:10b6:610:ac::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.36; Sun, 9 Apr 2023 15:31:54 +0000 Received: from BN8NAM11FT076.eop-nam11.prod.protection.outlook.com (2603:10b6:408:109:cafe::96) by BN9PR03CA0986.outlook.office365.com (2603:10b6:408:109::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38 via Frontend Transport; Sun, 9 Apr 2023 15:31:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT076.mail.protection.outlook.com (10.13.176.174) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.25 via Frontend Transport; Sun, 9 Apr 2023 15:31:53 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:31:44 -0700 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, 9 Apr 2023 08:31:42 -0700 From: Xueming Li To: Huisong Li CC: Chengwen Feng , =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'mem: fix heap ID in telemetry' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:24:19 +0800 Message-ID: <20230409152529.5308-72-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-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.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT076:EE_|CH2PR12MB4040:EE_ X-MS-Office365-Filtering-Correlation-Id: 441cc684-da4d-4fb6-8213-08db390f8bcb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1B0oTTHE81iZNSFNfNIn3gnKWVVL0Wn+fWqlVyMlMAeQx7SgWgarVluNTUjvwTn8cfdo4tWpA+wqYCzEo7eRgSBIjobz0oGS4H3O99cRd3Do/lHCXn+gcoLYrDRATlogoha+RLSL/qaBuSzhi629nZ/fNdBbb4+Wx6tYJXpc+ga14Skg0t0xMR6lAcF3vuKbjKtt5Tif6cfizK99nSqMaTxXoPAZokwbp9HgVw2wqR5JLGy3A16tPFgO/a5/oh3djc+wqfYwLL5qMN/NirZkXNNl7NKKVkg3wv4Qov2KRRSvOlf+bGogzprkbipYme+8z6kOSFwjIghlTwnK431M4zRO6612Goqd60HXECkqXkKvy2yPrsMPvoFxXnRvEQJ93MwughAZEvtpqXa0BSIedlu/FfmPXtoMumODmivNbWlpx2w+yhzqgjU2p5MmB98mA6SqxtekbtV7yM7zz20YBw1YlRq70mLPnXj2EXljpF+IJD1WsZ36BeOH7paR6fhDdlzfRSEDRq/1EFaHo1TBeq0sGMGtlV4b+iqBfYKLaEvG6ZzLEoPFqeWH7btFXrCd7+ZJ9VTU+UIrKt6Vvhs9bcFCwK1YzUvI5tSjdCIaUi4u7VZZlqDEz+aJc5yikQShvwOFHBsu1Q7mekbszvGXusvXgz+UCLUbyTuTLYV1ydYhRPeezE4kKcRST8qBqnmRqaOjL9lafnarseNn+U4+DNqYZYuRD1HDx3Wjfc0jT0ibvNO+Nf+T8lAfnZ9HJPp1gxh+vZPn+eoVDYYrWD3PycZULA041fMkTreVE2KQ9/NGGmtol/FPr2Gh9/8WF4QpzzQcx9xHH26swvj+P2NBOg== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(136003)(396003)(39860400002)(376002)(451199021)(40470700004)(36840700001)(46966006)(478600001)(7696005)(54906003)(316002)(53546011)(1076003)(26005)(16526019)(6286002)(186003)(6666004)(966005)(2906002)(4326008)(70586007)(70206006)(5660300002)(8676002)(6916009)(41300700001)(8936002)(82310400005)(7636003)(356005)(82740400003)(55016003)(86362001)(40480700001)(36756003)(40460700003)(66574015)(47076005)(83380400001)(2616005)(426003)(336012)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:31:53.3687 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 441cc684-da4d-4fb6-8213-08db390f8bcb 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT076.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4040 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 04/11/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/log/?h=22.11-staging/commit/73b11178a39618365920a9b6249e494a6178562d Thanks. Xueming Li --- >From 73b11178a39618365920a9b6249e494a6178562d Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Wed, 22 Feb 2023 15:49:53 +0800 Subject: [PATCH] mem: fix heap ID in telemetry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit a9dc4888dd1b81b82781aaa1e2606a1c53d13422 ] The telemetry lib has added a allowed characters set for dictionary names. Please see commit 2537fb0c5f34 ("telemetry: limit characters allowed in dictionary names") The space is not in this set, which cause the heap ID in /eal/heap_info cannot be displayed. Additionally, 'heap' is also misspelling. So use 'Heap_id' to replace 'Head id'. Fixes: e6732d0d6e26 ("mem: add telemetry infos") Fixes: 2537fb0c5f34 ("telemetry: limit characters allowed in dictionary names") Signed-off-by: Huisong Li Acked-by: Chengwen Feng Reviewed-by: Morten Brørup --- lib/eal/common/eal_common_memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/eal/common/eal_common_memory.c b/lib/eal/common/eal_common_memory.c index 8e427bf4b4..da6711d129 100644 --- a/lib/eal/common/eal_common_memory.c +++ b/lib/eal/common/eal_common_memory.c @@ -1139,7 +1139,7 @@ handle_eal_heap_info_request(const char *cmd __rte_unused, const char *params, malloc_heap_get_stats(heap, &sock_stats); rte_tel_data_start_dict(d); - rte_tel_data_add_dict_u64(d, "Head id", heap_id); + rte_tel_data_add_dict_u64(d, "Head_id", heap_id); rte_tel_data_add_dict_string(d, "Name", heap->name); rte_tel_data_add_dict_u64(d, "Heap_size", sock_stats.heap_totalsz_bytes); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:40.595263500 +0800 +++ 0071-mem-fix-heap-ID-in-telemetry.patch 2023-04-09 21:45:38.689042200 +0800 @@ -1 +1 @@ -From a9dc4888dd1b81b82781aaa1e2606a1c53d13422 Mon Sep 17 00:00:00 2001 +From 73b11178a39618365920a9b6249e494a6178562d Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit a9dc4888dd1b81b82781aaa1e2606a1c53d13422 ] @@ -19 +21,0 @@ -Cc: stable@dpdk.org @@ -25,17 +27,3 @@ - doc/guides/rel_notes/release_23_03.rst | 2 ++ - lib/eal/common/eal_common_memory.c | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/doc/guides/rel_notes/release_23_03.rst b/doc/guides/rel_notes/release_23_03.rst -index 17ffabbb8c..af6f37389c 100644 ---- a/doc/guides/rel_notes/release_23_03.rst -+++ b/doc/guides/rel_notes/release_23_03.rst -@@ -260,6 +260,8 @@ API Changes - Also, make sure to start the actual text at the margin. - ======================================================= - -+* The telemetry command ``/eal/heap_info`` is fixed to print ``Heap_id``. -+ - * The experimental function ``rte_pcapng_copy`` was updated to support comment - section in enhanced packet block in the pcapng library. - + lib/eal/common/eal_common_memory.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + @@ -43 +31 @@ -index c917b981bc..c2a4c8f9e7 100644 +index 8e427bf4b4..da6711d129 100644 @@ -50,2 +38,2 @@ -- rte_tel_data_add_dict_uint(d, "Head id", heap_id); -+ rte_tel_data_add_dict_uint(d, "Heap_id", heap_id); +- rte_tel_data_add_dict_u64(d, "Head id", heap_id); ++ rte_tel_data_add_dict_u64(d, "Head_id", heap_id); @@ -53,2 +41,2 @@ - rte_tel_data_add_dict_uint(d, "Heap_size", - sock_stats.heap_totalsz_bytes); + rte_tel_data_add_dict_u64(d, "Heap_size", + sock_stats.heap_totalsz_bytes);