patch 'mem: fix heap ID in telemetry' has been queued to stable release 22.11.2

[Xueming Li]

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 <xuemingl at nvidia.com>

---
>From 73b11178a39618365920a9b6249e494a6178562d Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
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 <xuemingl at nvidia.com>

[ 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 <lihuisong at huawei.com>
Acked-by: Chengwen Feng <fengchengwen at huawei.com>
Reviewed-by: Morten Brørup <mb at smartsharesystems.com>
---
 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 <xuemingl at nvidia.com>
+
+[ upstream commit a9dc4888dd1b81b82781aaa1e2606a1c53d13422 ]
@@ -19 +21,0 @@
-Cc: stable at 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);