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

[Kevin Traynor <ktraynor@redhat.com>]

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 <lihuisong@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

[ 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@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
Reviewed-by: Morten Brørup <mb@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 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",