patch 'app/procinfo: remove unnecessary rte_malloc' has been queued to stable release 20.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/21/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/8488f58ebf4803eb153156c1100f86d9444a3825

Thanks.

Luca Boccassi

---
>From 8488f58ebf4803eb153156c1100f86d9444a3825 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Mon, 7 Aug 2023 13:43:10 -0700
Subject: [PATCH] app/procinfo: remove unnecessary rte_malloc

[ upstream commit cfe29906c69bedb5f87dadcc02703ce46e80f37e ]

Better to use malloc() which is faster than rte_malloc()
and has more error checking, as is done already for statistics.

Fixes: 077c546704da ("app/proc_info: add metrics displaying")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Chengwen Feng <fengchengwen at huawei.com>
---
 app/proc-info/main.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index 40bfbefad8..befb90a2be 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -19,7 +19,6 @@
 #include <rte_common.h>
 #include <rte_debug.h>
 #include <rte_ethdev.h>
-#include <rte_malloc.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
 #include <rte_launch.h>
@@ -602,24 +601,23 @@ metrics_display(int port_id)
 		return;
 	}
 
-	metrics = rte_malloc("proc_info_metrics",
-		sizeof(struct rte_metric_value) * len, 0);
+	metrics = malloc(sizeof(struct rte_metric_value) * len);
 	if (metrics == NULL) {
 		printf("Cannot allocate memory for metrics\n");
 		return;
 	}
 
-	names =  rte_malloc(NULL, sizeof(struct rte_metric_name) * len, 0);
+	names = malloc(sizeof(struct rte_metric_name) * len);
 	if (names == NULL) {
 		printf("Cannot allocate memory for metrics names\n");
-		rte_free(metrics);
+		free(metrics);
 		return;
 	}
 
 	if (len != rte_metrics_get_names(names, len)) {
 		printf("Cannot get metrics names\n");
-		rte_free(metrics);
-		rte_free(names);
+		free(metrics);
+		free(names);
 		return;
 	}
 
@@ -631,8 +629,8 @@ metrics_display(int port_id)
 	ret = rte_metrics_get_values(port_id, metrics, len);
 	if (ret < 0 || ret > len) {
 		printf("Cannot get metrics values\n");
-		rte_free(metrics);
-		rte_free(names);
+		free(metrics);
+		free(names);
 		return;
 	}
 
@@ -641,8 +639,8 @@ metrics_display(int port_id)
 		printf("%s: %"PRIu64"\n", names[i].name, metrics[i].value);
 
 	printf("%s############################\n", nic_stats_border);
-	rte_free(metrics);
-	rte_free(names);
+	free(metrics);
+	free(names);
 }
 
 static void
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-10-19 00:28:58.297301521 +0100
+++ 0041-app-procinfo-remove-unnecessary-rte_malloc.patch	2023-10-19 00:28:56.313807058 +0100
@@ -1 +1 @@
-From cfe29906c69bedb5f87dadcc02703ce46e80f37e Mon Sep 17 00:00:00 2001
+From 8488f58ebf4803eb153156c1100f86d9444a3825 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cfe29906c69bedb5f87dadcc02703ce46e80f37e ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index af4c1d8bcb..ce53bc30df 100644
+index 40bfbefad8..befb90a2be 100644
@@ -30 +31 @@
-@@ -909,24 +908,23 @@ metrics_display(int port_id)
+@@ -602,24 +601,23 @@ metrics_display(int port_id)
@@ -60 +61 @@
-@@ -938,8 +936,8 @@ metrics_display(int port_id)
+@@ -631,8 +629,8 @@ metrics_display(int port_id)
@@ -71 +72 @@
-@@ -948,8 +946,8 @@ metrics_display(int port_id)
+@@ -641,8 +639,8 @@ metrics_display(int port_id)
@@ -80 +80,0 @@
- #endif
@@ -81,0 +82 @@
+ static void