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 BFB5541E9F for ; Wed, 15 Mar 2023 15:37:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BBB5140141; Wed, 15 Mar 2023 15:37:34 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 0BE5642C24 for ; Wed, 15 Mar 2023 15:37:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678891050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XadAYsEZhOOIOJkxfLHFOCvBIlcH2biTR9iwvHKHHxY=; b=CXEg2Iuvm8K+yKcHESVcVJopLE3EemydKPzEU1pUkTQxPt/hCL85rf9GzSNO7YozJgSS9u tLCQwOhQaOdu5DyN4JFd28b/kII1mAMkOLOyquA3fZw+2GDCCDY8AIWMtHYTpe3zkg1ICV 9Yb/K995AzaA5Yg2idNWc7LuIfItMiU= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-6-eoxCF41ZOzG69uNTx-gbjA-1; Wed, 15 Mar 2023 10:37:25 -0400 X-MC-Unique: eoxCF41ZOzG69uNTx-gbjA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1E398280BF74; Wed, 15 Mar 2023 14:37:25 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2621440C6E67; Wed, 15 Mar 2023 14:37:24 +0000 (UTC) From: Kevin Traynor 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 21.11.4 Date: Wed, 15 Mar 2023 14:36:31 +0000 Message-Id: <20230315143640.677317-38-ktraynor@redhat.com> In-Reply-To: <20230315143640.677317-1-ktraynor@redhat.com> References: <20230315143640.677317-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 21.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 03/20/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/43af30f9a574737f408f6fb166bd4cd08cc1ef4a Thanks. Kevin --- >From 43af30f9a574737f408f6fb166bd4cd08cc1ef4a 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 [ 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 a3f2bdd0ca..4aeb933a8c 100644 --- a/lib/eal/common/eal_common_memory.c +++ b/lib/eal/common/eal_common_memory.c @@ -1134,5 +1134,5 @@ handle_eal_heap_info_request(const char *cmd __rte_unused, const char *params, rte_tel_data_start_dict(d); - rte_tel_data_add_dict_u64(d, "Head id", heap_id); + rte_tel_data_add_dict_u64(d, "Heap_id", heap_id); rte_tel_data_add_dict_string(d, "Name", heap->name); rte_tel_data_add_dict_u64(d, "Heap_size", -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 14:30:21.513627870 +0000 +++ 0038-mem-fix-heap-ID-in-telemetry.patch 2023-03-15 14:30:20.608123780 +0000 @@ -1 +1 @@ -From a9dc4888dd1b81b82781aaa1e2606a1c53d13422 Mon Sep 17 00:00:00 2001 +From 43af30f9a574737f408f6fb166bd4cd08cc1ef4a Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit a9dc4888dd1b81b82781aaa1e2606a1c53d13422 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -25,15 +26,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 -@@ -261,4 +261,6 @@ API Changes - ======================================================= - -+* 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(-) + @@ -41 +30 @@ -index c917b981bc..c2a4c8f9e7 100644 +index a3f2bdd0ca..4aeb933a8c 100644 @@ -44 +33 @@ -@@ -1140,5 +1140,5 @@ handle_eal_heap_info_request(const char *cmd __rte_unused, const char *params, +@@ -1134,5 +1134,5 @@ handle_eal_heap_info_request(const char *cmd __rte_unused, const char *params, @@ -47,2 +36,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, "Heap_id", heap_id); @@ -50 +39 @@ - rte_tel_data_add_dict_uint(d, "Heap_size", + rte_tel_data_add_dict_u64(d, "Heap_size",